Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
48f276f8
Commit
48f276f8
authored
Sep 10, 2023
by
Rémi Bernon
Committed by
Alexandre Julliard
Sep 21, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dmband: Rewrite band track DBMT chunk parsing.
parent
9276aec6
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
35 additions
and
87 deletions
+35
-87
bandtrack.c
dlls/dmband/bandtrack.c
+35
-87
No files found.
dlls/dmband/bandtrack.c
View file @
48f276f8
...
...
@@ -421,99 +421,43 @@ static HRESULT parse_lbdl_list(struct band_track *This, IStream *stream, struct
return
S_OK
;
}
static
HRESULT
parse_bandtrack_form
(
struct
band_track
*
This
,
DMUS_PRIVATE_CHUNK
*
pChunk
,
IStream
*
pStm
)
static
HRESULT
parse_dmbt_chunk
(
struct
band_track
*
This
,
IStream
*
stream
,
struct
chunk_entry
*
parent
)
{
HRESULT
hr
=
E_FAIL
;
DMUS_PRIVATE_CHUNK
Chunk
;
DWORD
StreamSize
,
StreamCount
,
ListSize
[
3
],
ListCount
[
3
];
LARGE_INTEGER
liMove
;
/* used when skipping chunks */
struct
chunk_entry
chunk
=
{.
parent
=
parent
};
HRESULT
hr
;
if
(
pChunk
->
fccID
!=
DMUS_FOURCC_BANDTRACK_FORM
)
{
ERR_
(
dmfile
)(
": %s chunk should be a BANDTRACK form
\n
"
,
debugstr_fourcc
(
pChunk
->
fccID
));
return
E_FAIL
;
}
if
(
FAILED
(
hr
=
dmobj_parsedescriptor
(
stream
,
parent
,
&
This
->
dmobj
.
desc
,
DMUS_OBJ_OBJECT
|
DMUS_OBJ_NAME
|
DMUS_OBJ_NAME_INAM
|
DMUS_OBJ_VERSION
))
||
FAILED
(
hr
=
stream_reset_chunk_data
(
stream
,
parent
)))
return
hr
;
StreamSize
=
pChunk
->
dwSize
-
sizeof
(
FOURCC
);
StreamCount
=
0
;
while
((
hr
=
stream_next_chunk
(
stream
,
&
chunk
))
==
S_OK
)
{
switch
(
MAKE_IDTYPE
(
chunk
.
id
,
chunk
.
type
))
{
case
DMUS_FOURCC_GUID_CHUNK
:
case
DMUS_FOURCC_VERSION_CHUNK
:
case
MAKE_IDTYPE
(
FOURCC_LIST
,
DMUS_FOURCC_UNFO_LIST
):
/* already parsed by dmobj_parsedescriptor */
break
;
do
{
IStream_Read
(
pStm
,
&
Chunk
,
sizeof
(
FOURCC
)
+
sizeof
(
DWORD
),
NULL
);
StreamCount
+=
sizeof
(
FOURCC
)
+
sizeof
(
DWORD
)
+
Chunk
.
dwSize
;
TRACE_
(
dmfile
)(
": %s chunk (size = %ld)"
,
debugstr_fourcc
(
Chunk
.
fccID
),
Chunk
.
dwSize
);
hr
=
IDirectMusicUtils_IPersistStream_ParseDescGeneric
(
&
Chunk
,
pStm
,
&
This
->
dmobj
.
desc
);
if
(
FAILED
(
hr
))
return
hr
;
case
DMUS_FOURCC_BANDTRACK_CHUNK
:
hr
=
stream_chunk_get_data
(
stream
,
&
chunk
,
&
This
->
header
,
sizeof
(
This
->
header
));
break
;
if
(
hr
==
S_FALSE
)
{
switch
(
Chunk
.
fccID
)
{
case
DMUS_FOURCC_BANDTRACK_CHUNK
:
{
TRACE_
(
dmfile
)(
": BandTrack chunk
\n
"
);
IStream_Read
(
pStm
,
&
This
->
header
,
sizeof
(
DMUS_IO_BAND_TRACK_HEADER
),
NULL
);
TRACE_
(
dmfile
)(
" - bAutoDownload: %u
\n
"
,
This
->
header
.
bAutoDownload
);
break
;
}
case
FOURCC_LIST
:
{
IStream_Read
(
pStm
,
&
Chunk
.
fccID
,
sizeof
(
FOURCC
),
NULL
);
TRACE_
(
dmfile
)(
": LIST chunk of type %s"
,
debugstr_fourcc
(
Chunk
.
fccID
));
ListSize
[
0
]
=
Chunk
.
dwSize
-
sizeof
(
FOURCC
);
ListCount
[
0
]
=
0
;
switch
(
Chunk
.
fccID
)
{
case
DMUS_FOURCC_UNFO_LIST
:
{
TRACE_
(
dmfile
)(
": UNFO list
\n
"
);
do
{
IStream_Read
(
pStm
,
&
Chunk
,
sizeof
(
FOURCC
)
+
sizeof
(
DWORD
),
NULL
);
ListCount
[
0
]
+=
sizeof
(
FOURCC
)
+
sizeof
(
DWORD
)
+
Chunk
.
dwSize
;
TRACE_
(
dmfile
)(
": %s chunk (size = %ld)"
,
debugstr_fourcc
(
Chunk
.
fccID
),
Chunk
.
dwSize
);
hr
=
IDirectMusicUtils_IPersistStream_ParseUNFOGeneric
(
&
Chunk
,
pStm
,
&
This
->
dmobj
.
desc
);
if
(
FAILED
(
hr
))
return
hr
;
if
(
hr
==
S_FALSE
)
{
switch
(
Chunk
.
fccID
)
{
default:
{
TRACE_
(
dmfile
)(
": unknown chunk (irrelevant & skipping)
\n
"
);
liMove
.
QuadPart
=
Chunk
.
dwSize
;
IStream_Seek
(
pStm
,
liMove
,
STREAM_SEEK_CUR
,
NULL
);
break
;
}
}
}
TRACE_
(
dmfile
)(
": ListCount[0] = %ld < ListSize[0] = %ld
\n
"
,
ListCount
[
0
],
ListSize
[
0
]);
}
while
(
ListCount
[
0
]
<
ListSize
[
0
]);
break
;
}
case
DMUS_FOURCC_BANDS_LIST
:
{
static
const
LARGE_INTEGER
zero
=
{
0
};
struct
chunk_entry
chunk
=
{
FOURCC_LIST
,
.
size
=
Chunk
.
dwSize
,
.
type
=
Chunk
.
fccID
};
TRACE_
(
dmfile
)(
": TRACK list
\n
"
);
IStream_Seek
(
pStm
,
zero
,
STREAM_SEEK_CUR
,
&
chunk
.
offset
);
chunk
.
offset
.
QuadPart
-=
12
;
hr
=
parse_lbdl_list
(
This
,
pStm
,
&
chunk
);
if
(
FAILED
(
hr
))
return
hr
;
break
;
}
default:
{
TRACE_
(
dmfile
)(
": unknown (skipping)
\n
"
);
liMove
.
QuadPart
=
Chunk
.
dwSize
-
sizeof
(
FOURCC
);
IStream_Seek
(
pStm
,
liMove
,
STREAM_SEEK_CUR
,
NULL
);
break
;
}
}
break
;
}
default:
{
TRACE_
(
dmfile
)(
": unknown chunk (irrelevant & skipping)
\n
"
);
liMove
.
QuadPart
=
Chunk
.
dwSize
;
IStream_Seek
(
pStm
,
liMove
,
STREAM_SEEK_CUR
,
NULL
);
break
;
}
}
case
MAKE_IDTYPE
(
FOURCC_LIST
,
DMUS_FOURCC_BANDS_LIST
):
hr
=
parse_lbdl_list
(
This
,
stream
,
&
chunk
);
break
;
default:
FIXME
(
"Ignoring chunk %s %s
\n
"
,
debugstr_fourcc
(
chunk
.
id
),
debugstr_fourcc
(
chunk
.
type
));
break
;
}
if
(
FAILED
(
hr
))
break
;
}
TRACE_
(
dmfile
)(
": StreamCount[0] = %ld < StreamSize[0] = %ld
\n
"
,
StreamCount
,
StreamSize
);
}
while
(
StreamCount
<
StreamSize
);
return
S_OK
;
return
hr
;
}
static
inline
struct
band_track
*
impl_from_IPersistStream
(
IPersistStream
*
iface
)
...
...
@@ -538,8 +482,12 @@ static HRESULT WINAPI band_track_persist_stream_Load(IPersistStream *iface, IStr
TRACE_
(
dmfile
)(
": %s chunk (size = %ld)"
,
debugstr_fourcc
(
Chunk
.
fccID
),
Chunk
.
dwSize
);
switch
(
Chunk
.
fccID
)
{
case
DMUS_FOURCC_BANDTRACK_FORM
:
{
static
const
LARGE_INTEGER
zero
=
{
0
};
struct
chunk_entry
chunk
=
{
FOURCC_LIST
,
.
size
=
Chunk
.
dwSize
,
.
type
=
Chunk
.
fccID
};
TRACE_
(
dmfile
)(
": Band track form
\n
"
);
hr
=
parse_bandtrack_form
(
This
,
&
Chunk
,
pStm
);
IStream_Seek
(
pStm
,
zero
,
STREAM_SEEK_CUR
,
&
chunk
.
offset
);
chunk
.
offset
.
QuadPart
-=
12
;
hr
=
parse_dmbt_chunk
(
This
,
pStm
,
&
chunk
);
if
(
FAILED
(
hr
))
return
hr
;
break
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment