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
56659c3a
Commit
56659c3a
authored
Apr 06, 2010
by
Henri Verbeet
Committed by
Alexandre Julliard
Apr 07, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
quartz: Don't return a pointer to a stack variable in AMFilterData_ParseFilterData().
parent
e11f637c
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
7 deletions
+4
-7
provider.c
dlls/dxdiagn/provider.c
+3
-6
filtermapper.c
dlls/quartz/filtermapper.c
+1
-1
No files found.
dlls/dxdiagn/provider.c
View file @
56659c3a
...
...
@@ -689,8 +689,7 @@ static HRESULT DXDiag_InitDXDiagDirectShowFiltersContainer(IDxDiagContainer* pSu
SUCCEEDED
(
IFilterMapper2_QueryInterface
(
pFileMapper
,
&
IID_IAMFilterData
,
(
void
**
)
&
pFilterData
)))
{
DWORD
array_size
;
BYTE
*
tmp
;
REGFILTER2
*
pRF
=
NULL
;
REGFILTER2
*
pRF
;
if
(
SUCCEEDED
(
IPropertyBag_Read
(
pPropFilterBag
,
wszFilterDataName
,
&
v
,
NULL
))
&&
SUCCEEDED
(
SafeArrayAccessData
(
V_UNION
(
&
v
,
parray
),
(
LPVOID
*
)
&
pData
)))
...
...
@@ -698,10 +697,8 @@ static HRESULT DXDiag_InitDXDiagDirectShowFiltersContainer(IDxDiagContainer* pSu
ULONG
j
;
array_size
=
V_UNION
(
&
v
,
parray
)
->
rgsabound
->
cElements
;
if
(
SUCCEEDED
(
IAMFilterData_ParseFilterData
(
pFilterData
,
pData
,
array_size
,
&
tmp
)))
if
(
SUCCEEDED
(
IAMFilterData_ParseFilterData
(
pFilterData
,
pData
,
array_size
,
(
BYTE
**
)
&
pRF
)))
{
pRF
=
((
REGFILTER2
**
)
tmp
)[
0
];
snprintfW
(
bufferW
,
sizeof
(
bufferW
)
/
sizeof
(
bufferW
[
0
]),
szVersionFormat
,
pRF
->
dwVersion
);
if
(
pRF
->
dwVersion
==
1
)
{
...
...
@@ -721,7 +718,7 @@ static HRESULT DXDiag_InitDXDiagDirectShowFiltersContainer(IDxDiagContainer* pSu
}
dwMerit
=
pRF
->
dwMerit
;
CoTaskMemFree
(
tmp
);
CoTaskMemFree
(
pRF
);
}
SafeArrayUnaccessData
(
V_UNION
(
&
v
,
parray
));
...
...
dlls/quartz/filtermapper.c
View file @
56659c3a
...
...
@@ -1778,7 +1778,7 @@ static HRESULT WINAPI AMFilterData_ParseFilterData(IAMFilterData* iface,
prf2
=
CoTaskMemAlloc
(
sizeof
(
*
prf2
));
if
(
!
prf2
)
return
E_OUTOFMEMORY
;
*
ppRegFilter2
=
(
BYTE
*
)
&
prf2
;
*
ppRegFilter2
=
(
BYTE
*
)
prf2
;
hr
=
FM2_ReadFilterData
(
pData
,
prf2
);
if
(
FAILED
(
hr
))
...
...
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