1.0.2

AsuroTool/AsuroTool.cpp

@@ -23,6 +23,7 @@
 #include "resource.h"
 #include "AsuroTool.h"
 
+const size_t MAX_FONT_PATH_LENGTH = 2048;
 const UINT TRAY_ID = 420;
 const UINT WMAPP_NOTIFYCALLBACK = WM_APP + 1;
 
@@ -34,6 +35,13 @@ bool isHidden = false;
 
 int main()
 {
+	std::wstring appDir;
+	getAppDir(appDir);
+	if (_wchdir(appDir.c_str()) != 0)
+	{
+		std::cout << "Failed to set working dir." << std::endl;
+	}
+
 	ApplicationData applicationData{};
 	ImGuiCallbacks callbacks{};
 
@@ -46,20 +54,30 @@ int main()
 
 void init(DrawData& drawData, ApplicationData& appData)
 {
+	std::wstring appPath;
+	getAppDir(appPath);
+	char appPathStr[MAX_FONT_PATH_LENGTH];
+	HRESULT convResult = WideCharToMultiByte(CP_UTF8, NULL, &appPath[0], -1, appPathStr, MAX_FONT_PATH_LENGTH, NULL, nullptr);
+	isError(convResult, "Failed to convert path: ");
+
 	// sad :(
 	gDrawData = &drawData;
 	gAppData = &appData;
 
 	// Load text font
 	ImGuiIO& io = ImGui::GetIO();
-	io.Fonts->AddFontFromFileTTF("Montserrat-Regular.ttf", 18.0f);
+	std::string fontPath = std::string(appPathStr);
+	fontPath.append("\\Montserrat-Regular.ttf");
+	io.Fonts->AddFontFromFileTTF(fontPath.c_str(), 18.0f);
 
 	// Load icon font
 	static const ImWchar icons_ranges[] = { 0xEA01, 0xF2DF, 0 };
 	ImFontConfig icons_config;
 	icons_config.MergeMode = true;
 	icons_config.PixelSnapH = true;
-	io.Fonts->AddFontFromFileTTF("remixicon.ttf", 14.0f, &icons_config, icons_ranges);
+	std::string iconFontPath = std::string(appPathStr);
+	iconFontPath.append("\\remixicon.ttf");
+	io.Fonts->AddFontFromFileTTF(iconFontPath.c_str(), 14.0f, &icons_config, icons_ranges);
 
 	// Set window icon
 	HINSTANCE instance = GetModuleHandle(NULL);

AsuroTool/AsuroTool.h

@@ -13,5 +13,4 @@ ImVec2 menuBar(DrawData& drawData, ApplicationData& appData);
 ImVec2 audioDeviceWindow(ApplicationData& appData, std::vector<AudioDevice>& deviceList, const char* title);
 void drawCircle(float radius, ImU32 color);
 
-void GenerateTrayUUID(UUID* uuid);
 LRESULT trayIconEventHandler(int code, WPARAM wParam, LPARAM lParam);

AsuroTool/AsuroTool.rc

@@ -71,8 +71,8 @@ IDI_ICON1               ICON                    "kaiju.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,1,1
+ FILEVERSION 1,0,2,1
- PRODUCTVERSION 1,0,1,1
+ PRODUCTVERSION 1,0,2,1
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -89,12 +89,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Asuro"
             VALUE "FileDescription", "Audio Thingy"
-            VALUE "FileVersion", "1.0.1.1"
+            VALUE "FileVersion", "1.0.2.1"
             VALUE "InternalName", "AsuroTool.exe"
             VALUE "LegalCopyright", "Copyright (C) 2022"
             VALUE "OriginalFilename", "AsuroTool.exe"
             VALUE "ProductName", "Audio Thingy"
-            VALUE "ProductVersion", "1.0.1.1"
+            VALUE "ProductVersion", "1.0.2.1"
         END
     END
     BLOCK "VarFileInfo"

AsuroTool/AsuroTool.vcxproj

@@ -97,6 +97,9 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>pathcch.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <IgnoreSpecificDefaultLibraries>
+      </IgnoreSpecificDefaultLibraries>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -114,6 +117,9 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>pathcch.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <IgnoreSpecificDefaultLibraries>
+      </IgnoreSpecificDefaultLibraries>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -127,6 +133,9 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>pathcch.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <IgnoreSpecificDefaultLibraries>
+      </IgnoreSpecificDefaultLibraries>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -144,6 +153,9 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>pathcch.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <IgnoreSpecificDefaultLibraries>
+      </IgnoreSpecificDefaultLibraries>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>

AsuroTool/Settings.cpp

@@ -81,12 +81,9 @@ void setAutostart(bool newValue)
 	if (newValue)
 	{
 		std::wstring appPath;
-		appPath.resize(MAX_PATH_LENGTH);
+		if (FAILED(getAppPath(appPath))) return;
-		hr = GetModuleFileName(NULL, &appPath[0], static_cast<DWORD>(appPath.size()));
-		if (isError(hr, "Failed to get executable name: ")) return;
-		appPath.resize(wcslen(appPath.data()));
 
-		hr = RegSetValueEx(runKey, KEY_APP_NAME, 0, REG_SZ, (BYTE*)appPath.c_str(), (appPath.size() + 1) * sizeof(wchar_t));
+		hr = RegSetValueEx(runKey, KEY_APP_NAME, 0, REG_SZ, (BYTE*)appPath.c_str(), static_cast<DWORD>((appPath.size() + 1) * sizeof(wchar_t)));
 		if (isError(hr, "Failed to write autostart key: ")) return;
 	}
 	else

AsuroTool/Util.cpp

@@ -1,6 +1,7 @@
 #include <iostream>
 
 #include "Util.h"
+#include "pathcch.h"
 
 bool isError(const HRESULT result, const std::stringstream message)
 {
@@ -29,3 +30,24 @@ std::string utf8Encode(const std::wstring& wstr)
 	WideCharToMultiByte(CP_UTF8, 0, wstr.c_str(), -1, &resultString[0], sizeNeeded, NULL, NULL);
 	return resultString;
 }
+
+HRESULT getAppPath(std::wstring& outPath)
+{
+	const size_t MAX_PATH_LENGTH = 32767;
+	outPath.resize(MAX_PATH_LENGTH);
+	HRESULT hr = GetModuleFileName(NULL, &outPath[0], static_cast<DWORD>(outPath.size()));
+	if (isError(hr, "Failed to get executable name: ")) return hr;
+	outPath.resize(wcslen(outPath.data()));
+	return hr;
+}
+
+HRESULT getAppDir(std::wstring& outPath)
+{
+	HRESULT hr = getAppPath(outPath);
+	if (FAILED(hr)) return hr;
+
+	hr = PathCchRemoveFileSpec(&outPath[0], static_cast<DWORD>(outPath.size()));
+	if (isError(hr, "Failed to get executable dir: ")) return hr;
+	outPath.resize(wcslen(outPath.data()));
+	return hr;
+}

AsuroTool/Util.h

@@ -6,3 +6,5 @@
 bool isError(const HRESULT result, const std::stringstream message);
 bool isError(const HRESULT result, const char* message);
 std::string utf8Encode(const std::wstring& wstr);
+HRESULT getAppPath(std::wstring& outPath);
+HRESULT getAppDir(std::wstring& outPath);

ImguiBase/ImguiBase.vcxproj

@@ -107,6 +107,8 @@
     <Lib>
       <AdditionalLibraryDirectories>E:\Code\glfw-3.3.7.bin.WIN64\lib-vc2022;D:\Applications\VulkanSDK\1.2.182.0\Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>vulkan-1.lib;glfw3.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <IgnoreSpecificDefaultLibraries>
+      </IgnoreSpecificDefaultLibraries>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -130,6 +132,8 @@
     <Lib>
       <AdditionalLibraryDirectories>E:\Code\glfw-3.3.7.bin.WIN64\lib-vc2022;D:\Applications\VulkanSDK\1.2.182.0\Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>vulkan-1.lib;glfw3.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <IgnoreSpecificDefaultLibraries>
+      </IgnoreSpecificDefaultLibraries>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -149,6 +153,8 @@
     <Lib>
       <AdditionalLibraryDirectories>E:\Code\glfw-3.3.7.bin.WIN64\lib-vc2022;D:\Applications\VulkanSDK\1.2.182.0\Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>vulkan-1.lib;glfw3.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <IgnoreSpecificDefaultLibraries>
+      </IgnoreSpecificDefaultLibraries>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -172,6 +178,8 @@
     <Lib>
       <AdditionalLibraryDirectories>E:\Code\glfw-3.3.7.bin.WIN64\lib-vc2022;D:\Applications\VulkanSDK\1.2.182.0\Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>vulkan-1.lib;glfw3.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <IgnoreSpecificDefaultLibraries>
+      </IgnoreSpecificDefaultLibraries>
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>

ImguiNodes/ImguiNodes.vcxproj

@@ -96,6 +96,8 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <IgnoreSpecificDefaultLibraries>
+      </IgnoreSpecificDefaultLibraries>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -112,6 +114,8 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <IgnoreSpecificDefaultLibraries>
+      </IgnoreSpecificDefaultLibraries>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -124,6 +128,8 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <IgnoreSpecificDefaultLibraries>
+      </IgnoreSpecificDefaultLibraries>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -140,6 +146,8 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <IgnoreSpecificDefaultLibraries>
+      </IgnoreSpecificDefaultLibraries>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>