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
8226a187
Commit
8226a187
authored
Feb 24, 2014
by
Matteo Bruni
Committed by
Alexandre Julliard
Feb 25, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3dx9: Don't call CoUninitialize if CoInitializeEx failed.
parent
244100f0
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
surface.c
dlls/d3dx9_36/surface.c
+3
-2
No files found.
dlls/d3dx9_36/surface.c
View file @
8226a187
...
...
@@ -1025,7 +1025,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromFileInMemory(IDirect3DSurface9 *pDestSurface,
const
RECT
*
pSrcRect
,
DWORD
dwFilter
,
D3DCOLOR
Colorkey
,
D3DXIMAGE_INFO
*
pSrcInfo
)
{
D3DXIMAGE_INFO
imginfo
;
HRESULT
hr
;
HRESULT
hr
,
com_init
;
IWICImagingFactory
*
factory
=
NULL
;
IWICBitmapDecoder
*
decoder
;
...
...
@@ -1078,7 +1078,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromFileInMemory(IDirect3DSurface9 *pDestSurface,
if
(
imginfo
.
ImageFileFormat
==
D3DXIFF_DIB
)
convert_dib_to_bmp
((
void
**
)
&
pSrcData
,
&
SrcDataSize
);
CoInitializeEx
(
NULL
,
COINIT_APARTMENTTHREADED
);
com_init
=
CoInitializeEx
(
NULL
,
COINIT_APARTMENTTHREADED
);
if
(
FAILED
(
CoCreateInstance
(
&
CLSID_WICImagingFactory
,
NULL
,
CLSCTX_INPROC_SERVER
,
&
IID_IWICImagingFactory
,
(
void
**
)
&
factory
)))
goto
cleanup_err
;
...
...
@@ -1181,6 +1181,7 @@ cleanup_err:
if
(
factory
)
IWICImagingFactory_Release
(
factory
);
if
(
SUCCEEDED
(
com_init
))
CoUninitialize
();
if
(
imginfo
.
ImageFileFormat
==
D3DXIFF_DIB
)
...
...
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