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
d367c9ae
Commit
d367c9ae
authored
Jan 03, 2020
by
Matteo Bruni
Committed by
Alexandre Julliard
Jan 03, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3dcompiler/tests: Load the correct d3dcompiler DLL in the asm tests.
Signed-off-by:
Matteo Bruni
<
mbruni@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
20b52b61
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
1 deletion
+5
-1
asm.c
dlls/d3dcompiler_43/tests/asm.c
+5
-1
No files found.
dlls/d3dcompiler_43/tests/asm.c
View file @
d367c9ae
...
@@ -1725,7 +1725,11 @@ static BOOL load_d3dcompiler(void)
...
@@ -1725,7 +1725,11 @@ static BOOL load_d3dcompiler(void)
{
{
HMODULE
module
;
HMODULE
module
;
#if D3D_COMPILER_VERSION == 47
if
(
!
(
module
=
LoadLibraryA
(
"d3dcompiler_47.dll"
)))
return
FALSE
;
#else
if
(
!
(
module
=
LoadLibraryA
(
"d3dcompiler_43.dll"
)))
return
FALSE
;
if
(
!
(
module
=
LoadLibraryA
(
"d3dcompiler_43.dll"
)))
return
FALSE
;
#endif
pD3DAssemble
=
(
void
*
)
GetProcAddress
(
module
,
"D3DAssemble"
);
pD3DAssemble
=
(
void
*
)
GetProcAddress
(
module
,
"D3DAssemble"
);
ppD3DPreprocess
=
(
void
*
)
GetProcAddress
(
module
,
"D3DPreprocess"
);
ppD3DPreprocess
=
(
void
*
)
GetProcAddress
(
module
,
"D3DPreprocess"
);
...
@@ -1736,7 +1740,7 @@ START_TEST(asm)
...
@@ -1736,7 +1740,7 @@ START_TEST(asm)
{
{
if
(
!
load_d3dcompiler
())
if
(
!
load_d3dcompiler
())
{
{
win_skip
(
"Could not load
d3dcompiler_43.dll
\n
"
);
win_skip
(
"Could not load
DLL.
\n
"
);
return
;
return
;
}
}
...
...
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