Michael Stefaniuc : mcicda: Use wide-char string literals.
Alexandre Julliard
julliard at winehq.org
Mon Oct 5 15:54:57 CDT 2020
Module: wine
Branch: master
Commit: 1d5e028ef47c2112e86be7620792394401656beb
URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d5e028ef47c2112e86be7620792394401656beb
Author: Michael Stefaniuc <mstefani at winehq.org>
Date: Sat Oct 3 20:28:15 2020 +0200
mcicda: Use wide-char string literals.
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/mcicda/mcicda.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/dlls/mcicda/mcicda.c b/dlls/mcicda/mcicda.c
index e23ba5a2d6..ea7e2a6261 100644
--- a/dlls/mcicda/mcicda.c
+++ b/dlls/mcicda/mcicda.c
@@ -665,15 +665,13 @@ static DWORD MCICDA_Info(UINT wDevID, DWORD dwFlags, LPMCI_INFO_PARMSW lpParms)
TRACE("buf=%p, len=%u\n", lpParms->lpstrReturn, lpParms->dwRetSize);
if (dwFlags & MCI_INFO_PRODUCT) {
- static const WCHAR wszAudioCd[] = {'W','i','n','e','\'','s',' ','a','u','d','i','o',' ','C','D',0};
- str = wszAudioCd;
+ str = L"Wine's audio CD";
} else if (dwFlags & MCI_INFO_MEDIA_UPC) {
ret = MCIERR_NO_IDENTITY;
} else if (dwFlags & MCI_INFO_MEDIA_IDENTITY) {
DWORD res = 0;
CDROM_TOC toc;
DWORD br;
- static const WCHAR wszLu[] = {'%','l','u',0};
if (!device_io(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0,
&toc, sizeof(toc), &br, NULL)) {
@@ -681,7 +679,7 @@ static DWORD MCICDA_Info(UINT wDevID, DWORD dwFlags, LPMCI_INFO_PARMSW lpParms)
}
res = CDROM_Audio_GetSerial(&toc);
- swprintf(buffer, ARRAY_SIZE(buffer), wszLu, res);
+ swprintf(buffer, ARRAY_SIZE(buffer), L"%lu", res);
str = buffer;
} else {
WARN("Don't know this info command (%u)\n", dwFlags);
More information about the wine-cvs
mailing list