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
f60b2813
Commit
f60b2813
authored
Aug 23, 2013
by
Henri Verbeet
Committed by
Alexandre Julliard
Aug 23, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3dx9: Simplify D3DXCreateEffectFromResourceExA().
parent
b4d6f90f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
16 deletions
+12
-16
effect.c
dlls/d3dx9_36/effect.c
+12
-16
No files found.
dlls/d3dx9_36/effect.c
View file @
f60b2813
...
...
@@ -5601,29 +5601,25 @@ HRESULT WINAPI D3DXCreateEffectFromResourceExA(struct IDirect3DDevice9 *device,
DWORD
flags
,
struct
ID3DXEffectPool
*
pool
,
struct
ID3DXEffect
**
effect
,
struct
ID3DXBuffer
**
compilationerrors
)
{
HRSRC
resinfo
;
void
*
buffer
;
DWORD
size
;
TRACE
(
"(%p, %s): relay
\n
"
,
srcmodule
,
debugstr_a
(
srcresource
));
TRACE
(
"device %p, srcmodule %p, srcresource %s, defines %p, include %p, skipconstants %s, "
"flags %#x, pool %p, effect %p, compilationerrors %p.
\n
"
,
device
,
srcmodule
,
debugstr_a
(
srcresource
),
defines
,
include
,
debugstr_a
(
skipconstants
),
flags
,
pool
,
effect
,
compilationerrors
);
if
(
!
device
)
return
D3DERR_INVALIDCALL
;
resinfo
=
FindResourceA
(
srcmodule
,
srcresource
,
(
LPCSTR
)
RT_RCDATA
);
if
(
resinfo
)
{
LPVOID
buffer
;
HRESULT
ret
;
DWORD
size
;
ret
=
load_resource_into_memory
(
srcmodule
,
resinfo
,
&
buffer
,
&
size
);
if
(
FAILED
(
ret
))
return
D3DXERR_INVALIDDATA
;
if
(
!
(
resinfo
=
FindResourceA
(
srcmodule
,
srcresource
,
(
const
char
*
)
RT_RCDATA
)))
return
D3DXERR_INVALIDDATA
;
return
D3DXCreateEffectEx
(
device
,
buffer
,
size
,
defines
,
include
,
skipconstants
,
flags
,
pool
,
effect
,
compilationerrors
);
}
if
(
FAILED
(
load_resource_into_memory
(
srcmodule
,
resinfo
,
&
buffer
,
&
size
)))
return
D3DXERR_INVALIDDATA
;
return
D3DXERR_INVALIDDATA
;
return
D3DXCreateEffectEx
(
device
,
buffer
,
size
,
defines
,
include
,
skipconstants
,
flags
,
pool
,
effect
,
compilationerrors
);
}
HRESULT
WINAPI
D3DXCreateEffectFromResourceW
(
struct
IDirect3DDevice9
*
device
,
HMODULE
srcmodule
,
...
...
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