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
6558611f
Commit
6558611f
authored
Sep 19, 2023
by
Eric Pouech
Committed by
Alexandre Julliard
Sep 19, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ntdll: Allow empty application nodes in actctx.
Signed-off-by:
Eric Pouech
<
epouech@codeweavers.com
>
parent
1155a191
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
43 additions
and
0 deletions
+43
-0
actctx.c
dlls/kernel32/tests/actctx.c
+34
-0
actctx.c
dlls/ntdll/actctx.c
+9
-0
No files found.
dlls/kernel32/tests/actctx.c
View file @
6558611f
...
...
@@ -511,6 +511,23 @@ static const char settings_manifest3[] =
" </asmv3:application>"
"</assembly>"
;
static
const
char
settings_manifest4
[]
=
"<assembly xmlns=
\"
urn:schemas-microsoft-com:asm.v1
\"
manifestVersion=
\"
1.0
\"
>"
" <assemblyIdentity version=
\"
1.0.0.0
\"
name=
\"
Wine.Test
\"
type=
\"
win32
\"
></assemblyIdentity>"
" <application/>"
" <application xmlns=
\"
urn:schemas-microsoft-com:asm.v3
\"
>"
" <windowsSettings>"
" <dpiAware xmlns=
\"
http://schemas.microsoft.com/SMI/2005/WindowsSettings
\"
>true</dpiAware>"
" </windowsSettings>"
" </application>"
" <application/>"
" <application xmlns=
\"
urn:schemas-microsoft-com:asm.v3
\"
>"
" <windowsSettings>"
" <dpiAwareness xmlns=
\"
http://schemas.microsoft.com/SMI/2016/WindowsSettings
\"
>true</dpiAwareness>"
" </windowsSettings>"
" </application>"
"</assembly>"
;
static
const
char
two_dll_manifest_dll
[]
=
"<assembly xmlns=
\"
urn:schemas-microsoft-com:asm.v3
\"
manifestVersion=
\"
1.0
\"
>"
" <assemblyIdentity type=
\"
win32
\"
name=
\"
sxs_dll
\"
version=
\"
1.0.0.0
\"
processorArchitecture=
\"
x86
\"
publicKeyToken=
\"
0000000000000000
\"
/>"
...
...
@@ -3405,6 +3422,23 @@ static void test_settings(void)
ok
(
!
ret
,
"QueryActCtxSettingsW succeeded
\n
"
);
ok
(
GetLastError
()
==
ERROR_SXS_KEY_NOT_FOUND
,
"wrong error %lu
\n
"
,
GetLastError
()
);
ReleaseActCtx
(
handle
);
/* lookup occurs in first non empty node */
create_manifest_file
(
"manifest_settings4.manifest"
,
settings_manifest4
,
-
1
,
NULL
,
NULL
);
handle
=
test_create
(
"manifest_settings4.manifest"
);
ok
(
handle
!=
INVALID_HANDLE_VALUE
,
"handle == INVALID_HANDLE_VALUE, error %lu
\n
"
,
GetLastError
()
);
DeleteFileA
(
"manifest_settings3.manifest"
);
SetLastError
(
0xdeadbeef
);
size
=
0xdead
;
memset
(
buffer
,
0xcc
,
sizeof
(
buffer
)
);
ret
=
pQueryActCtxSettingsW
(
0
,
handle
,
NULL
,
dpiAwareW
,
buffer
,
80
,
&
size
);
ok
(
ret
,
"QueryActCtxSettingsW failed
\n
"
);
SetLastError
(
0xdeadbeef
);
size
=
0xdead
;
memset
(
buffer
,
0xcc
,
sizeof
(
buffer
)
);
ret
=
pQueryActCtxSettingsW
(
0
,
handle
,
NULL
,
dpiAwarenessW
,
buffer
,
80
,
&
size
);
ok
(
!
ret
,
"QueryActCtxSettingsW succeeded
\n
"
);
ReleaseActCtx
(
handle
);
}
typedef
struct
...
...
dlls/ntdll/actctx.c
View file @
6558611f
...
...
@@ -2564,6 +2564,15 @@ static void parse_application_elem( xmlbuf_t *xmlbuf, struct assembly *assembly,
struct
actctx_loader
*
acl
,
const
struct
xml_elem
*
parent
)
{
struct
xml_elem
elem
;
struct
xml_attr
attr
;
BOOL
end
=
FALSE
;
while
(
next_xml_attr
(
xmlbuf
,
&
attr
,
&
end
))
{
if
(
!
is_xmlns_attr
(
&
attr
))
WARN
(
"unknown attr %s
\n
"
,
debugstr_xml_attr
(
&
attr
)
);
}
if
(
end
)
return
;
while
(
next_xml_elem
(
xmlbuf
,
&
elem
,
parent
))
{
...
...
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