[reactos] 01/01: [DMUSIC] Sync with Wine Staging 4.0. CORE-15682

[Amine Khaldi]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=517ea70ceb8bd33fc4621…

commit 517ea70ceb8bd33fc4621c48acbb3939a38aa3cb
Author:     Amine Khaldi <amine.khaldi(a)reactos.org>
AuthorDate: Fri Jan 25 13:12:18 2019 +0100
Commit:     Amine Khaldi <amine.khaldi(a)reactos.org>
CommitDate: Fri Jan 25 13:12:18 2019 +0100

    [DMUSIC] Sync with Wine Staging 4.0. CORE-15682
---
 dll/directx/wine/dmusic/dmusic.c      | 4 ++--
 dll/directx/wine/dmusic/dmusic_main.c | 6 +++---
 media/doc/README.WINE                 | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dll/directx/wine/dmusic/dmusic.c b/dll/directx/wine/dmusic/dmusic.c
index 58dcd9d952..fd450b8e36 100644
--- a/dll/directx/wine/dmusic/dmusic.c
+++ b/dll/directx/wine/dmusic/dmusic.c
@@ -301,7 +301,7 @@ static HRESULT WINAPI IDirectMusic8Impl_GetDefaultPort(LPDIRECTMUSIC8
iface, LPG
         return S_OK;
     }
     /* FIXME: Check return types to ensure we're interpreting data right */
-    MultiByteToWideChar(CP_ACP, 0, returnBuffer, -1, buff, sizeof(buff) /
sizeof(WCHAR));
+    MultiByteToWideChar(CP_ACP, 0, returnBuffer, -1, buff, ARRAY_SIZE(buff));
     CLSIDFromString(buff, &defaultPortGUID);
     *guid_port = defaultPortGUID;
 
@@ -373,8 +373,8 @@ static const IDirectMusic8Vtbl DirectMusic8_Vtbl = {
 
 static void create_system_ports_list(IDirectMusic8Impl* object)
 {
+    static const WCHAR emulated[] = {'
','[','E','m','u','l','a','t','e','d',']',0};
     port_info * port;
-    const WCHAR emulated[] = {'
','[','E','m','u','l','a','t','e','d',']',0};
     ULONG nb_ports;
     ULONG nb_midi_out;
     ULONG nb_midi_in;
diff --git a/dll/directx/wine/dmusic/dmusic_main.c
b/dll/directx/wine/dmusic/dmusic_main.c
index da6f45869d..7f77095cb6 100644
--- a/dll/directx/wine/dmusic/dmusic_main.c
+++ b/dll/directx/wine/dmusic/dmusic_main.c
@@ -408,7 +408,7 @@ const char *debugstr_dmguid (const GUID *id) {
 
         if (!id) return "(null)";
 
-	for (i = 0; i < sizeof(guids)/sizeof(guids[0]); i++) {
+	for (i = 0; i < ARRAY_SIZE(guids); i++) {
 		if (IsEqualGUID(id, guids[i].guid))
 			return guids[i].name;
 	}
@@ -452,7 +452,7 @@ static const char *debugstr_DMUS_OBJ_FLAGS (DWORD flagmask) {
 	    FE(DMUS_OBJ_MEMORY),
 	    FE(DMUS_OBJ_STREAM)
 	};
-    return debugstr_flags (flagmask, flags, sizeof(flags)/sizeof(flags[0]));
+    return debugstr_flags(flagmask, flags, ARRAY_SIZE(flags));
 }
 
 /* Dump whole DMUS_OBJECTDESC struct */
@@ -484,7 +484,7 @@ static const char* debugstr_DMUS_PORTPARAMS_FLAGS(DWORD flagmask)
         FE(DMUS_PORTPARAMS_EFFECTS),
         FE(DMUS_PORTPARAMS_SHARE)
     };
-    return debugstr_flags(flagmask, flags, sizeof(flags)/sizeof(flags[0]));
+    return debugstr_flags(flagmask, flags, ARRAY_SIZE(flags));
 }
 
 /* Dump whole DMUS_PORTPARAMS struct */
diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index d19384e21e..cffda39b1b 100644
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -32,7 +32,7 @@ reactos/dll/directx/wine/ddraw          # Synced to WineStaging-3.9
 reactos/dll/directx/wine/devenum        # Synced to WineStaging-3.9
 reactos/dll/directx/wine/dinput         # Synced to WineStaging-4.0
 reactos/dll/directx/wine/dinput8        # Synced to WineStaging-3.3
-reactos/dll/directx/wine/dmusic         # Synced to WineStaging-3.17
+reactos/dll/directx/wine/dmusic         # Synced to WineStaging-4.0
 reactos/dll/directx/wine/dplay          # Synced to WineStaging-3.3
 reactos/dll/directx/wine/dplayx         # Synced to WineStaging-3.17
 reactos/dll/directx/wine/dsound         # Synced to Wine-1.3.29