Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
04d07d65
Commit
04d07d65
authored
Jun 24, 2022
by
Huw Davies
Committed by
Alexandre Julliard
Jun 24, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wow64: Report the correct size for SystemLogicalProcessorInformationEx.
Spotted by Brendan Shanks. Signed-off-by:
Huw Davies
<
huw@codeweavers.com
>
parent
f815c264
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
info.c
dlls/ntdll/tests/info.c
+3
-2
system.c
dlls/wow64/system.c
+3
-3
No files found.
dlls/ntdll/tests/info.c
View file @
04d07d65
...
...
@@ -1168,7 +1168,7 @@ static void test_query_logicalprocex(void)
{
SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX
*
infoex
,
*
infoex_public
,
*
infoex_core
,
*
infoex_numa
,
*
infoex_cache
,
*
infoex_package
,
*
infoex_group
,
*
ex
;
DWORD
relationship
,
len
,
len_public
,
len_core
,
len_numa
,
len_cache
,
len_package
,
len_group
,
len_union
;
DWORD
relationship
,
len
,
len_public
,
len_core
,
len_numa
,
len_cache
,
len_package
,
len_group
,
len_union
,
ret_len
;
unsigned
int
i
,
j
;
NTSTATUS
status
;
BOOL
ret
;
...
...
@@ -1226,8 +1226,9 @@ static void test_query_logicalprocex(void)
infoex_group
=
HeapAlloc
(
GetProcessHeap
(),
HEAP_ZERO_MEMORY
,
len_group
);
relationship
=
RelationAll
;
status
=
pNtQuerySystemInformationEx
(
SystemLogicalProcessorInformationEx
,
&
relationship
,
sizeof
(
relationship
),
infoex
,
len
,
&
len
);
status
=
pNtQuerySystemInformationEx
(
SystemLogicalProcessorInformationEx
,
&
relationship
,
sizeof
(
relationship
),
infoex
,
len
,
&
ret_
len
);
ok
(
status
==
STATUS_SUCCESS
,
"got 0x%08lx
\n
"
,
status
);
ok
(
ret_len
==
len
,
"got %08lx expected %08lx
\n
"
,
ret_len
,
len
);
ret
=
pGetLogicalProcessorInformationEx
(
RelationAll
,
infoex_public
,
&
len_public
);
ok
(
ret
,
"got %d, error %ld
\n
"
,
ret
,
GetLastError
());
...
...
dlls/wow64/system.c
View file @
04d07d65
...
...
@@ -617,7 +617,7 @@ NTSTATUS WINAPI wow64_NtQuerySystemInformationEx( UINT *args )
status
=
NtQuerySystemInformationEx
(
class
,
&
handle
,
sizeof
(
handle
),
info
,
size
,
&
size
);
if
(
!
status
)
{
for
(
pos
=
pos32
=
0
;
pos
<
size
&&
pos32
<
len
;
pos
+=
ex
->
Size
,
pos32
+=
size32
)
for
(
pos
=
pos32
=
0
;
pos
<
size
;
pos
+=
ex
->
Size
,
pos32
+=
size32
)
{
ex
=
(
SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX
*
)((
char
*
)
info
+
pos
);
ex32
=
(
SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX32
*
)((
char
*
)
info32
+
pos32
);
...
...
@@ -645,8 +645,8 @@ NTSTATUS WINAPI wow64_NtQuerySystemInformationEx( UINT *args )
}
if
(
pos32
+
size32
<=
len
)
put_logical_proc_info_ex
(
ex32
,
ex
);
}
if
(
pos
<
size
)
status
=
STATUS_INFO_LENGTH_MISMATCH
;
else
size
=
pos32
;
if
(
pos
32
>
len
)
status
=
STATUS_INFO_LENGTH_MISMATCH
;
size
=
pos32
;
}
if
(
retlen
)
*
retlen
=
size
;
return
status
;
...
...
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