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
b6e91fa4
Commit
b6e91fa4
authored
Feb 05, 2020
by
Kevin Puetz
Committed by
Alexandre Julliard
Feb 05, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ntdll: Allow NULL lpAssemblyDirectoryName in find_actctx_dll.
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
d724f5e3
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
2 deletions
+8
-2
loader.c
dlls/ntdll/loader.c
+8
-2
No files found.
dlls/ntdll/loader.c
View file @
b6e91fa4
...
...
@@ -2757,7 +2757,7 @@ static NTSTATUS find_actctx_dll( LPCWSTR libname, LPWSTR *fullname )
/* restart with larger buffer */
}
if
(
!
info
->
lpAssemblyManifestPath
||
!
info
->
lpAssemblyDirectoryName
)
if
(
!
info
->
lpAssemblyManifestPath
)
{
status
=
STATUS_SXS_KEY_NOT_FOUND
;
goto
done
;
...
...
@@ -2768,7 +2768,7 @@ static NTSTATUS find_actctx_dll( LPCWSTR libname, LPWSTR *fullname )
DWORD
dirlen
=
info
->
ulAssemblyDirectoryNameLength
/
sizeof
(
WCHAR
);
p
++
;
if
(
strncmpiW
(
p
,
info
->
lpAssemblyDirectoryName
,
dirlen
)
||
strcmpiW
(
p
+
dirlen
,
dotManifestW
))
if
(
!
dirlen
||
strncmpiW
(
p
,
info
->
lpAssemblyDirectoryName
,
dirlen
)
||
strcmpiW
(
p
+
dirlen
,
dotManifestW
))
{
/* manifest name does not match directory name, so it's not a global
* windows/winsxs manifest; use the manifest directory name instead */
...
...
@@ -2786,6 +2786,12 @@ static NTSTATUS find_actctx_dll( LPCWSTR libname, LPWSTR *fullname )
}
}
if
(
!
info
->
lpAssemblyDirectoryName
)
{
status
=
STATUS_SXS_KEY_NOT_FOUND
;
goto
done
;
}
needed
=
(
strlenW
(
user_shared_data
->
NtSystemRoot
)
*
sizeof
(
WCHAR
)
+
sizeof
(
winsxsW
)
+
info
->
ulAssemblyDirectoryNameLength
+
nameW
.
Length
+
2
*
sizeof
(
WCHAR
));
...
...
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