From 2b8dee6e6801dfd5914aa1e2ed6cb4a5730db86c Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Fri, 28 Mar 2025 15:18:08 +0200 Subject: [PATCH] debug --- dll/win32/comctl32/imagelist.c | 2 +- dll/win32/comctl32/toolbar.c | 8 +++++++- sdk/lib/rtl/heap.c | 5 +++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dll/win32/comctl32/imagelist.c b/dll/win32/comctl32/imagelist.c index e56431edc6f..9dc762898a0 100644 --- a/dll/win32/comctl32/imagelist.c +++ b/dll/win32/comctl32/imagelist.c @@ -1316,7 +1316,7 @@ static BOOL alpha_blend_image( HIMAGELIST himl, HDC dest_dc, int dest_x, int des void *bits, *mask_bits; unsigned int *ptr; int i, j; - + __debugbreak(); if (!(hdc = CreateCompatibleDC( 0 ))) return FALSE; if (!(info = heap_alloc( FIELD_OFFSET( BITMAPINFO, bmiColors[256] )))) goto done; info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); diff --git a/dll/win32/comctl32/toolbar.c b/dll/win32/comctl32/toolbar.c index 844f4e4ca68..f4fb12065a4 100644 --- a/dll/win32/comctl32/toolbar.c +++ b/dll/win32/comctl32/toolbar.c @@ -3159,7 +3159,13 @@ TOOLBAR_AddStringW (TOOLBAR_INFO *infoPtr, HINSTANCE hInstance, LPARAM lParam) break; } - infoPtr->strings = ReAlloc(infoPtr->strings, sizeof(LPWSTR)*(infoPtr->nNumStrings+1)); + PWSTR* new_strings = ReAlloc(infoPtr->strings, sizeof(LPWSTR) * (infoPtr->nNumStrings + 1)); + if (!infoPtr->strings) + { + __debugbreak(); + new_strings = ReAlloc(infoPtr->strings, sizeof(LPWSTR) * (infoPtr->nNumStrings + 1)); + } + infoPtr->strings = new_strings; Str_SetPtrW(&infoPtr->strings[infoPtr->nNumStrings], p); infoPtr->nNumStrings++; diff --git a/sdk/lib/rtl/heap.c b/sdk/lib/rtl/heap.c index b38f4c93e3b..308569922b6 100644 --- a/sdk/lib/rtl/heap.c +++ b/sdk/lib/rtl/heap.c @@ -1437,6 +1437,8 @@ RtlCreateHeap(ULONG Flags, NTSTATUS Status; ULONG MaxBlockSize; + RtlpPageHeapEnabled = TRUE; + /* Check for a special heap */ if (RtlpPageHeapEnabled && !Addr && !Lock) { @@ -1457,6 +1459,9 @@ RtlCreateHeap(ULONG Flags, Flags &= HEAP_CREATE_VALID_MASK; } + if (!Addr) + Flags |= HEAP_FLAG_PAGE_ALLOCS; + /* Capture parameters */ if (Parameters) {