--- a/make/autoconf/flags-other.m4 Thu Apr 11 14:49:04 2019 +0200
+++ b/make/autoconf/flags-other.m4 Thu Apr 11 15:36:09 2019 +0100
@@ -81,21 +81,21 @@
RC_FLAGS="$RC_FLAGS \
-D\"JDK_VERSION_STRING=\$(VERSION_STRING)\" \
-D\"JDK_COMPANY=\$(COMPANY_NAME)\" \
- -D\"JDK_COMPONENT=\$(JDK_RC_NAME) binary\" \
+ -D\"JDK_FILEDESC=\$(JDK_RC_NAME) binary\" \
-D\"JDK_VER=\$(VERSION_NUMBER)\" \
-D\"JDK_COPYRIGHT=Copyright \xA9 $COPYRIGHT_YEAR\" \
-D\"JDK_NAME=\$(JDK_RC_NAME) \$(VERSION_FEATURE)\" \
-D\"JDK_FVER=\$(subst .,\$(COMMA),\$(VERSION_NUMBER_FOUR_POSITIONS))\""
JVM_RCFLAGS="$JVM_RCFLAGS \
- -D\"HS_BUILD_ID=\$(VERSION_STRING)\" \
+ -D\"HS_VERSION_STRING=\$(VERSION_STRING)\" \
-D\"HS_COMPANY=\$(COMPANY_NAME)\" \
- -D\"JDK_DOTVER=\$(VERSION_NUMBER_FOUR_POSITIONS)\" \
+ -D\"HS_VER=\$(VERSION_NUMBER_FOUR_POSITIONS)\" \
+ -D\"HS_INTERNAL_NAME=jvm\" \
-D\"HS_COPYRIGHT=Copyright $COPYRIGHT_YEAR\" \
+ -D\"HS_FNAME=jvm.dll\" \
-D\"HS_NAME=\$(PRODUCT_NAME) \$(VERSION_SHORT)\" \
- -D\"JDK_VER=\$(subst .,\$(COMMA),\$(VERSION_NUMBER_FOUR_POSITIONS))\" \
- -D\"HS_FNAME=jvm.dll\" \
- -D\"HS_INTERNAL_NAME=jvm\""
+ -D\"HS_FVER=\$(subst .,\$(COMMA),\$(VERSION_NUMBER_FOUR_POSITIONS))\""
fi
AC_SUBST(RC_FLAGS)
AC_SUBST(JVM_RCFLAGS)
--- a/make/launcher/Launcher-jdk.accessibility.gmk Thu Apr 11 14:49:04 2019 +0200
+++ b/make/launcher/Launcher-jdk.accessibility.gmk Thu Apr 11 15:36:09 2019 +0100
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -43,7 +43,7 @@
DISABLED_WARNINGS_microsoft := 4267 4996, \
LDFLAGS := $(LDFLAGS_JDKEXE), \
LIBS := advapi32.lib version.lib user32.lib, \
- VERSIONINFO_RESOURCE := $(ACCESSBRIDGE_SRC)/AccessBridgeStatusWindow.RC, \
+ VERSIONINFO_RESOURCE := $(ACCESSBRIDGE_SRC)/AccessBridgeStatusWindow.rc, \
MANIFEST := $(JABSWITCH_SRC)/jabswitch.manifest, \
MANIFEST_VERSION := $(VERSION_NUMBER_FOUR_POSITIONS), \
))
--- a/src/hotspot/os/windows/version.rc Thu Apr 11 14:49:04 2019 +0200
+++ b/src/hotspot/os/windows/version.rc Thu Apr 11 15:36:09 2019 +0100
@@ -1,5 +1,5 @@
//
-// Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2004, 2019, Oracle and/or its affiliates. All rights reserved.
// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
//
// This code is free software; you can redistribute it and/or modify it
@@ -36,8 +36,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION JDK_VER
- PRODUCTVERSION JDK_VER
+ FILEVERSION HS_FVER
+ PRODUCTVERSION HS_FVER
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -54,15 +54,15 @@
BEGIN
BLOCK "000004b0"
BEGIN
- VALUE "CompanyName", XSTR(HS_COMPANY) "\0"
- VALUE "FileDescription", XSTR(HS_FILEDESC) "\0"
- VALUE "FileVersion", XSTR(JDK_DOTVER) "\0"
- VALUE "Full Version", XSTR(HS_BUILD_ID) "\0"
- VALUE "InternalName", XSTR(HS_INTERNAL_NAME) "\0"
- VALUE "LegalCopyright", XSTR(HS_COPYRIGHT) "\0"
- VALUE "OriginalFilename", XSTR(HS_FNAME) "\0"
- VALUE "ProductName", XSTR(HS_NAME) "\0"
- VALUE "ProductVersion", XSTR(JDK_DOTVER) "\0"
+ VALUE "CompanyName", XSTR(HS_COMPANY) "\0"
+ VALUE "FileDescription", XSTR(HS_FILEDESC) "\0"
+ VALUE "FileVersion", XSTR(HS_VER) "\0"
+ VALUE "Full Version", XSTR(HS_VERSION_STRING) "\0"
+ VALUE "InternalName", XSTR(HS_INTERNAL_NAME) "\0"
+ VALUE "LegalCopyright", XSTR(HS_COPYRIGHT) "\0"
+ VALUE "OriginalFilename", XSTR(HS_FNAME) "\0"
+ VALUE "ProductName", XSTR(HS_NAME) "\0"
+ VALUE "ProductVersion", XSTR(HS_VER) "\0"
END
END
BLOCK "VarFileInfo"
--- a/src/java.base/windows/native/common/version.rc Thu Apr 11 14:49:04 2019 +0200
+++ b/src/java.base/windows/native/common/version.rc Thu Apr 11 15:36:09 2019 +0100
@@ -1,5 +1,5 @@
//
-// Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2004, 2019, Oracle and/or its affiliates. All rights reserved.
// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
//
// This code is free software; you can redistribute it and/or modify it
@@ -55,15 +55,15 @@
BEGIN
BLOCK "000004b0"
BEGIN
- VALUE "CompanyName", XSTR(JDK_COMPANY) "\0"
- VALUE "FileDescription", XSTR(JDK_COMPONENT) "\0"
- VALUE "FileVersion", XSTR(JDK_VER) "\0"
+ VALUE "CompanyName", XSTR(JDK_COMPANY) "\0"
+ VALUE "FileDescription", XSTR(JDK_FILEDESC) "\0"
+ VALUE "FileVersion", XSTR(JDK_VER) "\0"
VALUE "Full Version", XSTR(JDK_VERSION_STRING) "\0"
- VALUE "InternalName", XSTR(JDK_INTERNAL_NAME) "\0"
- VALUE "LegalCopyright", XSTR(JDK_COPYRIGHT) "\0"
- VALUE "OriginalFilename", XSTR(JDK_FNAME) "\0"
- VALUE "ProductName", XSTR(JDK_NAME) "\0"
- VALUE "ProductVersion", XSTR(JDK_VER) "\0"
+ VALUE "InternalName", XSTR(JDK_INTERNAL_NAME) "\0"
+ VALUE "LegalCopyright", XSTR(JDK_COPYRIGHT) "\0"
+ VALUE "OriginalFilename", XSTR(JDK_FNAME) "\0"
+ VALUE "ProductName", XSTR(JDK_NAME) "\0"
+ VALUE "ProductVersion", XSTR(JDK_VER) "\0"
END
END
BLOCK "VarFileInfo"
--- a/src/java.desktop/windows/native/libawt/windows/awt.rc Thu Apr 11 14:49:04 2019 +0200
+++ b/src/java.desktop/windows/native/libawt/windows/awt.rc Thu Apr 11 15:36:09 2019 +0100
@@ -1,5 +1,5 @@
//
-// Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
//
// This code is free software; you can redistribute it and/or modify it
@@ -65,15 +65,15 @@
BEGIN
BLOCK "040904b0"
BEGIN
- VALUE "CompanyName", XSTR(JDK_COMPANY) "\0"
- VALUE "FileDescription", XSTR(JDK_COMPONENT) "\0"
- VALUE "FileVersion", XSTR(JDK_VER) "\0"
+ VALUE "CompanyName", XSTR(JDK_COMPANY) "\0"
+ VALUE "FileDescription", XSTR(JDK_FILEDESC) "\0"
+ VALUE "FileVersion", XSTR(JDK_VER) "\0"
VALUE "Full Version", XSTR(JDK_VERSION_STRING) "\0"
- VALUE "InternalName", XSTR(JDK_INTERNAL_NAME) "\0"
- VALUE "LegalCopyright", XSTR(JDK_COPYRIGHT) "\0"
- VALUE "OriginalFilename", XSTR(JDK_FNAME) "\0"
- VALUE "ProductName", XSTR(JDK_NAME) "\0"
- VALUE "ProductVersion", XSTR(JDK_VER) "\0"
+ VALUE "InternalName", XSTR(JDK_INTERNAL_NAME) "\0"
+ VALUE "LegalCopyright", XSTR(JDK_COPYRIGHT) "\0"
+ VALUE "OriginalFilename", XSTR(JDK_FNAME) "\0"
+ VALUE "ProductName", XSTR(JDK_NAME) "\0"
+ VALUE "ProductVersion", XSTR(JDK_VER) "\0"
END
END
BLOCK "VarFileInfo"
--- a/src/jdk.accessibility/windows/native/common/AccessBridgeStatusWindow.RC Thu Apr 11 14:49:04 2019 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,174 +0,0 @@
-//Microsoft Developer Studio generated resource script.
-//
-#include "resource.h"
-#include "accessBridgeResource.h"
-
-#define XSTR(x) STR(x)
-#define STR(x) #x
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#define APSTUDIO_HIDDEN_SYMBOLS
-#include "windows.h"
-#undef APSTUDIO_HIDDEN_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-ACCESSBRIDGESTATUSWINDOW DIALOGEX 160, 78, 209, 163
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_CLIENTEDGE
-CAPTION "Access Bridge status"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
-BEGIN
- EDITTEXT cVMID,67,23,121,13,ES_READONLY
- EDITTEXT cStatusText,40,147,162,13,ES_READONLY
- LTEXT "Java VM ID:",IDC_STATIC,23,25,40,8
- LTEXT "Status:",IDC_STATIC,11,149,23,8
- EDITTEXT cWindowsID,67,39,121,13,ES_READONLY
- LTEXT "Windows ID:",IDC_STATIC,21,41,42,8
- EDITTEXT cCallInfo,12,65,184,75,ES_MULTILINE | ES_AUTOVSCROLL |
- ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL
- GROUPBOX "Call info",IDC_STATIC,4,55,197,90
- EDITTEXT cInvokedByText,67,1,121,13,ES_READONLY
- LTEXT "Invoked by:",IDC_STATIC,25,3,38,8
-END
-
-IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 95
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Dialog"
-FONT 8, "MS Sans Serif"
-BEGIN
- DEFPUSHBUTTON "OK",IDOK,129,7,50,14
- PUSHBUTTON "Cancel",IDCANCEL,129,24,50,14
-END
-
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE
-BEGIN
- "resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE
-BEGIN
- "#define APSTUDIO_HIDDEN_SYMBOLS\r\n"
- "#include ""windows.h""\r\n"
- "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n"
- "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE
-BEGIN
- "\r\n"
- "\0"
-END
-
-#endif // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE
-BEGIN
- "ACCESSBRIDGESTATUSWINDOW", DIALOG
- BEGIN
- LEFTMARGIN, 4
- RIGHTMARGIN, 202
- BOTTOMMARGIN, 160
- END
-
- "IDD_DIALOG1", DIALOG
- BEGIN
- LEFTMARGIN, 7
- RIGHTMARGIN, 179
- TOPMARGIN, 7
- BOTTOMMARGIN, 88
- END
-END
-#endif // APSTUDIO_INVOKED
-
-
-#ifndef _MAC
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION JDK_FVER
- PRODUCTVERSION JDK_FVER
- FILEFLAGSMASK 0x3fL
-#ifdef DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE JDK_FTYPE
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "Comments", "Java Access Bridge\0"
- VALUE "CompanyName", XSTR(JDK_COMPANY) "\0"
- VALUE "FileDescription", XSTR(JDK_COMPONENT) "\0"
- VALUE "FileVersion", XSTR(JDK_VER) "\0"
- VALUE "Full Version", XSTR(JDK_VERSION_STRING) "\0"
- VALUE "InternalName", XSTR(JDK_INTERNAL_NAME) "\0"
- VALUE "LegalCopyright", XSTR(JDK_COPYRIGHT) "\0"
- VALUE "OriginalFilename", XSTR(JDK_FNAME) "\0"
- VALUE "ProductName", XSTR(JDK_NAME) "\0"
- VALUE "ProductVersion", XSTR(JDK_VER) "\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
-
-#endif // !_MAC
-
-#endif // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif // not APSTUDIO_INVOKED
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.accessibility/windows/native/common/AccessBridgeStatusWindow.rc Thu Apr 11 15:36:09 2019 +0100
@@ -0,0 +1,174 @@
+//Microsoft Developer Studio generated resource script.
+//
+#include "resource.h"
+#include "accessBridgeResource.h"
+
+#define XSTR(x) STR(x)
+#define STR(x) #x
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#define APSTUDIO_HIDDEN_SYMBOLS
+#include "windows.h"
+#undef APSTUDIO_HIDDEN_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+ACCESSBRIDGESTATUSWINDOW DIALOGEX 160, 78, 209, 163
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+EXSTYLE WS_EX_CLIENTEDGE
+CAPTION "Access Bridge status"
+FONT 8, "MS Sans Serif", 0, 0, 0x1
+BEGIN
+ EDITTEXT cVMID,67,23,121,13,ES_READONLY
+ EDITTEXT cStatusText,40,147,162,13,ES_READONLY
+ LTEXT "Java VM ID:",IDC_STATIC,23,25,40,8
+ LTEXT "Status:",IDC_STATIC,11,149,23,8
+ EDITTEXT cWindowsID,67,39,121,13,ES_READONLY
+ LTEXT "Windows ID:",IDC_STATIC,21,41,42,8
+ EDITTEXT cCallInfo,12,65,184,75,ES_MULTILINE | ES_AUTOVSCROLL |
+ ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL
+ GROUPBOX "Call info",IDC_STATIC,4,55,197,90
+ EDITTEXT cInvokedByText,67,1,121,13,ES_READONLY
+ LTEXT "Invoked by:",IDC_STATIC,25,3,38,8
+END
+
+IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 95
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Dialog"
+FONT 8, "MS Sans Serif"
+BEGIN
+ DEFPUSHBUTTON "OK",IDOK,129,7,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,129,24,50,14
+END
+
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE DISCARDABLE
+BEGIN
+ "resource.h\0"
+END
+
+2 TEXTINCLUDE DISCARDABLE
+BEGIN
+ "#define APSTUDIO_HIDDEN_SYMBOLS\r\n"
+ "#include ""windows.h""\r\n"
+ "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n"
+ "\0"
+END
+
+3 TEXTINCLUDE DISCARDABLE
+BEGIN
+ "\r\n"
+ "\0"
+END
+
+#endif // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO DISCARDABLE
+BEGIN
+ "ACCESSBRIDGESTATUSWINDOW", DIALOG
+ BEGIN
+ LEFTMARGIN, 4
+ RIGHTMARGIN, 202
+ BOTTOMMARGIN, 160
+ END
+
+ "IDD_DIALOG1", DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 179
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 88
+ END
+END
+#endif // APSTUDIO_INVOKED
+
+
+#ifndef _MAC
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION JDK_FVER
+ PRODUCTVERSION JDK_FVER
+ FILEFLAGSMASK 0x3fL
+#ifdef DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x40004L
+ FILETYPE JDK_FTYPE
+ FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904b0"
+ BEGIN
+ VALUE "Comments", "Java Access Bridge" "\0"
+ VALUE "CompanyName", XSTR(JDK_COMPANY) "\0"
+ VALUE "FileDescription", XSTR(JDK_FILEDESC) "\0"
+ VALUE "FileVersion", XSTR(JDK_VER) "\0"
+ VALUE "Full Version", XSTR(JDK_VERSION_STRING) "\0"
+ VALUE "InternalName", XSTR(JDK_INTERNAL_NAME) "\0"
+ VALUE "LegalCopyright", XSTR(JDK_COPYRIGHT) "\0"
+ VALUE "OriginalFilename", XSTR(JDK_FNAME) "\0"
+ VALUE "ProductName", XSTR(JDK_NAME) "\0"
+ VALUE "ProductVersion", XSTR(JDK_VER) "\0"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1200
+ END
+END
+
+#endif // !_MAC
+
+#endif // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif // not APSTUDIO_INVOKED
--- a/src/jdk.accessibility/windows/native/common/resource.h Thu Apr 11 14:49:04 2019 +0200
+++ b/src/jdk.accessibility/windows/native/common/resource.h Thu Apr 11 15:36:09 2019 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
//{{NO_DEPENDENCIES}}
// Microsoft Developer Studio generated include file.
-// Used by AccessBridgeStatusWindow.RC
+// Used by AccessBridgeStatusWindow.rc
//
//#define IDB_BITMAP1 102
--- a/src/jdk.accessibility/windows/native/jaccessinspector/jaccessinspectorWindow.rc Thu Apr 11 14:49:04 2019 +0200
+++ b/src/jdk.accessibility/windows/native/jaccessinspector/jaccessinspectorWindow.rc Thu Apr 11 15:36:09 2019 +0100
@@ -199,15 +199,15 @@
BEGIN
BLOCK "000004b0"
BEGIN
- VALUE "CompanyName", XSTR(JDK_COMPANY) "\0"
- VALUE "FileDescription", XSTR(JDK_COMPONENT) "\0"
- VALUE "FileVersion", XSTR(JDK_VER) "\0"
+ VALUE "CompanyName", XSTR(JDK_COMPANY) "\0"
+ VALUE "FileDescription", XSTR(JDK_FILEDESC) "\0"
+ VALUE "FileVersion", XSTR(JDK_VER) "\0"
VALUE "Full Version", XSTR(JDK_VERSION_STRING) "\0"
- VALUE "InternalName", XSTR(JDK_INTERNAL_NAME) "\0"
- VALUE "LegalCopyright", XSTR(JDK_COPYRIGHT) "\0"
- VALUE "OriginalFilename", XSTR(JDK_FNAME) "\0"
- VALUE "ProductName", XSTR(JDK_NAME) "\0"
- VALUE "ProductVersion", XSTR(JDK_VER) "\0"
+ VALUE "InternalName", XSTR(JDK_INTERNAL_NAME) "\0"
+ VALUE "LegalCopyright", XSTR(JDK_COPYRIGHT) "\0"
+ VALUE "OriginalFilename", XSTR(JDK_FNAME) "\0"
+ VALUE "ProductName", XSTR(JDK_NAME) "\0"
+ VALUE "ProductVersion", XSTR(JDK_VER) "\0"
END
END
BLOCK "VarFileInfo"
--- a/src/jdk.accessibility/windows/native/jaccesswalker/jaccesswalkerWindow.rc Thu Apr 11 14:49:04 2019 +0200
+++ b/src/jdk.accessibility/windows/native/jaccesswalker/jaccesswalkerWindow.rc Thu Apr 11 15:36:09 2019 +0100
@@ -164,15 +164,15 @@
BEGIN
BLOCK "000004b0"
BEGIN
- VALUE "CompanyName", XSTR(JDK_COMPANY) "\0"
- VALUE "FileDescription", XSTR(JDK_COMPONENT) "\0"
- VALUE "FileVersion", XSTR(JDK_VER) "\0"
+ VALUE "CompanyName", XSTR(JDK_COMPANY) "\0"
+ VALUE "FileDescription", XSTR(JDK_FILEDESC) "\0"
+ VALUE "FileVersion", XSTR(JDK_VER) "\0"
VALUE "Full Version", XSTR(JDK_VERSION_STRING) "\0"
- VALUE "InternalName", XSTR(JDK_INTERNAL_NAME) "\0"
- VALUE "LegalCopyright", XSTR(JDK_COPYRIGHT) "\0"
- VALUE "OriginalFilename", XSTR(JDK_FNAME) "\0"
- VALUE "ProductName", XSTR(JDK_NAME) "\0"
- VALUE "ProductVersion", XSTR(JDK_VER) "\0"
+ VALUE "InternalName", XSTR(JDK_INTERNAL_NAME) "\0"
+ VALUE "LegalCopyright", XSTR(JDK_COPYRIGHT) "\0"
+ VALUE "OriginalFilename", XSTR(JDK_FNAME) "\0"
+ VALUE "ProductName", XSTR(JDK_NAME) "\0"
+ VALUE "ProductVersion", XSTR(JDK_VER) "\0"
END
END
BLOCK "VarFileInfo"