From 1ded0c537cc22b233b09cc1b5116f3f97015b6b6 Mon Sep 17 00:00:00 2001
From: hasherezade <hasherezade@gmail.com>
Date: Sun, 6 Nov 2022 04:26:57 -0800
Subject: [PATCH] [FEATURE] Set product version. Updated version to: 0.9.6

---
 CMakeLists.txt                     | 4 ++--
 main.cpp                           | 4 ++--
 mal_unpack.rc => mal_unpack_res.rc | 9 ++++++---
 mal_unpack_ver.h                   | 8 ++++++++
 version.h                          | 4 ----
 5 files changed, 18 insertions(+), 11 deletions(-)
 rename mal_unpack.rc => mal_unpack_res.rc (58%)
 create mode 100644 mal_unpack_ver.h
 delete mode 100644 version.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c0680e3..f341037 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,8 +47,8 @@ set (hdrs
 )
 
 set (rsrc
-	version.h
-	mal_unpack.rc
+	mal_unpack_ver.h
+	mal_unpack_res.rc
 )
 
 # libs
diff --git a/main.cpp b/main.cpp
index 9f70ac4..d405896 100644
--- a/main.cpp
+++ b/main.cpp
@@ -14,7 +14,7 @@
 #include <pe_sieve_return_codes.h>
 
 #include "unpack_scanner.h"
-#include "version.h"
+#include "mal_unpack_ver.h"
 
 #include "util/process_util.h"
 #include "util/path_util.h"
@@ -22,7 +22,7 @@
 
 #define WAIT_FOR_PROCESS_TIMEOUT 5000
 
-#define VERSION VER_FILEVERSION_STR
+#define VERSION MALUNP_VERSION_STR
 #define LOG_FILE_NAME "unpack.log"
 
 void print_log_hdr(std::wofstream &report, const time_t& session_timestamp, const t_params_struct& params)
diff --git a/mal_unpack.rc b/mal_unpack_res.rc
similarity index 58%
rename from mal_unpack.rc
rename to mal_unpack_res.rc
index 8c2b7ff..39dc0aa 100644
--- a/mal_unpack.rc
+++ b/mal_unpack_res.rc
@@ -1,15 +1,18 @@
-#include "version.h"
+#include "mal_unpack_ver.h"
 #include <windows.h>
 
 #define VER_COMPANYNAME_STR         "Hashereware (hashereware.com)"
 #define VER_FILETYPE                VFT_APP
 #define VER_FILESUBTYPE             VFT2_UNKNOWN
 #define VER_FILEOS                  VOS_NT_WINDOWS32
-#define VER_FILEDESCRIPTION_STR     "MalUnpack - a dynamic malware unpacker (https://github.com/hasherezade/mal_unpack)"
+#define VER_FILEDESCRIPTION_STR     "MalUnpack: dynamic malware unpacker based on PE-sieve."
 #define VER_INTERNALNAME_STR        "mal_unpack.exe"
 #define VER_ORIGINALFILENAME_STR    "mal_unpack.exe"
-#define VER_LEGALCOPYRIGHT_STR      "Copyright © 2018-2021 Hasherezade"
+#define VER_LEGALCOPYRIGHT_STR      "Copyright © 2018-2022 Hasherezade"
 #define VER_PRODUCTNAME_STR         "MalUnpack"
+#define VER_PRODUCTVERSION_STR      VER_FILEVERSION_STR
+#define VER_FILEVERSION             MALUNP_MAJOR_VERSION,MALUNP_MINOR_VERSION,MALUNP_MICRO_VERSION,MALUNP_PATCH_VERSION
+#define VER_PRODUCTVERSION_STR      MALUNP_VERSION_STR
 
 #define VER_FILEFLAGSMASK (VS_FF_DEBUG | VS_FF_PRERELEASE)
 #ifdef DEBUG
diff --git a/mal_unpack_ver.h b/mal_unpack_ver.h
new file mode 100644
index 0000000..3168ae4
--- /dev/null
+++ b/mal_unpack_ver.h
@@ -0,0 +1,8 @@
+#pragma once
+
+#define MALUNP_MAJOR_VERSION 0
+#define MALUNP_MINOR_VERSION 9
+#define MALUNP_MICRO_VERSION 6
+#define MALUNP_PATCH_VERSION 0
+
+#define MALUNP_VERSION_STR	"0.9.6"
diff --git a/version.h b/version.h
deleted file mode 100644
index 34f4ffa..0000000
--- a/version.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-
-#define VER_FILEVERSION             0,9,5,0
-#define VER_FILEVERSION_STR         "0.9.5\0"