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
442f29ab
Commit
442f29ab
authored
Mar 12, 2008
by
Andrew Talbot
Committed by
Alexandre Julliard
Mar 13, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
quartz: Assign to structs instead of using memcpy.
parent
90d83c42
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
18 additions
and
18 deletions
+18
-18
avisplit.c
dlls/quartz/avisplit.c
+6
-6
enummedia.c
dlls/quartz/enummedia.c
+1
-1
filesource.c
dlls/quartz/filesource.c
+1
-1
memallocator.c
dlls/quartz/memallocator.c
+3
-3
mpegsplit.c
dlls/quartz/mpegsplit.c
+3
-3
pin.c
dlls/quartz/pin.c
+1
-1
waveparser.c
dlls/quartz/waveparser.c
+3
-3
No files found.
dlls/quartz/avisplit.c
View file @
442f29ab
...
...
@@ -365,19 +365,19 @@ static HRESULT AVISplitter_ProcessStreamList(AVISplitterImpl * This, const BYTE
switch
(
pStrHdr
->
fccType
)
{
case
streamtypeVIDEO
:
memcpy
(
&
amt
.
formattype
,
&
FORMAT_VideoInfo
,
sizeof
(
GUID
))
;
amt
.
formattype
=
FORMAT_VideoInfo
;
amt
.
pbFormat
=
NULL
;
amt
.
cbFormat
=
0
;
break
;
case
streamtypeAUDIO
:
memcpy
(
&
amt
.
formattype
,
&
FORMAT_WaveFormatEx
,
sizeof
(
GUID
))
;
amt
.
formattype
=
FORMAT_WaveFormatEx
;
break
;
default:
memcpy
(
&
amt
.
formattype
,
&
FORMAT_None
,
sizeof
(
GUID
))
;
amt
.
formattype
=
FORMAT_None
;
}
memcpy
(
&
amt
.
majortype
,
&
MEDIATYPE_Video
,
sizeof
(
GUID
))
;
amt
.
majortype
=
MEDIATYPE_Video
;
amt
.
majortype
.
Data1
=
pStrHdr
->
fccType
;
memcpy
(
&
amt
.
subtype
,
&
MEDIATYPE_Video
,
sizeof
(
GUID
))
;
amt
.
subtype
=
MEDIATYPE_Video
;
amt
.
subtype
.
Data1
=
pStrHdr
->
fccHandler
;
TRACE
(
"Subtype FCC: %.04s
\n
"
,
(
LPCSTR
)
&
pStrHdr
->
fccHandler
);
amt
.
lSampleSize
=
pStrHdr
->
dwSampleSize
;
...
...
@@ -448,7 +448,7 @@ static HRESULT AVISplitter_ProcessStreamList(AVISplitterImpl * This, const BYTE
if
(
IsEqualGUID
(
&
amt
.
formattype
,
&
FORMAT_WaveFormatEx
))
{
memcpy
(
&
amt
.
subtype
,
&
MEDIATYPE_Video
,
sizeof
(
GUID
))
;
amt
.
subtype
=
MEDIATYPE_Video
;
amt
.
subtype
.
Data1
=
((
WAVEFORMATEX
*
)
amt
.
pbFormat
)
->
wFormatTag
;
}
...
...
dlls/quartz/enummedia.c
View file @
442f29ab
...
...
@@ -26,7 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz);
HRESULT
CopyMediaType
(
AM_MEDIA_TYPE
*
pDest
,
const
AM_MEDIA_TYPE
*
pSrc
)
{
memcpy
(
pDest
,
pSrc
,
sizeof
(
AM_MEDIA_TYPE
))
;
*
pDest
=
*
pSrc
;
if
(
!
pSrc
->
pbFormat
)
return
S_OK
;
if
(
!
(
pDest
->
pbFormat
=
CoTaskMemAlloc
(
pSrc
->
cbFormat
)))
return
E_OUTOFMEMORY
;
...
...
dlls/quartz/filesource.c
View file @
442f29ab
...
...
@@ -609,7 +609,7 @@ static HRESULT WINAPI FileSource_Load(IFileSourceFilter * iface, LPCOLESTR pszFi
This
->
pmt
->
pbFormat
=
NULL
;
This
->
pmt
->
pUnk
=
NULL
;
This
->
pmt
->
lSampleSize
=
0
;
memcpy
(
&
This
->
pmt
->
formattype
,
&
FORMAT_None
,
sizeof
(
FORMAT_None
))
;
This
->
pmt
->
formattype
=
FORMAT_None
;
hr
=
GetClassMediaFile
(
pReader
,
pszFileName
,
&
This
->
pmt
->
majortype
,
&
This
->
pmt
->
subtype
);
if
(
FAILED
(
hr
))
{
...
...
dlls/quartz/memallocator.c
View file @
442f29ab
...
...
@@ -188,9 +188,9 @@ static HRESULT WINAPI BaseMemAllocator_SetProperties(IMemAllocator * iface, ALLO
hr
=
E_OUTOFMEMORY
;
else
{
memcpy
(
This
->
pProps
,
pRequest
,
sizeof
(
*
This
->
pProps
))
;
memcpy
(
pActual
,
pRequest
,
sizeof
(
*
pActual
))
;
*
This
->
pProps
=
*
pRequest
;
*
pActual
=
*
pRequest
;
hr
=
S_OK
;
}
...
...
dlls/quartz/mpegsplit.c
View file @
442f29ab
...
...
@@ -317,9 +317,9 @@ static HRESULT MPEGSplitter_init_audio(MPEGSplitterImpl *This, const BYTE *heade
ppiOutput
->
pFilter
=
(
IBaseFilter
*
)
This
;
wsprintfW
(
ppiOutput
->
achName
,
wszAudioStream
);
memcpy
(
&
pamt
->
formattype
,
&
FORMAT_WaveFormatEx
,
sizeof
(
GUID
))
;
memcpy
(
&
pamt
->
majortype
,
&
MEDIATYPE_Audio
,
sizeof
(
GUID
))
;
memcpy
(
&
pamt
->
subtype
,
&
MEDIASUBTYPE_MPEG1AudioPayload
,
sizeof
(
GUID
))
;
pamt
->
formattype
=
FORMAT_WaveFormatEx
;
pamt
->
majortype
=
MEDIATYPE_Audio
;
pamt
->
subtype
=
MEDIASUBTYPE_MPEG1AudioPayload
;
pamt
->
lSampleSize
=
0
;
pamt
->
bFixedSizeSamples
=
TRUE
;
...
...
dlls/quartz/pin.c
View file @
442f29ab
...
...
@@ -200,7 +200,7 @@ HRESULT OutputPin_Init(const PIN_INFO * pPinInfo, const ALLOCATOR_PROPERTIES * p
pPinImpl
->
pConnectSpecific
=
OutputPin_ConnectSpecific
;
if
(
props
)
{
memcpy
(
&
pPinImpl
->
allocProps
,
props
,
sizeof
(
pPinImpl
->
allocProps
))
;
pPinImpl
->
allocProps
=
*
props
;
if
(
pPinImpl
->
allocProps
.
cbAlign
==
0
)
pPinImpl
->
allocProps
.
cbAlign
=
1
;
}
...
...
dlls/quartz/waveparser.c
View file @
442f29ab
...
...
@@ -256,13 +256,13 @@ static HRESULT WAVEParser_InputPin_PreConnect(IPin * iface, IPin * pConnectPin)
return
E_FAIL
;
}
memcpy
(
&
amt
.
majortype
,
&
MEDIATYPE_Audio
,
sizeof
(
GUID
))
;
memcpy
(
&
amt
.
formattype
,
&
FORMAT_WaveFormatEx
,
sizeof
(
GUID
))
;
amt
.
majortype
=
MEDIATYPE_Audio
;
amt
.
formattype
=
FORMAT_WaveFormatEx
;
amt
.
cbFormat
=
chunk
.
cb
;
amt
.
pbFormat
=
CoTaskMemAlloc
(
amt
.
cbFormat
);
amt
.
pUnk
=
NULL
;
hr
=
IAsyncReader_SyncRead
(
This
->
pReader
,
pos
,
amt
.
cbFormat
,
amt
.
pbFormat
);
memcpy
(
&
amt
.
subtype
,
&
MEDIATYPE_Audio
,
sizeof
(
GUID
))
;
amt
.
subtype
=
MEDIATYPE_Audio
;
amt
.
subtype
.
Data1
=
((
WAVEFORMATEX
*
)
amt
.
pbFormat
)
->
wFormatTag
;
pos
+=
chunk
.
cb
;
...
...
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