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
deb60967
Commit
deb60967
authored
Feb 04, 2022
by
Michael Stefaniuc
Committed by
Alexandre Julliard
Feb 04, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dswave: Build without -DWINE_NO_LONG_TYPES.
Signed-off-by:
Michael Stefaniuc
<
mstefani@winehq.org
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
3d68dfba
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
13 deletions
+12
-13
Makefile.in
dlls/dswave/Makefile.in
+0
-1
dmobject.c
dlls/dswave/dmobject.c
+10
-10
dswave.c
dlls/dswave/dswave.c
+2
-2
No files found.
dlls/dswave/Makefile.in
View file @
deb60967
EXTRADEFS
=
-DWINE_NO_LONG_TYPES
MODULE
=
dswave.dll
IMPORTS
=
dxguid uuid ole32 advapi32
...
...
dlls/dswave/dmobject.c
View file @
deb60967
...
...
@@ -226,10 +226,10 @@ void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *desc)
return
;
TRACE_
(
dmfile
)(
"DMUS_OBJECTDESC (%p):"
,
desc
);
TRACE_
(
dmfile
)(
" - dwSize = %u
\n
"
,
desc
->
dwSize
);
TRACE_
(
dmfile
)(
" - dwSize = %
l
u
\n
"
,
desc
->
dwSize
);
#define X(flag) if (desc->dwValidData & flag) TRACE_(dmfile)(#flag " ")
TRACE_
(
dmfile
)(
" - dwValidData = %#08x ( "
,
desc
->
dwValidData
);
TRACE_
(
dmfile
)(
" - dwValidData = %#08
l
x ( "
,
desc
->
dwValidData
);
X
(
DMUS_OBJ_OBJECT
);
X
(
DMUS_OBJ_CLASS
);
X
(
DMUS_OBJ_NAME
);
...
...
@@ -285,7 +285,7 @@ const char *debugstr_chunk(const struct chunk_entry *chunk)
return
"(null)"
;
if
(
chunk
->
id
==
FOURCC_RIFF
||
chunk
->
id
==
FOURCC_LIST
)
type
=
wine_dbg_sprintf
(
"type %s, "
,
debugstr_fourcc
(
chunk
->
type
));
return
wine_dbg_sprintf
(
"%s chunk, %ssize %u"
,
debugstr_fourcc
(
chunk
->
id
),
type
,
chunk
->
size
);
return
wine_dbg_sprintf
(
"%s chunk, %ssize %
l
u"
,
debugstr_fourcc
(
chunk
->
id
),
type
,
chunk
->
size
);
}
static
HRESULT
stream_read
(
IStream
*
stream
,
void
*
data
,
ULONG
size
)
...
...
@@ -295,10 +295,10 @@ static HRESULT stream_read(IStream *stream, void *data, ULONG size)
hr
=
IStream_Read
(
stream
,
data
,
size
,
&
read
);
if
(
FAILED
(
hr
))
TRACE_
(
dmfile
)(
"IStream_Read failed: %
08
x
\n
"
,
hr
);
TRACE_
(
dmfile
)(
"IStream_Read failed: %
#l
x
\n
"
,
hr
);
else
if
(
!
read
&&
read
<
size
)
{
/* All or nothing: Handle a partial read due to end of stream as an error */
TRACE_
(
dmfile
)(
"Short read: %
u < %
u
\n
"
,
read
,
size
);
TRACE_
(
dmfile
)(
"Short read: %
lu < %l
u
\n
"
,
read
,
size
);
return
E_FAIL
;
}
...
...
@@ -393,7 +393,7 @@ HRESULT stream_chunk_get_array(IStream *stream, const struct chunk_entry *chunk,
if
(
FAILED
(
hr
=
stream_read
(
stream
,
&
size
,
sizeof
(
DWORD
))))
return
hr
;
if
(
size
!=
elem_size
)
{
WARN_
(
dmfile
)(
"%s: Array element size mismatch: got %
u, expected %
u
\n
"
,
WARN_
(
dmfile
)(
"%s: Array element size mismatch: got %
lu, expected %l
u
\n
"
,
debugstr_chunk
(
chunk
),
size
,
elem_size
);
return
DMUS_E_UNSUPPORTED_STREAM
;
}
...
...
@@ -420,7 +420,7 @@ HRESULT stream_chunk_get_data(IStream *stream, const struct chunk_entry *chunk,
ULONG
size
)
{
if
(
chunk
->
size
!=
size
)
{
WARN_
(
dmfile
)(
"Chunk %s (size %
u, offset %s) doesn't contains the expected data size %
u
\n
"
,
WARN_
(
dmfile
)(
"Chunk %s (size %
lu, offset %s) doesn't contains the expected data size %l
u
\n
"
,
debugstr_fourcc
(
chunk
->
id
),
chunk
->
size
,
wine_dbgstr_longlong
(
chunk
->
offset
.
QuadPart
),
size
);
return
E_FAIL
;
...
...
@@ -567,7 +567,7 @@ HRESULT dmobj_parsedescriptor(IStream *stream, const struct chunk_entry *riff,
struct
chunk_entry
chunk
=
{.
parent
=
riff
};
HRESULT
hr
;
TRACE
(
"Looking for %#x in %p: %s
\n
"
,
supported
,
stream
,
debugstr_chunk
(
riff
));
TRACE
(
"Looking for %#
l
x in %p: %s
\n
"
,
supported
,
stream
,
debugstr_chunk
(
riff
));
desc
->
dwValidData
=
0
;
desc
->
dwSize
=
sizeof
(
*
desc
);
...
...
@@ -612,7 +612,7 @@ HRESULT dmobj_parsedescriptor(IStream *stream, const struct chunk_entry *riff,
break
;
}
}
TRACE
(
"Found %#x
\n
"
,
desc
->
dwValidData
);
TRACE
(
"Found %#
l
x
\n
"
,
desc
->
dwValidData
);
return
hr
;
}
...
...
@@ -636,7 +636,7 @@ HRESULT dmobj_parsereference(IStream *stream, const struct chunk_entry *list,
WARN
(
"Failed to read data of %s
\n
"
,
debugstr_chunk
(
&
chunk
));
return
hr
;
}
TRACE
(
"REFERENCE guidClassID %s, dwValidData %#x
\n
"
,
debugstr_dmguid
(
&
reference
.
guidClassID
),
TRACE
(
"REFERENCE guidClassID %s, dwValidData %#
l
x
\n
"
,
debugstr_dmguid
(
&
reference
.
guidClassID
),
reference
.
dwValidData
);
if
(
FAILED
(
hr
=
dmobj_parsedescriptor
(
stream
,
list
,
&
desc
,
reference
.
dwValidData
)))
...
...
dlls/dswave/dswave.c
View file @
deb60967
...
...
@@ -72,7 +72,7 @@ static ULONG WINAPI IUnknownImpl_AddRef(IUnknown *iface)
IDirectMusicWaveImpl
*
This
=
impl_from_IUnknown
(
iface
);
LONG
ref
=
InterlockedIncrement
(
&
This
->
ref
);
TRACE
(
"(%p) ref=%d
\n
"
,
This
,
ref
);
TRACE
(
"(%p) ref=%
l
d
\n
"
,
This
,
ref
);
return
ref
;
}
...
...
@@ -82,7 +82,7 @@ static ULONG WINAPI IUnknownImpl_Release(IUnknown *iface)
IDirectMusicWaveImpl
*
This
=
impl_from_IUnknown
(
iface
);
LONG
ref
=
InterlockedDecrement
(
&
This
->
ref
);
TRACE
(
"(%p) ref=%d
\n
"
,
This
,
ref
);
TRACE
(
"(%p) ref=%
l
d
\n
"
,
This
,
ref
);
if
(
!
ref
)
{
HeapFree
(
GetProcessHeap
(),
0
,
This
);
...
...
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