From aff55adf7f39f525e17496bf0b858c0b21eea014 Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Sat, 10 Nov 2018 22:37:18 -0800
Subject: [PATCH] Add version resources and tweak name and other strings

---
 GSv6Fwd/GSv6Fwd.rc              | 20 ++++++++++++++++++++
 GSv6Fwd/GSv6Fwd.vcxproj         |  3 +++
 GSv6Fwd/GSv6Fwd.vcxproj.filters |  5 +++++
 GSv6FwdSetup/Product.wxs        |  7 ++++---
 4 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 GSv6Fwd/GSv6Fwd.rc

diff --git a/GSv6Fwd/GSv6Fwd.rc b/GSv6Fwd/GSv6Fwd.rc
new file mode 100644
index 0000000..da2fc79
--- /dev/null
+++ b/GSv6Fwd/GSv6Fwd.rc
@@ -0,0 +1,20 @@
+#include <windows.h>
+
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION     2,0,0,0
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            VALUE "CompanyName",        "Moonlight Game Streaming Project"
+            VALUE "FileDescription",    "IPv6 Forwarder for GameStream"
+            VALUE "ProductName",        "IPv6 Forwarder for GameStream"
+        END
+    END
+
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1252
+    END
+END
\ No newline at end of file
diff --git a/GSv6Fwd/GSv6Fwd.vcxproj b/GSv6Fwd/GSv6Fwd.vcxproj
index b585a0b..8c0edbb 100644
--- a/GSv6Fwd/GSv6Fwd.vcxproj
+++ b/GSv6Fwd/GSv6Fwd.vcxproj
@@ -150,6 +150,9 @@
     <ClCompile Include="GSv6Fwd.cpp" />
     <ClCompile Include="pcp.cpp" />
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="GSv6Fwd.rc" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/GSv6Fwd/GSv6Fwd.vcxproj.filters b/GSv6Fwd/GSv6Fwd.vcxproj.filters
index a8a5a5e..abc4020 100644
--- a/GSv6Fwd/GSv6Fwd.vcxproj.filters
+++ b/GSv6Fwd/GSv6Fwd.vcxproj.filters
@@ -22,4 +22,9 @@
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="GSv6Fwd.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/GSv6FwdSetup/Product.wxs b/GSv6FwdSetup/Product.wxs
index 9498d9d..c6aa30b 100644
--- a/GSv6FwdSetup/Product.wxs
+++ b/GSv6FwdSetup/Product.wxs
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
      xmlns:fire="http://schemas.microsoft.com/wix/FirewallExtension">
-  <Product Id="*" Name="IPv6 Forwarder for GS Protocol" Language="1033" Version="1.0.0.0" Manufacturer="Moonlight Game Streaming Project" UpgradeCode="cae27153-26ed-4da2-8dd5-8cddc7126a05">
+  <Product Id="*" Name="IPv6 Forwarder for GameStream" Language="1033" Version="!(bind.fileVersion.GSv6FwdExe)"
+           Manufacturer="Moonlight Game Streaming Project" UpgradeCode="cae27153-26ed-4da2-8dd5-8cddc7126a05">
     <Package InstallerVersion="500" Compressed="yes" InstallScope="perMachine" />
 
     <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
@@ -15,7 +16,7 @@
   <Fragment>
     <Directory Id="TARGETDIR" Name="SourceDir">
       <Directory Id="ProgramFilesFolder">
-        <Directory Id="INSTALLFOLDER" Name="GS IPv6 Forwarder" />
+        <Directory Id="INSTALLFOLDER" Name="IPv6 Forwarder for GameStream" />
       </Directory>
     </Directory>
   </Fragment>
@@ -23,7 +24,7 @@
   <Fragment>
     <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
       <Component Id="ProductComponent">
-        <File Source="$(var.GSv6Fwd.TargetPath)" KeyPath="yes">
+        <File Source="$(var.GSv6Fwd.TargetPath)" KeyPath="yes" Id="GSv6FwdExe">
           <fire:FirewallException Id="FwException"
                                   Scope="any"
                                   Name="IPv6 Forwarder for GS Protocol"/>