Allow filters to be build as unicode

DirectShowFilters/BDReader/BDReader.vcxproj

@@ -19,13 +19,13 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfMfc>Dynamic</UseOfMfc>
     <UseOfAtl>Static</UseOfAtl>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfMfc>Dynamic</UseOfMfc>
     <UseOfAtl>Dynamic</UseOfAtl>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -101,7 +101,7 @@
       <ShowProgress>NotSet</ShowProgress>
       <OutputFile>bin\Release/BDReader.ax</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(DSHOW_BASE)Release_MBCS; $(DXSDK_DIR)lib\x86;$(WINDOWS_SDK)\lib; ..\shared;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(DSHOW_BASE)Release; $(DXSDK_DIR)lib\x86;$(WINDOWS_SDK)\lib; ..\shared;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <IgnoreSpecificDefaultLibraries>libcmt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <ModuleDefinitionFile>.\source\BDReader.def</ModuleDefinitionFile>
@@ -152,7 +152,7 @@
       <AdditionalDependencies>DvbCoreUtilsD.lib;strmbasd.lib;quartz.lib;winmm.lib;msvcrtd.lib;ws2_32.lib;mfuuid.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\Debug/BDReader.ax</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(DSHOW_BASE)Debug_MBCS; $(DXSDK_DIR)lib\x86;$(WINDOWS_SDK)\lib;..\shared;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(DSHOW_BASE)Debug; $(DXSDK_DIR)lib\x86;$(WINDOWS_SDK)\lib;..\shared;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <IgnoreSpecificDefaultLibraries>libcmtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <ModuleDefinitionFile>.\source\BDReader.def</ModuleDefinitionFile>

DirectShowFilters/BDReader/source/BDReader.cpp

@@ -40,8 +40,8 @@
 #include "..\..\alloctracing.h"
 
 extern void SetThreadName(DWORD dwThreadID, char* threadName);
-extern void LogDebug(const char *fmt, ...);
-extern void GetLogFile(char *pLog);
+extern void LogDebug(const char* fmt, ...);
+extern void GetLogFile(TCHAR* pLog);
 
 const AMOVIESETUP_MEDIATYPE acceptAudioPinTypes =
 {

DirectShowFilters/BDReader/source/LibBlurayWrapper.cpp

@@ -122,21 +122,23 @@ void CLibBlurayWrapper::StaticOverlayProc(void *this_gen, const BD_OVERLAY * con
 
 bool CLibBlurayWrapper::Initialize()
 {
-  TCHAR szDirectory[MAX_PATH] = "";
-  TCHAR szPath[MAX_PATH] = "";
+  USES_CONVERSION;
+
+  TCHAR szDirectory[MAX_PATH] = _T("");
+  TCHAR szPath[MAX_PATH] = _T("");
   GetModuleFileName(NULL, szPath, sizeof(szPath) - 1);
 
-  strncpy(szDirectory, szPath, strrchr(szPath, '\\') - szPath);
-  szDirectory[strlen(szDirectory)] = '\0';
+  _tcsncpy(szDirectory, szPath, _tcsrchr(szPath, '\\') - szPath);
+  szDirectory[_tcslen(szDirectory)] = '\0';
 
-  wsprintf(szDirectory,"%s\\bluray.dll", szDirectory);	
+  _stprintf_s(szDirectory, _T("%s\\bluray.dll"), szDirectory);
   LogDebug("CLibBlurayWrapper - Load bluray: %s", szDirectory);
   m_hDLL = LoadLibrary(szDirectory);
 
   if (!m_hDLL)
   {
     LogDebug("Failed to load the DLL from application exe path, trying c:\\");
-    m_hDLL = LoadLibrary("c:\\bluray.dll");
+    m_hDLL = LoadLibrary(_T("c:\\bluray.dll"));
   }
 
   if (!m_hDLL)

DirectShowFilters/BDReader/source/utils.cpp

@@ -5,26 +5,28 @@
 #include <streams.h>
 #include <initguid.h>
 #include <shlobj.h>
-#include <tchar.h>
 
 // For more details for memory leak detection see the alloctracing.h header
 #include "..\..\alloctracing.h"
 
-static char logFile[MAX_PATH];
+static TCHAR logFile[MAX_PATH];
 static WORD logFileParsed = -1;
 
-void GetLogFile(char *pLog)
+void GetLogFile(TCHAR* pLog)
 {
   SYSTEMTIME systemTime;
   GetLocalTime(&systemTime);
-  if(logFileParsed != systemTime.wDay)
+  if (logFileParsed != systemTime.wDay)
   {
     TCHAR folder[MAX_PATH];
     ::SHGetSpecialFolderPath(NULL,folder,CSIDL_COMMON_APPDATA,FALSE);
-    sprintf(logFile,"%s\\Team MediaPortal\\MediaPortal\\Log\\BDReader-%04.4d-%02.2d-%02.2d.Log",folder, systemTime.wYear, systemTime.wMonth, systemTime.wDay);
+
+    _stprintf_s(logFile, _T("%s\\Team MediaPortal\\MediaPortal\\Log\\BDReader-%04.4d-%02.2d-%02.2d.Log"), 
+      folder, systemTime.wYear, systemTime.wMonth, systemTime.wDay);
+
     logFileParsed=systemTime.wDay; // rec
   }
-  strcpy(pLog, &logFile[0]);
+  _tcscpy(pLog, &logFile[0]);
 }
 
 void LogDebug(const char *fmt, ...)
@@ -43,9 +45,9 @@ void LogDebug(const char *fmt, ...)
 //#ifdef DONTLOG
   TCHAR filename[1024];
   GetLogFile(filename);
-  FILE* fp = fopen(filename,"a+");
+  FILE* fp = _tfopen(filename, _T("a+"));
 
-  if (fp != NULL)
+  if (fp)
   {
     fprintf(fp,"%02.2d-%02.2d-%04.4d %02.2d:%02.2d:%02.2d.%03.3d [%5x]%s\n",
       systemTime.wDay, systemTime.wMonth, systemTime.wYear,

DirectShowFilters/DVBSubtitle3/DVBSubtitle3.vcxproj

@@ -24,13 +24,13 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <UseOfAtl>Static</UseOfAtl>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <UseOfAtl>false</UseOfAtl>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -107,7 +107,7 @@
       <AdditionalDependencies>strmbase.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\Release/DVBSub3.ax</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(DSHOW_BASE)Release_MBCS; $(DXSDK_DIR)lib\x86;$(WINDOWS_SDK)\libSource\Hdmv\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(DSHOW_BASE)Release; $(DXSDK_DIR)lib\x86;$(WINDOWS_SDK)\libSource\Hdmv\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <IgnoreSpecificDefaultLibraries>uafxcwd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <ModuleDefinitionFile>.\source\DVBSub3.def</ModuleDefinitionFile>
@@ -159,7 +159,7 @@
       <AdditionalDependencies>strmbasd.lib;winmm.lib;gdiplus.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\Debug/DVBSub3.ax</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(DSHOW_BASE)Debug_MBCS; $(DXSDK_DIR)lib\x86;$(WINDOWS_SDK)\lib;Source\Hdmv\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(DSHOW_BASE)Debug; $(DXSDK_DIR)lib\x86;$(WINDOWS_SDK)\lib;Source\Hdmv\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <IgnoreSpecificDefaultLibraries>uafxcwd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <ModuleDefinitionFile>.\source\DVBSub3.def</ModuleDefinitionFile>

DirectShowFilters/DVBSubtitle3/Source/DVBSub.cpp

@@ -33,7 +33,7 @@
 
 extern void LogDebug( const char *fmt, ... );
 extern void LogDebugPTS( const char *fmt, uint64_t pts );
-extern void GetLogFile(char *pLog);
+extern void GetLogFile(TCHAR* pLog);
 
 //
 // Constructor

DirectShowFilters/DVBSubtitle3/Source/dllmain.cpp

@@ -106,12 +106,12 @@ BOOL APIENTRY DllMain(HANDLE hModule,
 
 // Logging 
 //#ifdef DEBUG
-char *logbuffer=NULL; 
-void GetLogFile(char *pLog)
+char* logbuffer = NULL;
+void GetLogFile(TCHAR* pLog)
 {
   TCHAR folder[MAX_PATH];
   ::SHGetSpecialFolderPath(NULL,folder,CSIDL_COMMON_APPDATA,FALSE);
-  sprintf(pLog,"%s\\Team MediaPortal\\MediaPortal\\Log\\DVBSubs.log",folder);
+  _stprintf(pLog, _T("%s\\Team MediaPortal\\MediaPortal\\Log\\DVBSubs.log"), folder);
 }
 
 
@@ -131,9 +131,9 @@ void LogDebug(const char *fmt, ...)
 //#ifdef DONTLOG
   TCHAR filename[1024];
   GetLogFile(filename);
-  FILE* fp = fopen(filename,"a+");
+  FILE* fp = _tfopen(filename, _T("a+"));
 
-  if (fp!=NULL)
+  if (fp)
   {
     fprintf(fp,"%02.2d-%02.2d-%04.4d %02.2d:%02.2d:%02.2d.%03.3d [%x]%s\n",
       systemTime.wDay, systemTime.wMonth, systemTime.wYear,

DirectShowFilters/DvbCoreUtils/DvbCoreUtils.vcxproj

@@ -19,12 +19,12 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>false</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

DirectShowFilters/LiveMedia555/LiveMedia555.vcxproj

@@ -18,12 +18,12 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>false</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

DirectShowFilters/MPAudioRenderer/AE_mixer/StdString.h

@@ -4105,7 +4105,7 @@ struct FmtArg<std::wstring>
 #ifdef _MFC_VER
   inline CArchive& AFXAPI operator<<(CArchive& ar, const CStdStringA& strA)
   {
-    CString strTemp  = strA;
+    CStdStringA strTemp  = strA;
     return ar << strTemp;
   }
   /*

DirectShowFilters/MPAudioRenderer/AudioRenderer.vcxproj

@@ -20,13 +20,13 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfMfc>Dynamic</UseOfMfc>
     <UseOfAtl>false</UseOfAtl>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfMfc>Dynamic</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -66,7 +66,7 @@
       <AdditionalDependencies>strmbasd.lib;Winmm.lib;dsound.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ShowProgress>LinkVerboseLib</ShowProgress>
       <OutputFile>bin\Debug/mpaudiorenderer.ax</OutputFile>
-      <AdditionalLibraryDirectories>$(DSHOW_BASE)Debug_MBCS; $(DXSDK_DIR)lib\x86;$(WINDOWS_SDK)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(DSHOW_BASE)Debug; $(DXSDK_DIR)lib\x86;$(WINDOWS_SDK)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <IgnoreSpecificDefaultLibraries>libcmtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <ModuleDefinitionFile>.\source\MpAudioRenderer.def</ModuleDefinitionFile>
@@ -103,7 +103,7 @@
       <AdditionalDependencies>strmbase.lib;Winmm.lib;dsound.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ShowProgress>LinkVerboseLib</ShowProgress>
       <OutputFile>bin\Release/mpaudiorenderer.ax</OutputFile>
-      <AdditionalLibraryDirectories>$(DSHOW_BASE)Release_MBCS; $(DXSDK_DIR)lib\x86;$(WINDOWS_SDK)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(DSHOW_BASE)Release; $(DXSDK_DIR)lib\x86;$(WINDOWS_SDK)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <IgnoreSpecificDefaultLibraries>libcmt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <ModuleDefinitionFile>.\source\MpAudioRenderer.def</ModuleDefinitionFile>
       <GenerateDebugInformation>false</GenerateDebugInformation>

DirectShowFilters/MPAudioRenderer/source/Settings.cpp

@@ -138,8 +138,6 @@ AudioRendererSettings::~AudioRendererSettings()
 
 void AudioRendererSettings::LoadSettingsFromRegistry()
 {
-  USES_CONVERSION; // this is required for T2W macro
-
   Log("Loading settings from registry");
 
   HKEY hKey;
@@ -367,13 +365,15 @@ void AudioRendererSettings::LoadSettingsFromRegistry()
     delete[] m_wWASAPIPreferredDeviceId;
     m_wWASAPIPreferredDeviceId = new WCHAR[MAX_REG_LENGTH];
 
-    wcsncpy(m_wWASAPIPreferredDeviceId, T2W(WASAPIPreferredDeviceData), MAX_REG_LENGTH);
+    _tcsncpy(m_wWASAPIPreferredDeviceId, WASAPIPreferredDeviceData, MAX_REG_LENGTH);
 
     delete[] WASAPIPreferredDeviceData;
   }
   else // no settings in registry, create default values
   {
-    Log("Failed to open %s", folder);
+    USES_CONVERSION;
+
+    Log("Failed to open %s", T2A(folder));
     Log("Initializing registry with default settings");
 
     LONG result = RegCreateKeyEx(HKEY_CURRENT_USER, folder, 0, NULL, REG_OPTION_NON_VOLATILE,
@@ -411,7 +411,7 @@ void AudioRendererSettings::LoadSettingsFromRegistry()
 
       delete[] m_wWASAPIPreferredDeviceId;
       m_wWASAPIPreferredDeviceId = new WCHAR[MAX_REG_LENGTH];
-      wcsncpy(m_wWASAPIPreferredDeviceId, T2W(WASAPIPreferredDeviceData), MAX_REG_LENGTH);
+      _tcsncpy(m_wWASAPIPreferredDeviceId, WASAPIPreferredDeviceData, MAX_REG_LENGTH);
 
       WriteRegistryKeyString(hKey, WASAPIPreferredDevice, WASAPIPreferredDeviceData);
     } 
@@ -494,33 +494,39 @@ void AudioRendererSettings::SaveSettingsToRegistry(HKEY hKey)
 
 void AudioRendererSettings::ReadRegistryKeyDword(HKEY hKey, LPCTSTR& lpSubKey, DWORD& data)
 {
+  USES_CONVERSION;
+
   DWORD dwSize = sizeof(DWORD);
   DWORD dwType = REG_DWORD;
   LONG error = RegQueryValueEx(hKey, lpSubKey, NULL, &dwType, (PBYTE)&data, &dwSize);
   if (error != ERROR_SUCCESS)
   {
     if (error == ERROR_FILE_NOT_FOUND)
     {
-      Log("   create default value for %s", lpSubKey);
+      Log("   create default value for %s", T2A(lpSubKey));
       WriteRegistryKeyDword(hKey, lpSubKey, data);
     }
     else
-      Log("   faíled to create default value for %s", lpSubKey);
+      Log("   faíled to create default value for %s", T2A(lpSubKey));
   }
 }
 
 void AudioRendererSettings::WriteRegistryKeyDword(HKEY hKey, LPCTSTR& lpSubKey, DWORD& data)
-{  
+{
+  USES_CONVERSION;
+
   DWORD dwSize = sizeof(DWORD);
   LONG result = RegSetValueEx(hKey, lpSubKey, 0, REG_DWORD, (LPBYTE)&data, dwSize);
   if (result == ERROR_SUCCESS) 
-    Log("Success writing to Registry: %s", lpSubKey);
+    Log("Success writing to Registry: %s", T2A(lpSubKey));
   else 
-    Log("Error writing to Registry - subkey: %s error: %d", lpSubKey, result);
+    Log("Error writing to Registry - subkey: %s error: %d", T2A(lpSubKey), result);
 }
 
 void AudioRendererSettings::ReadRegistryKeyString(HKEY hKey, LPCTSTR& lpSubKey, LPCTSTR& data)
 {
+  USES_CONVERSION;
+
   DWORD dwSize = MAX_REG_LENGTH;
   DWORD dwType = REG_SZ;
   LONG error = RegQueryValueEx(hKey, lpSubKey, NULL, &dwType, (PBYTE)data, &dwSize);
@@ -529,23 +535,25 @@ void AudioRendererSettings::ReadRegistryKeyString(HKEY hKey, LPCTSTR& lpSubKey,
   {
     if (error == ERROR_FILE_NOT_FOUND)
     {
-      Log("   create default value for %s", lpSubKey);
+      Log("   create default value for %s", T2A(lpSubKey));
       WriteRegistryKeyString(hKey, lpSubKey, data);
     }
     else if (error == ERROR_MORE_DATA)
-      Log("   too much data, corrupted registry setting(?):  %s", lpSubKey);      
+      Log("   too much data, corrupted registry setting(?):  %s", T2A(lpSubKey));
     else
-      Log("   error: %d subkey: %s", error, lpSubKey);       
+      Log("   error: %d subkey: %s", error, T2A(lpSubKey));
   }
 }
 
 void AudioRendererSettings::WriteRegistryKeyString(HKEY hKey, LPCTSTR& lpSubKey, LPCTSTR& data)
 {  
-  LONG result = RegSetValueEx(hKey, lpSubKey, 0, REG_SZ, (LPBYTE)data, strlen(data)+1);
+  USES_CONVERSION;
+
+  LONG result = RegSetValueEx(hKey, lpSubKey, 0, REG_SZ, (LPBYTE)data, _tcslen(data) * sizeof(TCHAR));
   if (result == ERROR_SUCCESS) 
-    Log("Success writing to Registry: %s", lpSubKey);
+    Log("Success writing to Registry: %s", T2A(lpSubKey));
   else 
-    Log("Error writing to Registry - subkey: %s error: %d", lpSubKey, result);
+    Log("Error writing to Registry - subkey: %s error: %d", T2A(lpSubKey), result);
 }
 
 bool AudioRendererSettings::AllowedValue(unsigned int allowedRates[], unsigned int size, unsigned int rate)
@@ -747,8 +755,8 @@ HRESULT AudioRendererSettings::GetAvailableAudioDevices(IMMDeviceCollection** pp
   {
     if (hDialog)
     {
-      LPSTR defaultDevice = "<OS default audio device>";
-      SendDlgItemMessage(hDialog, IDC_AUDIO_DEVICE, CB_ADDSTRING, 0, (LPARAM)defaultDevice);
+      TCHAR* pDefaultDevice = _T("<OS default audio device>");
+      SendDlgItemMessage(hDialog, IDC_AUDIO_DEVICE, CB_ADDSTRING, 0, (LPARAM)pDefaultDevice);
       SendDlgItemMessage(hDialog, IDC_AUDIO_DEVICE, CB_SETCURSEL, 0, 0);
     }