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
39598b9c
Commit
39598b9c
authored
Feb 10, 2012
by
Christian Costa
Committed by
Alexandre Julliard
Feb 11, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3dx9_36: Detect and display message for all not yet supported file formats.
parent
a6e3984c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
4 deletions
+14
-4
surface.c
dlls/d3dx9_36/surface.c
+14
-4
No files found.
dlls/d3dx9_36/surface.c
View file @
39598b9c
...
...
@@ -62,8 +62,6 @@ HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(LPCVOID data, UINT datasize, D3D
TRACE
(
"(%p, %d, %p)
\n
"
,
data
,
datasize
,
info
);
/* TODO: Add support for (or at least detect) DDS, PPM and DIB */
if
(
!
data
||
!
datasize
)
return
D3DERR_INVALIDCALL
;
...
...
@@ -82,6 +80,19 @@ HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(LPCVOID data, UINT datasize, D3D
IWICImagingFactory_Release
(
factory
);
}
if
(
FAILED
(
hr
))
{
if
((
datasize
>=
4
)
&&
!
strncmp
(
data
,
"DDS "
,
4
))
FIXME
(
"File type DDS is not supported yet
\n
"
);
else
if
((
datasize
>=
2
)
&&
(
!
strncmp
(
data
,
"P3"
,
2
)
||
!
strncmp
(
data
,
"P6"
,
2
)))
FIXME
(
"File type PPM is not supported yet
\n
"
);
else
if
((
datasize
>=
2
)
&&
!
strncmp
(
data
,
"BM"
,
2
))
FIXME
(
"File type DIB is not supported yet
\n
"
);
else
if
((
datasize
>=
10
)
&&
!
strncmp
(
data
,
"#?RADIANCE"
,
10
))
FIXME
(
"File type HDR is not supported yet
\n
"
);
else
if
((
datasize
>=
2
)
&&
(
!
strncmp
(
data
,
"PF"
,
2
)
||
!
strncmp
(
data
,
"Pf"
,
2
)))
FIXME
(
"File type PFM is not supported yet
\n
"
);
}
if
(
SUCCEEDED
(
hr
))
{
GUID
container_format
;
UINT
frame_count
;
...
...
@@ -161,8 +172,7 @@ HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(LPCVOID data, UINT datasize, D3D
CoUninitialize
();
if
(
FAILED
(
hr
))
{
/* Missing formats are not detected yet and will fail silently without the FIXME */
FIXME
(
"Invalid or unsupported image file
\n
"
);
TRACE
(
"Invalid or unsupported image file
\n
"
);
return
D3DXERR_INVALIDDATA
;
}
...
...
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