< prev index next >

src/jdk.jpackage/windows/native/libjpackage/VersionInfoSwap.cpp

Print this page

        

@@ -1,29 +1,29 @@
 /*
-* 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.
+ */
 
 #include "VersionInfoSwap.h"
 
 #include <stdio.h>
 #include <tchar.h>

@@ -33,14 +33,13 @@
 #include <Strsafe.h>
 #include <fstream>
 #include <locale>
 #include <codecvt>
 
+using namespace std;
 
 /*
- * Usage: VersionInfoSwap.exe [Property file] [Executable file]
- *
  * [Property file] contains key/value pairs
  * The swap tool uses these pairs to create new version resource
  *
  * See MSDN docs for VS_VERSIONINFO structure that
  * depicts organization of data in this version resource

@@ -49,66 +48,68 @@
  * The swap tool makes changes in [Executable file]
  * The tool assumes that the executable file has no version resource
  * and it adds new resource in the executable file.
  * If the executable file has an existing version resource, then
  * the existing version resource will be replaced with new one.
- *
  */
 
+VersionInfoSwap::VersionInfoSwap(wstring executableProperties, wstring launcher) {
+    m_executableProperties = executableProperties;
+    m_launcher = launcher;
+}
+
 bool VersionInfoSwap::PatchExecutable() {
     bool b = LoadFromPropertyFile();
     if (!b) {
         return false;
     }
 
     ByteBuffer buf;
     CreateNewResource(&buf);
-    b = this->UpdateResource(buf.getPtr(), static_cast<DWORD>(buf.getPos()));
+    b = this->UpdateResource(buf.getPtr(), static_cast<DWORD> (buf.getPos()));
     if (!b) {
         return false;
     }
     return true;
 }
 
 bool VersionInfoSwap::LoadFromPropertyFile() {
-
     bool result = false;
-    std::wifstream stream(m_propFileName.data());
+    wifstream stream(m_executableProperties.c_str());
 
-    const std::locale empty_locale = std::locale::empty();
-    const std::locale utf8_locale =
-            std::locale(empty_locale, new std::codecvt_utf8<wchar_t>());
+    const locale empty_locale = locale::empty();
+    const locale utf8_locale =
+            locale(empty_locale, new codecvt_utf8<wchar_t>());
     stream.imbue(utf8_locale);
 
     if (stream.is_open() == true) {
         int lineNumber = 1;
         while (stream.eof() == false) {
             wstring line;
-            std::getline(stream, line);
+            getline(stream, line);
 
             // # at the first character will comment out the line.
             if (line.empty() == false && line[0] != '#') {
                 wstring::size_type pos = line.find('=');
                 if (pos != wstring::npos) {
                     wstring name = line.substr(0, pos);
                     wstring value = line.substr(pos + 1);
                     m_props[name] = value;
                 } else {
-                    fwprintf(stderr, TEXT("Unable to find delimiter at line %d\n"), lineNumber);
+                    printf("Unable to find delimiter at line %d\n", lineNumber);
                 }
             }
             lineNumber++;
         }
         result = true;
     } else {
-        fwprintf(stderr, TEXT("Unable to read property file\n"));
+        printf("Unable to read property file\n");
     }
 
     return result;
 }
 
-
 /*
  * Creates new version resource
  *
  * MSND docs for VS_VERSION_INFO structure
  *     https://msdn.microsoft.com/en-us/library/ms647001(v=vs.85).aspx

@@ -121,11 +122,11 @@
     buf->AppendString(TEXT("VS_VERSION_INFO"));
     buf->Align(4);
 
     VS_FIXEDFILEINFO fxi;
     FillFixedFileInfo(&fxi);
-    buf->AppendBytes((BYTE*)&fxi, sizeof (VS_FIXEDFILEINFO));
+    buf->AppendBytes((BYTE*) & fxi, sizeof (VS_FIXEDFILEINFO));
     buf->Align(4);
 
     // String File Info
     size_t stringFileInfoStart = buf->getPos();
     buf->AppendWORD(0);

@@ -143,36 +144,36 @@
     // "040904B0" = LANG_ENGLISH/SUBLANG_ENGLISH_US, Unicode CP
     buf->AppendString(TEXT("040904B0"));
     buf->Align(4);
 
     // Strings
-    std::vector<wstring> keys;
-    for (std::map<wstring, wstring>::const_iterator it =
+    vector<wstring> keys;
+    for (map<wstring, wstring>::const_iterator it =
             m_props.begin(); it != m_props.end(); ++it) {
         keys.push_back(it->first);
     }
 
     for (size_t index = 0; index < keys.size(); index++) {
         wstring name = keys[index];
         wstring value = m_props[name];
 
         size_t stringStart = buf->getPos();
         buf->AppendWORD(0);
-        buf->AppendWORD(static_cast<WORD>(value.length()));
+        buf->AppendWORD(static_cast<WORD> (value.length()));
         buf->AppendWORD(1);
         buf->AppendString(name);
         buf->Align(4);
         buf->AppendString(value);
         buf->ReplaceWORD(stringStart,
-                static_cast<WORD>(buf->getPos() - stringStart));
+                static_cast<WORD> (buf->getPos() - stringStart));
         buf->Align(4);
     }
 
     buf->ReplaceWORD(stringTableStart,
-            static_cast<WORD>(buf->getPos() - stringTableStart));
+            static_cast<WORD> (buf->getPos() - stringTableStart));
     buf->ReplaceWORD(stringFileInfoStart,
-            static_cast<WORD>(buf->getPos() - stringFileInfoStart));
+            static_cast<WORD> (buf->getPos() - stringFileInfoStart));
 
     // VarFileInfo
     size_t varFileInfoStart = buf->getPos();
     buf->AppendWORD(1);
     buf->AppendWORD(0);

@@ -188,13 +189,13 @@
     // "040904B0" = LANG_ENGLISH/SUBLANG_ENGLISH_US, Unicode CP
     buf->AppendWORD(0x0409);
     buf->AppendWORD(0x04B0);
 
     buf->ReplaceWORD(varFileInfoStart,
-            static_cast<WORD>(buf->getPos() - varFileInfoStart));
+            static_cast<WORD> (buf->getPos() - varFileInfoStart));
     buf->ReplaceWORD(versionInfoStart,
-            static_cast<WORD>(buf->getPos() - versionInfoStart));
+            static_cast<WORD> (buf->getPos() - versionInfoStart));
 }
 
 void VersionInfoSwap::FillFixedFileInfo(VS_FIXEDFILEINFO *fxi) {
     wstring fileVersion;
     wstring productVersion;

@@ -207,17 +208,17 @@
     unsigned pv_1 = 0, pv_2 = 0, pv_3 = 0, pv_4 = 0;
 
     ret = _stscanf_s(fileVersion.c_str(),
             TEXT("%d.%d.%d.%d"), &fv_1, &fv_2, &fv_3, &fv_4);
     if (ret <= 0 || ret > 4) {
-        fwprintf(stderr, TEXT("Unable to parse FileVersion value\n"));
+        printf("Unable to parse FileVersion value\n");
     }
 
     ret = _stscanf_s(productVersion.c_str(),
             TEXT("%d.%d.%d.%d"), &pv_1, &pv_2, &pv_3, &pv_4);
     if (ret <= 0 || ret > 4) {
-        fwprintf(stderr, TEXT("Unable to parse ProductVersion value\n"));
+        printf("Unable to parse ProductVersion value\n");
     }
 
     fxi->dwSignature = 0xFEEF04BD;
     fxi->dwStrucVersion = 0x00010000;
 

@@ -235,18 +236,16 @@
         fxi->dwFileFlags |= VS_FF_SPECIALBUILD;
     }
     fxi->dwFileOS = VOS_NT_WINDOWS32;
 
     wstring exeExt =
-            m_exeFileName.substr(m_exeFileName.find_last_of(TEXT(".")));
+            m_launcher.substr(m_launcher.find_last_of(TEXT(".")));
     if (exeExt == TEXT(".exe")) {
         fxi->dwFileType = VFT_APP;
-    }
-    else if (exeExt == TEXT(".dll")) {
+    } else if (exeExt == TEXT(".dll")) {
         fxi->dwFileType = VFT_DLL;
-    }
-    else {
+    } else {
         fxi->dwFileType = VFT_UNKNOWN;
     }
     fxi->dwFileSubtype = 0;
 
     fxi->dwFileDateLS = 0;

@@ -259,13 +258,13 @@
 bool VersionInfoSwap::UpdateResource(LPVOID lpResLock, DWORD size) {
 
     HANDLE hUpdateRes;
     BOOL r;
 
-    hUpdateRes = ::BeginUpdateResource(m_exeFileName.c_str(), FALSE);
+    hUpdateRes = ::BeginUpdateResource(m_launcher.c_str(), FALSE);
     if (hUpdateRes == NULL) {
-        fwprintf(stderr, TEXT("Could not open file for writing\n"));
+        printf("Could not open file for writing\n");
         return false;
     }
 
     r = ::UpdateResource(hUpdateRes,
         RT_VERSION,

@@ -273,26 +272,16 @@
         MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US),
         lpResLock,
         size);
 
     if (!r) {
-        fwprintf(stderr, TEXT("Could not add resource\n"));
+        printf("Could not add resource\n");
         return false;
     }
 
     if (!::EndUpdateResource(hUpdateRes, FALSE)) {
-        fwprintf(stderr, TEXT("Could not write changes to file\n"));
+        printf("Could not write changes to file\n");
         return false;
     }
 
     return true;
 }
-
-VersionInfoSwap::VersionInfoSwap(TCHAR *propFileName, TCHAR *exeFileName)
-{
-    m_propFileName = propFileName;
-    m_exeFileName = exeFileName;
-}
-
-VersionInfoSwap::~VersionInfoSwap()
-{
-}
< prev index next >