[PATCH 0/1] MR3228: Update heap.c removed return NULL at line 985. Prevents Wing Commander...

[James Carthew (＠dmjc)]

Update heap.c removed return NULL at line 985. Prevents Wing Commander Prophecy and Secret Ops for loading/playing. Fixes WINE bug 55176.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/3228

[PATCH 1/1] Update heap.c removed return NULL at line 985. Prevents Wing Commander Prophecy and Secret Ops for loading/playing.

[James Carthew]

From: James Carthew <jcarthew(a)gmail.com>

---
 dlls/ntdll/heap.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c
index aca8e7181a8..4bcb01b13f8 100644
--- a/dlls/ntdll/heap.c
+++ b/dlls/ntdll/heap.c
@@ -982,7 +982,6 @@ static void *allocate_region( struct heap *heap, ULONG flags, SIZE_T *region_siz
     if (heap && !(flags & HEAP_GROWABLE))
     {
         WARN( "Heap %p isn't growable, cannot allocate %#Ix bytes\n", heap, *region_size );
-        return NULL;
     }
 
     /* allocate the memory block */
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/3228

[PATCH 1/1] Update heap.c removed return NULL at line 985. Prevents Wing Commander Prophecy and Secret Ops for loading/p

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=134393

Your paranoid android.


=== debian11 (32 bit report) ===

comctl32:
dpa.c:216: Test failed: ret=1 error=0
dpa.c:216: Test failed: ret=1 error=1411

kernel32:
heap.c:455: Test failed: HeapAlloc succeeded
heap.c:456: Test failed: got error 3735928559
heap.c:479: Test failed: HeapAlloc succeeded
heap.c:480: Test failed: got error 3735928559
heap.c:490: Test failed: HeapAlloc succeeded
heap.c:491: Test failed: got error 3735928559

[Fabian Maurer (＠DarkShadow44)]

This breaks the tests. I suspect it needs RtlCompactHeap:

```
0024:warn:heap:allocate_region Heap 01C80000 isn't growable, cannot allocate 0x100000 bytes
0024:trace:heap:RtlAllocateHeap handle 01C80000, flags 0x1, size 0xf4c60, return 00000000, status 0xc0000017.
0024:fixme:heap:RtlCompactHeap handle 01C80000, flags 0x1 stub!
0024:warn:heap:allocate_region Heap 01C80000 isn't growable, cannot allocate 0x100000 bytes
```

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/3228#note_38045

[PATCH 0/1] MR3228: Update heap.c removed return NULL at line 985. Prevents Wing Commander... - closed

[Alexandre Julliard (＠julliard)]

This merge request was closed by Alexandre Julliard.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/3228