Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-29 05:58:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

[DMUSIC] Fix the build for vs 2010

Browse source
This commit is contained in:
Mark Jansen 2018-10-01 20:47:01 +02:00
parent 57ed670b5a
commit cc27de18f4
No known key found for this signature in database
GPG key ID: B39240EE84BEAE8B
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
dll/directx/wine/dmusic/dmobject.c
View file

@ -258,7 +258,11 @@ HRESULT WINAPI dmobj_IDirectMusicObject_SetDescriptor(IDirectMusicObject *iface,
static inline void info_get_name(IStream *stream, const struct chunk_entry *info, static inline void info_get_name(IStream *stream, const struct chunk_entry *info,
DMUS_OBJECTDESC *desc) DMUS_OBJECTDESC *desc)
{ {
#ifndef __REACTOS__
struct chunk_entry chunk = {.parent = info}; struct chunk_entry chunk = {.parent = info};
#else
struct chunk_entry chunk = { 0, 0, 0, {{0}}, info };
#endif
char name[DMUS_MAX_NAME]; char name[DMUS_MAX_NAME];
ULONG len; ULONG len;
HRESULT hr = E_FAIL; HRESULT hr = E_FAIL;
@ -277,7 +281,11 @@ static inline void info_get_name(IStream *stream, const struct chunk_entry *info
static inline void unfo_get_name(IStream *stream, const struct chunk_entry *unfo, static inline void unfo_get_name(IStream *stream, const struct chunk_entry *unfo,
DMUS_OBJECTDESC *desc, BOOL inam) DMUS_OBJECTDESC *desc, BOOL inam)
{ {
#ifndef __REACTOS__
struct chunk_entry chunk = {.parent = unfo}; struct chunk_entry chunk = {.parent = unfo};
#else
struct chunk_entry chunk = { 0, 0, 0, {{0}}, unfo };
#endif
while (stream_next_chunk(stream, &chunk) == S_OK) while (stream_next_chunk(stream, &chunk) == S_OK)
if (chunk.id == DMUS_FOURCC_UNAM_CHUNK || (inam && chunk.id == mmioFOURCC('I','N','A','M'))) if (chunk.id == DMUS_FOURCC_UNAM_CHUNK || (inam && chunk.id == mmioFOURCC('I','N','A','M')))
@ -288,7 +296,11 @@ static inline void unfo_get_name(IStream *stream, const struct chunk_entry *unfo
HRESULT dmobj_parsedescriptor(IStream *stream, const struct chunk_entry *riff, HRESULT dmobj_parsedescriptor(IStream *stream, const struct chunk_entry *riff,
DMUS_OBJECTDESC *desc, DWORD supported) DMUS_OBJECTDESC *desc, DWORD supported)
{ {
#ifndef __REACTOS__
struct chunk_entry chunk = {.parent = riff}; struct chunk_entry chunk = {.parent = riff};
#else
struct chunk_entry chunk = { 0, 0, 0, {{0}}, riff };
#endif
HRESULT hr; HRESULT hr;
TRACE("Looking for %#x in %p: %s\n", supported, stream, debugstr_chunk(riff)); TRACE("Looking for %#x in %p: %s\n", supported, stream, debugstr_chunk(riff));