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
5b844fe8
Commit
5b844fe8
authored
Jul 25, 2007
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ntdll: Fix return status when failing to load the associated manifest for a module.
parent
3b5963c9
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
actctx.c
dlls/ntdll/actctx.c
+5
-5
No files found.
dlls/ntdll/actctx.c
View file @
5b844fe8
...
...
@@ -1629,7 +1629,7 @@ static NTSTATUS get_manifest_in_associated_manifest( struct actctx_loader* acl,
if
(
resid
!=
1
)
sprintfW
(
name
.
Buffer
+
strlenW
(
name
.
Buffer
),
fmtW
,
resid
);
strcatW
(
name
.
Buffer
,
dotManifestW
);
if
(
!
RtlDosPathNameToNtPathName_U
(
name
.
Buffer
,
&
nameW
,
NULL
,
NULL
))
status
=
STATUS_
NO_SUCH_FILE
;
status
=
STATUS_
RESOURCE_DATA_NOT_FOUND
;
RtlFreeUnicodeString
(
&
name
);
}
if
(
status
)
return
status
;
...
...
@@ -1645,12 +1645,12 @@ static NTSTATUS get_manifest_in_associated_manifest( struct actctx_loader* acl,
RtlInitUnicodeString
(
&
nameW
,
buffer
);
}
status
=
open_nt_file
(
&
file
,
&
nameW
);
if
(
status
==
STATUS_SUCCESS
)
if
(
!
open_nt_file
(
&
file
,
&
nameW
))
{
status
=
get_manifest_in_manifest_file
(
acl
,
ai
,
nameW
.
Buffer
,
directory
,
file
);
NtClose
(
file
);
}
else
status
=
STATUS_RESOURCE_DATA_NOT_FOUND
;
RtlFreeUnicodeString
(
&
nameW
);
return
status
;
}
...
...
@@ -1987,7 +1987,7 @@ NTSTATUS WINAPI RtlCreateActivationContext( HANDLE *handle, const void *ptr )
{
status
=
get_manifest_in_module
(
&
acl
,
NULL
,
NULL
,
directory
,
pActCtx
->
hModule
,
pActCtx
->
lpResourceName
,
lang
);
if
(
status
)
if
(
status
&&
status
!=
STATUS_SXS_CANT_GEN_ACTCTX
)
/* FIXME: what to do if pActCtx->lpSource is set */
status
=
get_manifest_in_associated_manifest
(
&
acl
,
NULL
,
NULL
,
directory
,
pActCtx
->
hModule
,
pActCtx
->
lpResourceName
);
...
...
@@ -1996,7 +1996,7 @@ NTSTATUS WINAPI RtlCreateActivationContext( HANDLE *handle, const void *ptr )
{
status
=
get_manifest_in_pe_file
(
&
acl
,
NULL
,
nameW
.
Buffer
,
directory
,
file
,
pActCtx
->
lpResourceName
,
lang
);
if
(
status
)
if
(
status
&&
status
!=
STATUS_SXS_CANT_GEN_ACTCTX
)
status
=
get_manifest_in_associated_manifest
(
&
acl
,
NULL
,
nameW
.
Buffer
,
directory
,
NULL
,
pActCtx
->
lpResourceName
);
}
...
...
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