From 753c2c9012903469f62a6d8ac4cf260d5710f046 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Wed, 1 Nov 2023 12:11:07 +1100 Subject: [PATCH] Rebase against 0170cd3a4c67bd99291234dd8e0d638a824d7715. --- .../0001-ddraw-Implement-Pick-and-GetPickRecords.patch | 4 ++-- staging/upstream-commit | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/patches/ddraw-GetPickRecords/0001-ddraw-Implement-Pick-and-GetPickRecords.patch b/patches/ddraw-GetPickRecords/0001-ddraw-Implement-Pick-and-GetPickRecords.patch index 4ca66216..df99a33f 100644 --- a/patches/ddraw-GetPickRecords/0001-ddraw-Implement-Pick-and-GetPickRecords.patch +++ b/patches/ddraw-GetPickRecords/0001-ddraw-Implement-Pick-and-GetPickRecords.patch @@ -70,7 +70,7 @@ index 80556e96787..b3b63d7b361 100644 } + if (This->pick_record_size > 0) -+ heap_free(This->pick_records); ++ free(This->pick_records); + TRACE("Releasing render target %p.\n", This->rt_iface); rt_iface = This->rt_iface; @@ -353,7 +353,7 @@ index 13e639eda3f..bb050fe16b8 100644 + { + if (device->pick_record_size == 0) device->pick_record_size = 1; + device->pick_record_size *= 2; -+ device->pick_records = heap_realloc(device->pick_records, ++ device->pick_records = realloc(device->pick_records, + sizeof(*device->pick_records) * device->pick_record_size); + } + diff --git a/staging/upstream-commit b/staging/upstream-commit index 3cdccf6b..ee047c3c 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -28210162472459d2afe57e638e2f50ee37f2b63f +0170cd3a4c67bd99291234dd8e0d638a824d7715