[ros-diffs] [cwittich] 69089: [MMSYS] don't mix TCHAR with WCHAR

Author: cwittich
Date: Mon Sep  7 14:53:31 2015
New Revision: 69089

URL: http://svn.reactos.org/svn/reactos?rev=69089&view=rev
Log:
[MMSYS] don't mix TCHAR with WCHAR

Modified:
    trunk/reactos/dll/cpl/mmsys/volume.c

Modified: trunk/reactos/dll/cpl/mmsys/volume.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/volume.c?rev…
==============================================================================
--- trunk/reactos/dll/cpl/mmsys/volume.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/mmsys/volume.c	[iso-8859-1] Mon Sep  7 14:53:31 2015
@@ -224,8 +224,9 @@
 {
     UINT NumMixers;
     MIXERCAPS mxc;
-    LPCWSTR nodevices;
-    LoadString(hApplet, IDS_NO_DEVICES, (LPTSTR)&nodevices, 0);
+    TCHAR szNoDevices[256];
+
+    LoadString(hApplet, IDS_NO_DEVICES, szNoDevices, _countof(szNoDevices));
 
     NumMixers = mixerGetNumDevs();
     if (!NumMixers)
@@ -237,7 +238,7 @@
         EnableWindow(GetDlgItem(hwndDlg, IDC_SPEAKER_VOL_BTN), FALSE);
         EnableWindow(GetDlgItem(hwndDlg, IDC_ADVANCED2_BTN),   FALSE);
         SendDlgItemMessage(hwndDlg, IDC_MUTE_ICON, STM_SETIMAGE, IMAGE_ICON,
(LPARAM)pGlobalData->hIconNoHW);
-        SetDlgItemText(hwndDlg, IDC_DEVICE_NAME, nodevices);
+        SetDlgItemText(hwndDlg, IDC_DEVICE_NAME, szNoDevices);
         return;
     }