[Spice-commits] common/vdlog.cpp

[Frediano Ziglio]

 common/vdlog.cpp |   32 +++-----------------------------
 1 file changed, 3 insertions(+), 29 deletions(-)

New commits:
commit 1a0bc10cbe253cc294dd86563d4143973ab81bc0
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Sun Jul 23 10:33:16 2017 +0100

    log: rewrite log_version using config.h definitions
    
    Instead of having to get the version information from the
    executable resources get from the build configuration file.
    The same version is used to build the version information
    resource.
    This also remove a bug in log_version where "throw" statements
    were used to raise again a not existing exception on case
    of failures.
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Christophe Fergeau <cfergeau at redhat.com>

diff --git a/common/vdlog.cpp b/common/vdlog.cpp
index c983127..f18f59b 100644
--- a/common/vdlog.cpp
+++ b/common/vdlog.cpp
@@ -15,6 +15,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "config.h"
 #include "vdcommon.h"
 #include "vdlog.h"
 #include <stdio.h>
@@ -79,33 +80,6 @@ void VDLog::printf(const char* format, ...)
 
 void log_version()
 {
-    DWORD handle;
-    TCHAR module_fname[MAX_PATH];
-
-    try {
-        if (!GetModuleFileName(NULL, module_fname, MAX_PATH)) {
-            throw;
-        }
-        DWORD version_inf_size = GetFileVersionInfoSize(module_fname, &handle);
-        if (version_inf_size == 0) {
-            throw;
-        }
-        std::vector<TCHAR> info_buf(version_inf_size);
-        if (!GetFileVersionInfo(module_fname, handle, version_inf_size, &info_buf[0])) {
-            throw;
-        }
-        UINT size;
-        VS_FIXEDFILEINFO* file_info;
-        if (!VerQueryValue(&info_buf[0], L"\\", (VOID**)&file_info, &size) ||
-                size < sizeof(VS_FIXEDFILEINFO)) {
-            throw;
-        }
-        vd_printf("%lu.%lu.%lu.%lu",
-            file_info->dwFileVersionMS >> 16,
-            file_info->dwFileVersionMS & 0x0ffff,
-            file_info->dwFileVersionLS >> 16,
-            file_info->dwFileVersionLS & 0x0ffff);
-    } catch (...) {
-        vd_printf("get version info failed");
-    }
+    // print same version as resource one
+    vd_printf("%u.%u.%u.%u", RC_PRODUCTVERSION);
 }