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
39f80e56
Commit
39f80e56
authored
Jun 28, 2012
by
Dmitry Timoshkov
Committed by
Alexandre Julliard
Jun 28, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
windowscodecs: Make sure that stream is not reused once the decoder is initialized.
parent
e7f31ddb
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
39 additions
and
38 deletions
+39
-38
imgfactory.c
dlls/windowscodecs/imgfactory.c
+39
-38
No files found.
dlls/windowscodecs/imgfactory.c
View file @
39f80e56
...
...
@@ -121,26 +121,22 @@ static HRESULT WINAPI ComponentFactory_CreateDecoderFromFilename(
return
hr
;
}
static
HRESULT
WINAPI
ComponentFactory_CreateDecoderFromStream
(
IWICComponentFactory
*
iface
,
IStream
*
pIStream
,
const
GUID
*
pguidVendor
,
WICDecodeOptions
metadataOptions
,
IWICBitmapDecoder
**
ppIDecoder
)
static
IWICBitmapDecoder
*
find_decoder
(
IStream
*
pIStream
,
const
GUID
*
pguidVendor
,
WICDecodeOptions
metadataOptions
)
{
IEnumUnknown
*
enumdecoders
;
IUnknown
*
unkdecoderinfo
;
IWICBitmapDecoderInfo
*
decoderinfo
;
IWICBitmapDecoder
*
decoder
=
NULL
,
*
preferred_decoder
=
NULL
;
IWICBitmapDecoder
*
decoder
=
NULL
;
GUID
vendor
;
HRESULT
res
=
S_OK
;
HRESULT
res
;
ULONG
num_fetched
;
BOOL
matches
;
TRACE
(
"(%p,%p,%s,%u,%p)
\n
"
,
iface
,
pIStream
,
debugstr_guid
(
pguidVendor
),
metadataOptions
,
ppIDecoder
);
res
=
CreateComponentEnumerator
(
WICDecoder
,
WICComponentEnumerateDefault
,
&
enumdecoders
);
if
(
FAILED
(
res
))
return
res
;
if
(
FAILED
(
res
))
return
NULL
;
while
(
!
preferred_
decoder
)
while
(
!
decoder
)
{
res
=
IEnumUnknown_Next
(
enumdecoders
,
1
,
&
unkdecoderinfo
,
&
num_fetched
);
...
...
@@ -150,40 +146,34 @@ static HRESULT WINAPI ComponentFactory_CreateDecoderFromStream(
if
(
SUCCEEDED
(
res
))
{
if
(
pguidVendor
)
{
res
=
IWICBitmapDecoderInfo_GetVendorGUID
(
decoderinfo
,
&
vendor
);
if
(
FAILED
(
res
)
||
!
IsEqualIID
(
&
vendor
,
pguidVendor
))
{
IWICBitmapDecoderInfo_Release
(
decoderinfo
);
IUnknown_Release
(
unkdecoderinfo
);
continue
;
}
}
res
=
IWICBitmapDecoderInfo_MatchesPattern
(
decoderinfo
,
pIStream
,
&
matches
);
if
(
SUCCEEDED
(
res
)
&&
matches
)
{
IWICBitmapDecoder
*
new_decoder
;
res
=
IWICBitmapDecoderInfo_CreateInstance
(
decoderinfo
,
&
new_decoder
);
res
=
IWICBitmapDecoderInfo_CreateInstance
(
decoderinfo
,
&
decoder
);
/* FIXME: should use QueryCapability to choose a decoder */
if
(
SUCCEEDED
(
res
))
{
res
=
IWICBitmapDecoder_Initialize
(
new_
decoder
,
pIStream
,
metadataOptions
);
res
=
IWICBitmapDecoder_Initialize
(
decoder
,
pIStream
,
metadataOptions
);
if
(
SUCCEED
ED
(
res
))
if
(
FAIL
ED
(
res
))
{
if
(
pguidVendor
)
{
res
=
IWICBitmapDecoderInfo_GetVendorGUID
(
decoderinfo
,
&
vendor
);
if
(
SUCCEEDED
(
res
)
&&
IsEqualIID
(
&
vendor
,
pguidVendor
))
{
preferred_decoder
=
new_decoder
;
new_decoder
=
NULL
;
}
}
if
(
new_decoder
&&
!
decoder
)
{
decoder
=
new_decoder
;
new_decoder
=
NULL
;
}
IWICBitmapDecoder_Release
(
decoder
);
decoder
=
NULL
;
}
if
(
new_decoder
)
IWICBitmapDecoder_Release
(
new_decoder
);
}
}
...
...
@@ -198,12 +188,23 @@ static HRESULT WINAPI ComponentFactory_CreateDecoderFromStream(
IEnumUnknown_Release
(
enumdecoders
);
if
(
preferred_decoder
)
{
*
ppIDecoder
=
preferred_decoder
;
if
(
decoder
)
IWICBitmapDecoder_Release
(
decoder
);
return
S_OK
;
}
return
decoder
;
}
static
HRESULT
WINAPI
ComponentFactory_CreateDecoderFromStream
(
IWICComponentFactory
*
iface
,
IStream
*
pIStream
,
const
GUID
*
pguidVendor
,
WICDecodeOptions
metadataOptions
,
IWICBitmapDecoder
**
ppIDecoder
)
{
HRESULT
res
;
IWICBitmapDecoder
*
decoder
=
NULL
;
TRACE
(
"(%p,%p,%s,%u,%p)
\n
"
,
iface
,
pIStream
,
debugstr_guid
(
pguidVendor
),
metadataOptions
,
ppIDecoder
);
if
(
pguidVendor
)
decoder
=
find_decoder
(
pIStream
,
pguidVendor
,
metadataOptions
);
if
(
!
decoder
)
decoder
=
find_decoder
(
pIStream
,
NULL
,
metadataOptions
);
if
(
decoder
)
{
...
...
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