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
3f221611
Commit
3f221611
authored
Sep 03, 2013
by
Matteo Bruni
Committed by
Alexandre Julliard
Sep 03, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3dcompiler: Skip search of the parent include for the initial file.
parent
bcecdbda
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
2 deletions
+6
-2
compiler.c
dlls/d3dcompiler_43/compiler.c
+6
-2
No files found.
dlls/d3dcompiler_43/compiler.c
View file @
3f221611
...
@@ -149,8 +149,10 @@ static char *wpp_lookup_mem(const char *filename, int type, const char *parent_n
...
@@ -149,8 +149,10 @@ static char *wpp_lookup_mem(const char *filename, int type, const char *parent_n
char
*
path
;
char
*
path
;
int
i
;
int
i
;
TRACE
(
"Looking for include %s.
\n
"
,
debugstr_a
(
filename
));
parent_include
=
NULL
;
parent_include
=
NULL
;
if
(
parent_name
[
0
]
!=
'\0'
)
if
(
strcmp
(
parent_name
,
initial_filename
)
)
{
{
for
(
i
=
0
;
i
<
includes_size
;
i
++
)
for
(
i
=
0
;
i
<
includes_size
;
i
++
)
{
{
...
@@ -162,7 +164,7 @@ static char *wpp_lookup_mem(const char *filename, int type, const char *parent_n
...
@@ -162,7 +164,7 @@ static char *wpp_lookup_mem(const char *filename, int type, const char *parent_n
}
}
if
(
parent_include
==
NULL
)
if
(
parent_include
==
NULL
)
{
{
ERR
(
"Parent include
file missing
\n
"
);
ERR
(
"Parent include
%s missing.
\n
"
,
debugstr_a
(
parent_name
)
);
return
NULL
;
return
NULL
;
}
}
}
}
...
@@ -178,6 +180,8 @@ static void *wpp_open_mem(const char *filename, int type)
...
@@ -178,6 +180,8 @@ static void *wpp_open_mem(const char *filename, int type)
struct
mem_file_desc
*
desc
;
struct
mem_file_desc
*
desc
;
HRESULT
hr
;
HRESULT
hr
;
TRACE
(
"Opening include %s.
\n
"
,
debugstr_a
(
filename
));
if
(
!
strcmp
(
filename
,
initial_filename
))
if
(
!
strcmp
(
filename
,
initial_filename
))
{
{
current_shader
.
pos
=
0
;
current_shader
.
pos
=
0
;
...
...
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