From accf2317c8368d7d0d1a545342502cf381fb7fb1 Mon Sep 17 00:00:00 2001 From: Christoph von Wittich Date: Mon, 7 Sep 2015 14:53:31 +0000 Subject: [PATCH] [MMSYS] don't mix TCHAR with WCHAR svn path=/trunk/; revision=69089 --- reactos/dll/cpl/mmsys/volume.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/reactos/dll/cpl/mmsys/volume.c b/reactos/dll/cpl/mmsys/volume.c index 25143e7ecc2..140caa8b00c 100644 --- a/reactos/dll/cpl/mmsys/volume.c +++ b/reactos/dll/cpl/mmsys/volume.c @@ -224,8 +224,9 @@ InitVolumeControls(HWND hwndDlg, PGLOBAL_DATA pGlobalData) { 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 @@ InitVolumeControls(HWND hwndDlg, PGLOBAL_DATA pGlobalData) 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; }