Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
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-winehq
Commits
a4664409
Commit
a4664409
authored
Jan 09, 2014
by
Michael Stefaniuc
Committed by
Alexandre Julliard
Jan 09, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dmime: Remove "#if 1" preprocessor directives.
parent
81c42ce7
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
12 deletions
+1
-12
segment.c
dlls/dmime/segment.c
+0
-2
segtriggertrack.c
dlls/dmime/segtriggertrack.c
+0
-2
tempotrack.c
dlls/dmime/tempotrack.c
+1
-8
No files found.
dlls/dmime/segment.c
View file @
a4664409
...
...
@@ -1109,7 +1109,6 @@ static HRESULT IDirectMusicSegment8Impl_IPersistStream_ParseSegmentForm (LPPERSI
case
DMUS_FOURCC_SEGMENT_CHUNK
:
{
DWORD
checkSz
=
sizeof
(
FOURCC
);
TRACE_
(
dmfile
)(
": segment chunk
\n
"
);
#if 1
/** DX 7 */
IStream_Read
(
pStm
,
&
This
->
header
.
dwRepeats
,
sizeof
(
This
->
header
.
dwRepeats
),
NULL
);
checkSz
+=
sizeof
(
This
->
header
.
dwRepeats
);
...
...
@@ -1145,7 +1144,6 @@ static HRESULT IDirectMusicSegment8Impl_IPersistStream_ParseSegmentForm (LPPERSI
IStream_Read
(
pStm
,
&
This
->
header
.
rtPlayStart
,
sizeof
(
This
->
header
.
rtPlayStart
),
NULL
);
checkSz
+=
sizeof
(
This
->
header
.
rtPlayStart
);
}
#endif
liMove
.
QuadPart
=
Chunk
.
dwSize
-
checkSz
+
sizeof
(
FOURCC
);
IStream_Seek
(
pStm
,
liMove
,
STREAM_SEEK_CUR
,
NULL
);
break
;
...
...
dlls/dmime/segtriggertrack.c
View file @
a4664409
...
...
@@ -460,7 +460,6 @@ static HRESULT WINAPI IDirectMusicSegTriggerTrack_IPersistStream_Load (LPPERSIST
TRACE
(
"(%p, %p): Loading
\n
"
,
This
,
pStm
);
#if 1
IStream_Read
(
pStm
,
&
Chunk
,
sizeof
(
FOURCC
)
+
sizeof
(
DWORD
),
NULL
);
TRACE_
(
dmfile
)(
": %s chunk (size = %d)"
,
debugstr_fourcc
(
Chunk
.
fccID
),
Chunk
.
dwSize
);
switch
(
Chunk
.
fccID
)
{
...
...
@@ -491,7 +490,6 @@ static HRESULT WINAPI IDirectMusicSegTriggerTrack_IPersistStream_Load (LPPERSIST
return
E_FAIL
;
}
}
#endif
return
S_OK
;
}
...
...
dlls/dmime/tempotrack.c
View file @
a4664409
...
...
@@ -328,14 +328,12 @@ static HRESULT WINAPI IDirectMusicTempoTrack_IPersistStream_Load (LPPERSISTSTREA
LPDMUS_PRIVATE_TEMPO_ITEM
pNewItem
=
NULL
;
DWORD
nItem
=
0
;
FIXME
(
"(%p, %p): Loading not fully implemented yet
\n
"
,
This
,
pStm
);
#if 1
IStream_Read
(
pStm
,
&
Chunk
,
sizeof
(
FOURCC
)
+
sizeof
(
DWORD
),
NULL
);
TRACE_
(
dmfile
)(
": %s chunk (size = %d)"
,
debugstr_fourcc
(
Chunk
.
fccID
),
Chunk
.
dwSize
);
switch
(
Chunk
.
fccID
)
{
case
DMUS_FOURCC_TEMPO_TRACK
:
{
TRACE_
(
dmfile
)(
": Tempo track
\n
"
);
#if 1
IStream_Read
(
pStm
,
&
StreamSize
,
sizeof
(
DWORD
),
NULL
);
StreamSize
-=
sizeof
(
DWORD
);
StreamCount
=
0
;
...
...
@@ -356,10 +354,6 @@ static HRESULT WINAPI IDirectMusicTempoTrack_IPersistStream_Load (LPPERSISTSTREA
StreamCount
+=
sizeof
(
item
);
TRACE_
(
dmfile
)(
": StreamCount[0] = %d < StreamSize[0] = %d
\n
"
,
StreamCount
,
StreamSize
);
}
while
(
StreamCount
<
StreamSize
);
#else
liMove
.
QuadPart
=
Chunk
.
dwSize
;
IStream_Seek
(
pStm
,
liMove
,
STREAM_SEEK_CUR
,
NULL
);
#endif
break
;
}
default:
{
...
...
@@ -369,7 +363,6 @@ static HRESULT WINAPI IDirectMusicTempoTrack_IPersistStream_Load (LPPERSISTSTREA
return
E_FAIL
;
}
}
#endif
return
S_OK
;
}
...
...
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