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
9b0e3de4
Commit
9b0e3de4
authored
May 26, 2022
by
Piotr Caban
Committed by
Alexandre Julliard
Jun 10, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3dx10: Add support for ID3DX10ThreadPump parameter in D3DX10GetImageInfoFromFileW.
Signed-off-by:
Piotr Caban
<
piotr@codeweavers.com
>
parent
0d6b9b83
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
24 additions
and
7 deletions
+24
-7
texture.c
dlls/d3dx10_43/texture.c
+24
-7
No files found.
dlls/d3dx10_43/texture.c
View file @
9b0e3de4
...
@@ -332,17 +332,34 @@ HRESULT WINAPI D3DX10GetImageInfoFromFileW(const WCHAR *src_file, ID3DX10ThreadP
...
@@ -332,17 +332,34 @@ HRESULT WINAPI D3DX10GetImageInfoFromFileW(const WCHAR *src_file, ID3DX10ThreadP
if
(
!
src_file
)
if
(
!
src_file
)
return
E_FAIL
;
return
E_FAIL
;
if
(
FAILED
((
hr
=
load_file
(
src_file
,
&
buffer
,
&
size
)))
)
if
(
pump
)
{
{
if
(
result
)
ID3DX10DataProcessor
*
processor
;
*
result
=
hr
;
ID3DX10DataLoader
*
loader
;
if
(
FAILED
((
hr
=
D3DX10CreateAsyncFileLoaderW
(
src_file
,
&
loader
))))
return
hr
;
if
(
FAILED
((
hr
=
D3DX10CreateAsyncTextureInfoProcessor
(
info
,
&
processor
))))
{
ID3DX10DataLoader_Destroy
(
loader
);
return
hr
;
}
hr
=
ID3DX10ThreadPump_AddWorkItem
(
pump
,
loader
,
processor
,
result
,
NULL
);
if
(
FAILED
(
hr
))
{
ID3DX10DataLoader_Destroy
(
loader
);
ID3DX10DataProcessor_Destroy
(
processor
);
}
return
hr
;
return
hr
;
}
}
hr
=
D3DX10GetImageInfoFromMemory
(
buffer
,
size
,
pump
,
info
,
result
);
if
(
SUCCEEDED
((
hr
=
load_file
(
src_file
,
&
buffer
,
&
size
))))
{
free
(
buffer
);
hr
=
get_image_info
(
buffer
,
size
,
info
);
free
(
buffer
);
}
if
(
result
)
*
result
=
hr
;
return
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