From 5087ae6ecd02e06e9e090d481b4b6cf68fd2424b Mon Sep 17 00:00:00 2001
From: zilmar <zilmar@pj64-emu.com>
Date: Wed, 10 Jun 2020 11:18:41 +0930
Subject: [PATCH] NRage: Fix up some some unicode issues

---
 Source/nragev20/FileAccess.cpp         | 4 ++--
 Source/nragev20/Interface.cpp          | 3 ++-
 Source/nragev20/NRage_Input_V2.vcxproj | 3 +++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Source/nragev20/FileAccess.cpp b/Source/nragev20/FileAccess.cpp
index c11b83c43..5a13741f4 100644
--- a/Source/nragev20/FileAccess.cpp
+++ b/Source/nragev20/FileAccess.cpp
@@ -1105,8 +1105,8 @@ bool SaveLastBrowseDir( TCHAR *pszFileName, DWORD dwType )
 // Handy, because it handles all our file type extensions for us.
 bool BrowseFile( HWND hDlg, TCHAR *pszFileName, DWORD dwType, bool fSave )
 {
-    TCHAR pszFilter[DEFAULT_BUFFER];
-    TCHAR pszTitle[DEFAULT_BUFFER];
+    TCHAR pszFilter[DEFAULT_BUFFER] = { 0 };
+    TCHAR pszTitle[DEFAULT_BUFFER] = { 0 };
     DWORD dwFlags = /*OFN_DONTADDTORECENT |*/ OFN_NOCHANGEDIR;
     dwFlags |= (fSave)  ? OFN_PATHMUSTEXIST | OFN_OVERWRITEPROMPT
                         : OFN_HIDEREADONLY | OFN_FILEMUSTEXIST;
diff --git a/Source/nragev20/Interface.cpp b/Source/nragev20/Interface.cpp
index 1d7bcc656..34701da31 100644
--- a/Source/nragev20/Interface.cpp
+++ b/Source/nragev20/Interface.cpp
@@ -35,6 +35,7 @@
 #include "PakIO.h"
 #include "Version.h"
 #include "XInputController.h"
+#include <Common\StdString.h>
 
 // Prototypes //
 BOOL CALLBACK ControllerTabProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam );
@@ -105,7 +106,7 @@ BOOL CALLBACK MainDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam )
                 TCHAR tszBuffer[DEFAULT_BUFFER], tszMsg[DEFAULT_BUFFER / 2];
 
                 LoadString( g_hResourceDLL, IDS_VERSTRING, tszBuffer, DEFAULT_BUFFER / 2);
-                _stprintf(tszMsg, tszBuffer, VER_FILE_VERSION_STR);
+                _stprintf(tszMsg, tszBuffer, stdstr(VER_FILE_VERSION_STR).ToUTF16().c_str());
                 SetDlgItemText( hDlg, IDC_VERSIONSTRING, tszMsg );
             }
 
diff --git a/Source/nragev20/NRage_Input_V2.vcxproj b/Source/nragev20/NRage_Input_V2.vcxproj
index d6cd9a03c..e415ec323 100644
--- a/Source/nragev20/NRage_Input_V2.vcxproj
+++ b/Source/nragev20/NRage_Input_V2.vcxproj
@@ -91,6 +91,9 @@
     <ResourceCompile Include="NRagePluginV2.rc" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\Common\Common.vcxproj">
+      <Project>{b4a4b994-9111-42b1-93c2-6f1ca8bc4421}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\UpdateVersion\UpdateVersion.vcxproj">
       <Project>{1968162c-0793-491d-91a1-81645a24d399}</Project>
     </ProjectReference>