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
cb2a5f7e
Commit
cb2a5f7e
authored
Jan 26, 2010
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ntdll: Move alloc notification closer to the allocation for large blocks.
parent
b1c9ce44
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
3 deletions
+1
-3
heap.c
dlls/ntdll/heap.c
+1
-3
No files found.
dlls/ntdll/heap.c
View file @
cb2a5f7e
...
@@ -693,6 +693,7 @@ static void *allocate_large_block( HEAP *heap, DWORD flags, SIZE_T size )
...
@@ -693,6 +693,7 @@ static void *allocate_large_block( HEAP *heap, DWORD flags, SIZE_T size )
arena
->
size
=
ARENA_LARGE_SIZE
;
arena
->
size
=
ARENA_LARGE_SIZE
;
arena
->
magic
=
ARENA_LARGE_MAGIC
;
arena
->
magic
=
ARENA_LARGE_MAGIC
;
list_add_tail
(
&
heap
->
large_list
,
&
arena
->
entry
);
list_add_tail
(
&
heap
->
large_list
,
&
arena
->
entry
);
notify_alloc
(
arena
+
1
,
size
,
flags
&
HEAP_ZERO_MEMORY
);
return
arena
+
1
;
return
arena
+
1
;
}
}
...
@@ -1518,7 +1519,6 @@ PVOID WINAPI RtlAllocateHeap( HANDLE heap, ULONG flags, SIZE_T size )
...
@@ -1518,7 +1519,6 @@ PVOID WINAPI RtlAllocateHeap( HANDLE heap, ULONG flags, SIZE_T size )
void
*
ret
=
allocate_large_block
(
heap
,
flags
,
size
);
void
*
ret
=
allocate_large_block
(
heap
,
flags
,
size
);
if
(
!
(
flags
&
HEAP_NO_SERIALIZE
))
RtlLeaveCriticalSection
(
&
heapPtr
->
critSection
);
if
(
!
(
flags
&
HEAP_NO_SERIALIZE
))
RtlLeaveCriticalSection
(
&
heapPtr
->
critSection
);
if
(
!
ret
&&
(
flags
&
HEAP_GENERATE_EXCEPTIONS
))
RtlRaiseStatus
(
STATUS_NO_MEMORY
);
if
(
!
ret
&&
(
flags
&
HEAP_GENERATE_EXCEPTIONS
))
RtlRaiseStatus
(
STATUS_NO_MEMORY
);
notify_alloc
(
ret
,
size
,
flags
&
HEAP_ZERO_MEMORY
);
TRACE
(
"(%p,%08x,%08lx): returning %p
\n
"
,
heap
,
flags
,
size
,
ret
);
TRACE
(
"(%p,%08x,%08lx): returning %p
\n
"
,
heap
,
flags
,
size
,
ret
);
return
ret
;
return
ret
;
}
}
...
@@ -1675,7 +1675,6 @@ PVOID WINAPI RtlReAllocateHeap( HANDLE heap, ULONG flags, PVOID ptr, SIZE_T size
...
@@ -1675,7 +1675,6 @@ PVOID WINAPI RtlReAllocateHeap( HANDLE heap, ULONG flags, PVOID ptr, SIZE_T size
if
(
!
find_large_block
(
heapPtr
,
ptr
))
goto
error
;
if
(
!
find_large_block
(
heapPtr
,
ptr
))
goto
error
;
if
(
!
(
ret
=
realloc_large_block
(
heapPtr
,
flags
,
ptr
,
size
)))
goto
oom
;
if
(
!
(
ret
=
realloc_large_block
(
heapPtr
,
flags
,
ptr
,
size
)))
goto
oom
;
notify_free
(
ptr
);
notify_free
(
ptr
);
notify_alloc
(
ret
,
size
,
flags
&
HEAP_ZERO_MEMORY
);
goto
done
;
goto
done
;
}
}
if
((
char
*
)
pArena
<
(
char
*
)
subheap
->
base
+
subheap
->
headerSize
)
goto
error
;
if
((
char
*
)
pArena
<
(
char
*
)
subheap
->
base
+
subheap
->
headerSize
)
goto
error
;
...
@@ -1693,7 +1692,6 @@ PVOID WINAPI RtlReAllocateHeap( HANDLE heap, ULONG flags, PVOID ptr, SIZE_T size
...
@@ -1693,7 +1692,6 @@ PVOID WINAPI RtlReAllocateHeap( HANDLE heap, ULONG flags, PVOID ptr, SIZE_T size
{
{
if
(
flags
&
HEAP_REALLOC_IN_PLACE_ONLY
)
goto
oom
;
if
(
flags
&
HEAP_REALLOC_IN_PLACE_ONLY
)
goto
oom
;
if
(
!
(
ret
=
allocate_large_block
(
heapPtr
,
flags
,
size
)))
goto
oom
;
if
(
!
(
ret
=
allocate_large_block
(
heapPtr
,
flags
,
size
)))
goto
oom
;
notify_alloc
(
ret
,
size
,
flags
&
HEAP_ZERO_MEMORY
);
memcpy
(
ret
,
pArena
+
1
,
oldActualSize
);
memcpy
(
ret
,
pArena
+
1
,
oldActualSize
);
notify_free
(
pArena
+
1
);
notify_free
(
pArena
+
1
);
HEAP_MakeInUseBlockFree
(
subheap
,
pArena
);
HEAP_MakeInUseBlockFree
(
subheap
,
pArena
);
...
...
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