From 9119ff0b8dacbe67e53864239f3bd5053d18fa08 Mon Sep 17 00:00:00 2001
From: DavidXanatos <xanatosdavid@gmail.com>
Date: Tue, 2 Feb 2021 13:33:47 +0100
Subject: [PATCH]

---
 SandboxiePlus/QSbieAPI/QSbieAPI.qc.pro        |  3 +
 SandboxiePlus/QSbieAPI/QSbieAPI.rc            | 68 +++++++++++++++++++
 SandboxiePlus/QSbieAPI/QSbieAPI.vcxproj       |  4 ++
 .../QSbieAPI/QSbieAPI.vcxproj.filters         |  8 +++
 SandboxiePlus/QSbieAPI/resource.h             | 17 +++++
 SandboxiePlus/SandMan/SandMan.pri             | 13 ++--
 SandboxiePlus/SandMan/SandMan.qc.pro          |  9 +--
 SandboxiePlus/SandMan/SandMan.rc              | 16 +++--
 SandboxiePlus/version.h                       | 19 ++++++
 9 files changed, 137 insertions(+), 20 deletions(-)
 create mode 100644 SandboxiePlus/QSbieAPI/QSbieAPI.rc
 create mode 100644 SandboxiePlus/QSbieAPI/resource.h
 create mode 100644 SandboxiePlus/version.h

diff --git a/SandboxiePlus/QSbieAPI/QSbieAPI.qc.pro b/SandboxiePlus/QSbieAPI/QSbieAPI.qc.pro
index f840c5cd..3f74daa0 100644
--- a/SandboxiePlus/QSbieAPI/QSbieAPI.qc.pro
+++ b/SandboxiePlus/QSbieAPI/QSbieAPI.qc.pro
@@ -33,3 +33,6 @@ DEPENDPATH += .
 
 
 include(QSbieAPI.pri)
+
+win32:RC_FILE = QSbieAPI.rc
+
diff --git a/SandboxiePlus/QSbieAPI/QSbieAPI.rc b/SandboxiePlus/QSbieAPI/QSbieAPI.rc
new file mode 100644
index 00000000..a5ad0394
--- /dev/null
+++ b/SandboxiePlus/QSbieAPI/QSbieAPI.rc
@@ -0,0 +1,68 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+/////////////////////////////////////////////////////////////////////////////
+// German (Austria) resources
+
+#include "winres.h"
+
+#include "../version.h"
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEA)
+LANGUAGE LANG_GERMAN, SUBLANG_GERMAN_AUSTRIAN
+#pragma code_page(1252)
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION VERSION_BIN
+ PRODUCTVERSION VERSION_BIN
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "0c0704b0"
+        BEGIN
+            VALUE "CompanyName", MY_COMPANY_NAME_STRING
+            VALUE "FileDescription", "Sandboxie API for Qt"
+            VALUE "FileVersion", VERSION_STR
+            VALUE "InternalName", "QSbieAPI.dll"
+            VALUE "LegalCopyright", MY_COPYRIGHT_STRING
+            VALUE "OriginalFilename", "QSbieAPI.dll"
+            VALUE "ProductName", MY_PRODUCT_NAME_STRING
+            VALUE "ProductVersion", VERSION_STR
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0xc07, 1200
+    END
+END
+
+#endif    // German (Austria) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+
diff --git a/SandboxiePlus/QSbieAPI/QSbieAPI.vcxproj b/SandboxiePlus/QSbieAPI/QSbieAPI.vcxproj
index c33c6785..3c136953 100644
--- a/SandboxiePlus/QSbieAPI/QSbieAPI.vcxproj
+++ b/SandboxiePlus/QSbieAPI/QSbieAPI.vcxproj
@@ -214,11 +214,15 @@
     <QtMoc Include="Sandboxie\SbieIni.h" />
     <QtMoc Include="Sandboxie\BoxBorder.h" />
     <QtMoc Include="Sandboxie\SbieTemplates.h" />
+    <ClInclude Include="resource.h" />
     <ClInclude Include="SbieDefs.h" />
     <QtMoc Include="SbieStatus.h" />
     <ClInclude Include="SbieUtils.h" />
     <ClInclude Include="stdafx.h" />
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="QSbieAPI.rc" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Condition="Exists('$(QtMsBuild)\qt.targets')">
     <Import Project="$(QtMsBuild)\qt.targets" />
diff --git a/SandboxiePlus/QSbieAPI/QSbieAPI.vcxproj.filters b/SandboxiePlus/QSbieAPI/QSbieAPI.vcxproj.filters
index ffd20bf9..5dcb8277 100644
--- a/SandboxiePlus/QSbieAPI/QSbieAPI.vcxproj.filters
+++ b/SandboxiePlus/QSbieAPI/QSbieAPI.vcxproj.filters
@@ -74,6 +74,9 @@
     <ClInclude Include="Helpers\NtIO.h">
       <Filter>Helpers</Filter>
     </ClInclude>
+    <ClInclude Include="resource.h">
+      <Filter>Resource Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="qsbieapi_global.h">
@@ -103,4 +106,9 @@
       <Filter>Sandboxie</Filter>
     </QtMoc>
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="QSbieAPI.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/SandboxiePlus/QSbieAPI/resource.h b/SandboxiePlus/QSbieAPI/resource.h
new file mode 100644
index 00000000..43ea6a21
--- /dev/null
+++ b/SandboxiePlus/QSbieAPI/resource.h
@@ -0,0 +1,17 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by SandMan.rc
+//
+#define VS_VERSION_INFO                 1
+#define IDC_STATIC                      -1
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        101
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1000
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
diff --git a/SandboxiePlus/SandMan/SandMan.pri b/SandboxiePlus/SandMan/SandMan.pri
index 99bac872..8fdd8514 100644
--- a/SandboxiePlus/SandMan/SandMan.pri
+++ b/SandboxiePlus/SandMan/SandMan.pri
@@ -48,11 +48,12 @@ FORMS += ./Forms/NewBoxWindow.ui \
     ./Forms/SettingsWindow.ui \
     ./Forms/SnapshotsWindow.ui
 
-TRANSLATIONS += ./sandman_de.ts \
-    ./sandman_pt.ts \
-    ./sandman_ru.ts \
-    ./sandman_tr.ts \
-    ./sandman_zh.ts \
-    ./sandman_zh-TW.ts
+TRANSLATIONS += sandman_de.ts \
+    sandman_pt.ts \
+    sandman_ru.ts \
+    sandman_pl.ts \
+    sandman_tr.ts \
+    sandman_zh-CN.ts \
+    sandman_zh-TW.ts
 
 RESOURCES += Resources/SandMan.qrc
diff --git a/SandboxiePlus/SandMan/SandMan.qc.pro b/SandboxiePlus/SandMan/SandMan.qc.pro
index 7f2fda65..c34132d8 100644
--- a/SandboxiePlus/SandMan/SandMan.qc.pro
+++ b/SandboxiePlus/SandMan/SandMan.qc.pro
@@ -34,12 +34,7 @@ RCC_DIR += .
 
 
 include(SandMan.pri)
+
 win32:RC_FILE = SandMan.rc
 
-TRANSLATIONS += sandman_de.ts \
-    sandman_pt.ts \
-    sandman_ru.ts \
-    sandman_pl.ts \
-    sandman_tr.ts \
-    sandman_zh-CN.ts \
-    sandman_zh-TW.ts
+
diff --git a/SandboxiePlus/SandMan/SandMan.rc b/SandboxiePlus/SandMan/SandMan.rc
index ecc13ab3..128b433e 100644
--- a/SandboxiePlus/SandMan/SandMan.rc
+++ b/SandboxiePlus/SandMan/SandMan.rc
@@ -6,6 +6,8 @@
 
 #include "winres.h"
 
+#include "../version.h"
+
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEA)
 LANGUAGE LANG_GERMAN, SUBLANG_GERMAN_AUSTRIAN
 #pragma code_page(1252)
@@ -69,8 +71,8 @@ FINDER_CURSOR           CURSOR                  "./resources/finder.cur"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,6,5,0
- PRODUCTVERSION 0,6,5,0
+ FILEVERSION VERSION_BIN
+ PRODUCTVERSION VERSION_BIN
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -85,14 +87,14 @@ BEGIN
     BEGIN
         BLOCK "0c0704b0"
         BEGIN
-            //VALUE "CompanyName", "xanasoft.net"
+            VALUE "CompanyName", MY_COMPANY_NAME_STRING
             VALUE "FileDescription", "SandBox Manager"
-            VALUE "FileVersion", "0.6.5.0"
+            VALUE "FileVersion", VERSION_STR
             VALUE "InternalName", "SandMan.exe"
-            VALUE "LegalCopyright", "Copyright (C) 2020-2021 by David Xanatos (xanasoft.com)"
+            VALUE "LegalCopyright", MY_COPYRIGHT_STRING
             VALUE "OriginalFilename", "SandMan.exe"
-            VALUE "ProductName", "SandBox Manager"
-            VALUE "ProductVersion", "0.6.5.0"
+            VALUE "ProductName", MY_PRODUCT_NAME_STRING
+            VALUE "ProductVersion", VERSION_STR
         END
     END
     BLOCK "VarFileInfo"
diff --git a/SandboxiePlus/version.h b/SandboxiePlus/version.h
new file mode 100644
index 00000000..db6cb0c7
--- /dev/null
+++ b/SandboxiePlus/version.h
@@ -0,0 +1,19 @@
+#pragma once
+
+#define VERSION_MJR		0
+#define VERSION_MIN 	6
+#define VERSION_REV 	7
+#define VERSION_UPD 	0
+
+#ifndef STR
+#define STR2(X) #X
+#define STR(X) STR2(X)
+#endif
+
+#define VERSION_BIN VERSION_MJR,VERSION_MIN,VERSION_REV,VERSION_UPD
+#define VERSION_STR STR(VERSION_MJR.VERSION_MIN.VERSION_REV.VERSION_UPD)
+
+#define MY_PRODUCT_NAME_STRING  "Sandboxie-Plus"
+#define MY_COMPANY_NAME_STRING  "sandboxie-plus.com"
+#define MY_COPYRIGHT_STRING     "Copyright (C) 2020-2021 by David Xanatos (xanasoft.com)"
+