[PATCH] msg711.acm: Use wide-char string literals.

Michael Stefaniuc mstefani at winehq.org
Sat Oct 3 13:28:22 CDT 2020


Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
---
 dlls/msg711.acm/msg711.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/dlls/msg711.acm/msg711.c b/dlls/msg711.acm/msg711.c
index 6909494e29f..7478bfd92a1 100644
--- a/dlls/msg711.acm/msg711.c
+++ b/dlls/msg711.acm/msg711.c
@@ -675,10 +675,6 @@ static	LRESULT G711_DriverDetails(PACMDRIVERDETAILSW add)
  */
 static	LRESULT	G711_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery)
 {
-    static const WCHAR szPcm[]={'P','C','M',0};
-    static const WCHAR szALaw[]={'A','-','L','a','w',0};
-    static const WCHAR szULaw[]={'U','-','L','a','w',0};
-
     switch (dwQuery)
     {
     case ACM_FORMATTAGDETAILSF_INDEX:
@@ -712,19 +708,19 @@ static	LRESULT	G711_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery)
 	aftd->dwFormatTag = WAVE_FORMAT_PCM;
 	aftd->cbFormatSize = sizeof(PCMWAVEFORMAT);
 	aftd->cStandardFormats = ARRAY_SIZE(PCM_Formats);
-        lstrcpyW(aftd->szFormatTag, szPcm);
+        lstrcpyW(aftd->szFormatTag, L"PCM");
         break;
     case 1:
 	aftd->dwFormatTag = WAVE_FORMAT_ALAW;
 	aftd->cbFormatSize = sizeof(WAVEFORMATEX);
 	aftd->cStandardFormats = ARRAY_SIZE(ALaw_Formats);
-        lstrcpyW(aftd->szFormatTag, szALaw);
+        lstrcpyW(aftd->szFormatTag, L"A-Law");
 	break;
     case 2:
 	aftd->dwFormatTag = WAVE_FORMAT_MULAW;
 	aftd->cbFormatSize = sizeof(WAVEFORMATEX);
 	aftd->cStandardFormats = ARRAY_SIZE(ULaw_Formats);
-        lstrcpyW(aftd->szFormatTag, szULaw);
+        lstrcpyW(aftd->szFormatTag, L"U-Law");
 	break;
     }
     return MMSYSERR_NOERROR;
-- 
2.26.2




More information about the wine-devel mailing list