--- old/src/jdk.jpackage/windows/native/jpackage/VersionInfoSwap.h	2019-01-31 19:16:37.501035800 -0800
+++ new/src/jdk.jpackage/windows/native/jpackage/VersionInfoSwap.h	2019-01-31 19:16:36.269912700 -0800
@@ -1,27 +1,27 @@
 /*
-* Copyright (c) 2015, 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
-* under the terms of the GNU General Public License version 2 only, as
-* published by the Free Software Foundation.  Oracle designates this
-* particular file as subject to the "Classpath" exception as provided
-* by Oracle in the LICENSE file that accompanied this code.
-*
-* This code is distributed in the hope that it will be useful, but WITHOUT
-* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-* FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-* version 2 for more details (a copy is included in the LICENSE file that
-* accompanied this code).
-*
-* You should have received a copy of the GNU General Public License version
-* 2 along with this work; if not, write to the Free Software Foundation,
-* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-*
-* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-* or visit www.oracle.com if you need additional information or have any
-* questions.
-*/
+ * Copyright (c) 2015, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
 
 #ifndef VERSIONINFOSWAP_H
 #define VERSIONINFOSWAP_H
@@ -29,18 +29,19 @@
 #include "ByteBuffer.h"
 #include <map>
 
+using namespace std;
+
 class VersionInfoSwap {
 public:
-    VersionInfoSwap(TCHAR *propFileName, TCHAR *exeFileName);
-    ~VersionInfoSwap();
+    VersionInfoSwap(wstring executableProperties, wstring launcher);
 
     bool PatchExecutable();
 
 private:
-    wstring m_propFileName;
-    wstring m_exeFileName;
+    wstring m_executableProperties;
+    wstring m_launcher;
 
-    std::map<wstring, wstring> m_props;
+    map<wstring, wstring> m_props;
 
     bool LoadFromPropertyFile();
     void CreateNewResource(ByteBuffer *buf);