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
395df1aa
Commit
395df1aa
authored
Mar 26, 2014
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ntdll: Heap handles should be 64K-aligned.
parent
8a82aace
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
alloc.c
dlls/kernel32/tests/alloc.c
+1
-0
heap.c
dlls/ntdll/heap.c
+1
-1
No files found.
dlls/kernel32/tests/alloc.c
View file @
395df1aa
...
@@ -69,6 +69,7 @@ static void test_Heap(void)
...
@@ -69,6 +69,7 @@ static void test_Heap(void)
*/
*/
memchunk
=
10
*
sysInfo
.
dwPageSize
;
memchunk
=
10
*
sysInfo
.
dwPageSize
;
heap
=
HeapCreate
(
0
,
2
*
memchunk
,
5
*
memchunk
);
heap
=
HeapCreate
(
0
,
2
*
memchunk
,
5
*
memchunk
);
ok
(
!
((
ULONG_PTR
)
heap
&
0xffff
),
"heap %p not 64K aligned
\n
"
,
heap
);
/* Check that HeapCreate allocated the right amount of ram */
/* Check that HeapCreate allocated the right amount of ram */
mem1
=
HeapAlloc
(
heap
,
0
,
5
*
memchunk
+
1
);
mem1
=
HeapAlloc
(
heap
,
0
,
5
*
memchunk
+
1
);
...
...
dlls/ntdll/heap.c
View file @
395df1aa
...
@@ -879,7 +879,7 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags,
...
@@ -879,7 +879,7 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags,
commitSize
=
min
(
totalSize
,
(
commitSize
+
COMMIT_MASK
)
&
~
COMMIT_MASK
);
commitSize
=
min
(
totalSize
,
(
commitSize
+
COMMIT_MASK
)
&
~
COMMIT_MASK
);
/* allocate the memory block */
/* allocate the memory block */
if
(
NtAllocateVirtualMemory
(
NtCurrentProcess
(),
&
address
,
5
,
&
totalSize
,
if
(
NtAllocateVirtualMemory
(
NtCurrentProcess
(),
&
address
,
0
,
&
totalSize
,
MEM_RESERVE
,
get_protection_type
(
flags
)
))
MEM_RESERVE
,
get_protection_type
(
flags
)
))
{
{
WARN
(
"Could not allocate %08lx bytes
\n
"
,
totalSize
);
WARN
(
"Could not allocate %08lx bytes
\n
"
,
totalSize
);
...
...
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