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
8cdcbbb3
Commit
8cdcbbb3
authored
Feb 24, 2004
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Tweak the load order algorithm a bit to better reflect the user's
intention, by taking into account non-wildcard module specifications for all directories.
parent
fc8b376a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
34 additions
and
9 deletions
+34
-9
loadorder.c
dlls/ntdll/loadorder.c
+34
-9
No files found.
dlls/ntdll/loadorder.c
View file @
8cdcbbb3
...
...
@@ -605,18 +605,18 @@ void MODULE_GetLoadOrderW( enum loadorder_type loadorder[], const WCHAR *app_nam
goto
done
;
}
/* then base name matching compiled-in defaults */
if
(
get_default_load_order
(
basename
,
loadorder
))
{
TRACE
(
"got compiled-in default %s for %s
\n
"
,
debugstr_loadorder
(
loadorder
),
debugstr_w
(
path
)
);
goto
done
;
}
if
(
basename
==
module
+
1
)
if
(
basename
==
module
+
1
)
/* module doesn't contain a path */
{
static
const
WCHAR
wildcardW
[]
=
{
'*'
,
0
};
/* then base name matching compiled-in defaults */
if
(
get_default_load_order
(
basename
,
loadorder
))
{
TRACE
(
"got compiled-in default %s for %s
\n
"
,
debugstr_loadorder
(
loadorder
),
debugstr_w
(
path
)
);
goto
done
;
}
/* then wildcard entry in AppDefaults (only if no explicit path) */
if
(
app_key
&&
get_registry_value
(
app_key
,
wildcardW
,
loadorder
))
{
...
...
@@ -640,6 +640,31 @@ void MODULE_GetLoadOrderW( enum loadorder_type loadorder[], const WCHAR *app_nam
}
else
/* module contains an explicit path */
{
/* then base name without '*' in AppDefaults */
if
(
app_key
&&
get_registry_value
(
app_key
,
basename
,
loadorder
))
{
TRACE
(
"got basename app defaults %s for %s
\n
"
,
debugstr_loadorder
(
loadorder
),
debugstr_w
(
path
)
);
goto
done
;
}
/* then base name without '*' in standard section */
if
(
std_key
&&
get_registry_value
(
std_key
,
basename
,
loadorder
))
{
TRACE
(
"got basename standard entry %s for %s
\n
"
,
debugstr_loadorder
(
loadorder
),
debugstr_w
(
path
)
);
goto
done
;
}
/* then base name matching compiled-in defaults */
if
(
get_default_load_order
(
basename
,
loadorder
))
{
TRACE
(
"got compiled-in default %s for %s
\n
"
,
debugstr_loadorder
(
loadorder
),
debugstr_w
(
path
)
);
goto
done
;
}
/* and last the hard-coded default */
memcpy
(
loadorder
,
default_path_loadorder
,
sizeof
(
default_path_loadorder
)
);
TRACE
(
"got hardcoded path default %s for %s
\n
"
,
debugstr_loadorder
(
loadorder
),
debugstr_w
(
path
)
);
...
...
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