8248610: Clean up handling of Windows RC files

Reviewed-by: erikj

src/java.base/windows/native/common/version.rc

@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2004, 2019, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2004, 2020, 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
@@ -23,38 +23,43 @@
 // questions.
 //
 
-#include "windows.h"
+#include <windows.h>
 
 // Need 2 defines so macro argument to XSTR will get expanded before quoting.
 #define XSTR(x) STR(x)
 #define STR(x)  #x
 
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 /////////////////////////////////////////////////////////////////////////////
 //
 // Version
 //
 
+#ifndef JDK_FILEOS
+#define JDK_FILEOS VOS__WINDOWS32
+#endif
+
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION    JDK_FVER
  PRODUCTVERSION JDK_FVER
- FILEFLAGSMASK 0x3fL
+ FILEFLAGSMASK VS_FF_DEBUG | VS_FF_PRERELEASE
 #ifdef _DEBUG
- FILEFLAGS 0x1L
+ FILEFLAGS VS_FF_DEBUG
 #else
  FILEFLAGS 0x0L
 #endif
- // FILEOS 0x4 is Win32, 0x40004 is Win32 NT only
- FILEOS 0x4L
- // FILETYPE should be 0x1 for .exe and 0x2 for .dll
+ FILEOS JDK_FILEOS
  FILETYPE JDK_FTYPE
  FILESUBTYPE 0x0L
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN
-        BLOCK "000004b0"
+        BLOCK "040904b0"
         BEGIN
+#ifdef JDK_COMMENTS
+            VALUE "Comments",         XSTR(JDK_COMMENTS)       "\0"
+#endif
             VALUE "CompanyName",      XSTR(JDK_COMPANY)        "\0"
             VALUE "FileDescription",  XSTR(JDK_FILEDESC)       "\0"
             VALUE "FileVersion",      XSTR(JDK_VER)            "\0"
@@ -68,6 +73,6 @@ BEGIN
     END
     BLOCK "VarFileInfo"
     BEGIN
-        VALUE "Translation", 0x0, 1200
+        VALUE "Translation", 0x409, 1200
     END
 END