From 57740e7e1b2f9f5a0f3e595bdfa134bab8e5d7a8 Mon Sep 17 00:00:00 2001
From: Mikkel Krautz <mikkel@krautz.dk>
Date: Sat, 16 May 2015 00:48:32 +0200
Subject: Rename overlay helpers to avoid PDB name clashes with DLLs.

Right now, we do not get PDB files for our overlay DLLs because
the overlay DLL PDB files share their name with the overlay helper
PDB files.

To avoid this madness, we rename the overlay helpers as follows:

  mumble_ol.exe -> mumble_ol_helper.exe
  mumble_ol_x64.exe -> mumble_ol_helper_x64.exe
---
 overlay/overlay_exe/overlay_exe-shared.pro | 2 +-
 overlay/overlay_exe/overlay_exe.cpp        | 6 +++---
 overlay/overlay_exe/overlay_exe.h          | 2 +-
 overlay/overlay_exe/overlay_exe.rc         | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'overlay')

diff --git a/overlay/overlay_exe/overlay_exe-shared.pro b/overlay/overlay_exe/overlay_exe-shared.pro
index 99d2fa647..ac4c12d60 100644
--- a/overlay/overlay_exe/overlay_exe-shared.pro
+++ b/overlay/overlay_exe/overlay_exe-shared.pro
@@ -3,7 +3,7 @@ include(../../compiler.pri)
 TEMPLATE = app
 CONFIG -= qt
 CONFIG += debug_and_release
-TARGET = mumble_ol
+TARGET = mumble_ol_helper
 
 win32 {
   DEFINES += WIN32 _WIN32
diff --git a/overlay/overlay_exe/overlay_exe.cpp b/overlay/overlay_exe/overlay_exe.cpp
index e55ad9086..47d0af87f 100644
--- a/overlay/overlay_exe/overlay_exe.cpp
+++ b/overlay/overlay_exe/overlay_exe.cpp
@@ -54,7 +54,7 @@ static void Alert(LPCWSTR title, LPCWSTR msg) {
 }
 
 // GetExecutableDirPath returns the directory that
-// mumble_ol.exe resides in.
+// mumble_ol_helper.exe resides in.
 static std::wstring GetExecutableDirPath() {
 	wchar_t path[MAX_PATH];
 
@@ -68,7 +68,7 @@ static std::wstring GetExecutableDirPath() {
 	return exePath.append(L"\\");
 }
 
-// ConfigureEnvironment prepares mumble_ol.exe's environment to
+// ConfigureEnvironment prepares mumble_ol_helper.exe's environment to
 // run mumble_ol.dll's OverlayHelperProcessMain() function.
 static bool ConfigureEnvironment() {
 	std::wstring exePath = GetExecutableDirPath();
@@ -77,7 +77,7 @@ static bool ConfigureEnvironment() {
 	if (!SetDllDirectoryW(L""))
 		return false;
 
-	// Set mumble_ol.exe's directory as the current working directory.
+	// Set mumble_ol_helper.exe's directory as the current working directory.
 	if (!SetCurrentDirectoryW(exePath.c_str()))
 		return false;
 
diff --git a/overlay/overlay_exe/overlay_exe.h b/overlay/overlay_exe/overlay_exe.h
index b32ddd031..70b532c44 100644
--- a/overlay/overlay_exe/overlay_exe.h
+++ b/overlay/overlay_exe/overlay_exe.h
@@ -38,7 +38,7 @@ const wchar_t *MUMBLE_OVERLAY_DLL_NAME = L"mumble_ol_x64.dll";
 #endif
 
 /// OverlayHelperError represents exit codes returned by the
-/// overlay helper process (mumble_ol.exe) on Windows.
+/// overlay helper process (mumble_ol_helper.exe) on Windows.
 enum OverlayHelperError {
 	/// The overlay helper process was not passed any
 	/// arguments.
diff --git a/overlay/overlay_exe/overlay_exe.rc b/overlay/overlay_exe/overlay_exe.rc
index cd1a493a6..2c65ffee1 100644
--- a/overlay/overlay_exe/overlay_exe.rc
+++ b/overlay/overlay_exe/overlay_exe.rc
@@ -30,7 +30,7 @@ VS_VERSION_INFO VERSIONINFO
 				VALUE "FileVersion", "1.3.0"
 				VALUE "ProductVersion", "1.3.0"
 				VALUE "LegalCopyright", "Copyright (C) 2005-2011, Thorvald Natvig <thorvald@natvig.com>"
-				VALUE "OriginalFilename", "mumble_ol.exe"
+				VALUE "OriginalFilename", "mumble_ol_helper.exe"
 				VALUE "ProductName", "Mumble"
 #ifdef SNAPSHOT_BUILD
 				VALUE "SpecialBuild", "Snapshot development release"
-- 
cgit v1.2.3