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
d56c50c8
Commit
d56c50c8
authored
Apr 04, 2008
by
Maarten Lankhorst
Committed by
Alexandre Julliard
Apr 07, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
quartz: Make FileAsyncReader_WaitForNext return an empty sample in flushing state.
parent
fab66ee7
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
7 deletions
+11
-7
filesource.c
dlls/quartz/filesource.c
+11
-7
No files found.
dlls/quartz/filesource.c
View file @
d56c50c8
...
...
@@ -1093,16 +1093,13 @@ static HRESULT WINAPI FileAsyncReader_WaitForNext(IAsyncReader * iface, DWORD dw
*
ppSample
=
NULL
;
*
pdwUser
=
0
;
/* we return immediately if flushing */
if
(
This
->
bFlushing
)
hr
=
VFW_E_WRONG_STATE
;
if
(
SUCCEEDED
(
hr
))
if
(
!
This
->
bFlushing
)
{
/* wait for the read to finish or timeout */
if
(
WaitForSingleObject
(
This
->
hEvent
,
dwTimeout
)
==
WAIT_TIMEOUT
)
hr
=
VFW_E_TIMEOUT
;
}
if
(
SUCCEEDED
(
hr
))
{
EnterCriticalSection
(
&
This
->
csList
);
...
...
@@ -1116,7 +1113,7 @@ static HRESULT WINAPI FileAsyncReader_WaitForNext(IAsyncReader * iface, DWORD dw
LeaveCriticalSection
(
&
This
->
csList
);
}
if
(
SUCCEEDED
(
hr
))
if
(
SUCCEEDED
(
hr
)
&&
!
This
->
bFlushing
)
{
/* get any errors */
if
(
!
GetOverlappedResult
(
This
->
hFile
,
&
pDataRq
->
ovl
,
&
dwBytes
,
FALSE
))
...
...
@@ -1132,7 +1129,14 @@ static HRESULT WINAPI FileAsyncReader_WaitForNext(IAsyncReader * iface, DWORD dw
/* no need to close event handle since we will close it when the pin is destroyed */
CoTaskMemFree
(
pDataRq
);
/* Return the sample if flushing so it can be destroyed */
if
(
This
->
bFlushing
&&
SUCCEEDED
(
hr
))
{
hr
=
VFW_E_WRONG_STATE
;
IMediaSample_SetActualDataLength
(
pDataRq
->
pSample
,
0
);
}
TRACE
(
"-- %x
\n
"
,
hr
);
return
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