Michael Stefaniuc : winecoreaudio.drv: Use the ARRAY_SIZE() macro.

Alexandre Julliard julliard at winehq.org
Fri Nov 16 14:38:19 CST 2018


Module: wine
Branch: master
Commit: 2170cce2afa8491cc7d99a0ede23890db3e05431
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=2170cce2afa8491cc7d99a0ede23890db3e05431

Author: Michael Stefaniuc <mstefani at winehq.org>
Date:   Thu Nov 15 20:42:21 2018 +0100

winecoreaudio.drv: Use the ARRAY_SIZE() macro.

Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
Signed-off-by: Andrew Eikum <aeikum at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/winecoreaudio.drv/midi.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c
index a40ca2a..edaf128 100644
--- a/dlls/winecoreaudio.drv/midi.c
+++ b/dlls/winecoreaudio.drv/midi.c
@@ -148,7 +148,7 @@ LONG CoreAudio_MIDIInit(void)
         sources[i].source = MIDIGetSource(i);
 
         CoreMIDI_GetObjectName(sources[i].source, szPname, sizeof(szPname));
-        MultiByteToWideChar(CP_ACP, 0, szPname, -1, sources[i].caps.szPname, sizeof(sources[i].caps.szPname)/sizeof(WCHAR));
+        MultiByteToWideChar(CP_ACP, 0, szPname, -1, sources[i].caps.szPname, ARRAY_SIZE(sources[i].caps.szPname));
 
         MIDIPortConnectSource(MIDIInPort, sources[i].source, &sources[i].wDevID);
 
@@ -164,7 +164,7 @@ LONG CoreAudio_MIDIInit(void)
     for (i = 0; i < MAX_MIDI_SYNTHS; i++)
     {
         snprintf(szPname, sizeof(szPname), "CoreAudio MIDI Synth %d", i);
-        MultiByteToWideChar(CP_ACP, 0, szPname, -1, destinations[i].caps.szPname, sizeof(destinations[i].caps.szPname)/sizeof(WCHAR));
+        MultiByteToWideChar(CP_ACP, 0, szPname, -1, destinations[i].caps.szPname, ARRAY_SIZE(destinations[i].caps.szPname));
 
         destinations[i].caps.wTechnology = MOD_SYNTH;
         destinations[i].caps.wChannelMask = 0xFFFF;
@@ -182,7 +182,7 @@ LONG CoreAudio_MIDIInit(void)
         destinations[i].dest = MIDIGetDestination(i - MAX_MIDI_SYNTHS);
 
         CoreMIDI_GetObjectName(destinations[i].dest, szPname, sizeof(szPname));
-        MultiByteToWideChar(CP_ACP, 0, szPname, -1, destinations[i].caps.szPname, sizeof(destinations[i].caps.szPname)/sizeof(WCHAR));
+        MultiByteToWideChar(CP_ACP, 0, szPname, -1, destinations[i].caps.szPname, ARRAY_SIZE(destinations[i].caps.szPname));
 
         destinations[i].caps.wTechnology = MOD_MIDIPORT;
         destinations[i].caps.wChannelMask = 0xFFFF;




More information about the wine-cvs mailing list