From b0736d0417288c0dc751d497045acf465b08c2fb Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Fri, 23 Feb 2024 10:04:43 +1100 Subject: [PATCH] Rebase against 232b18d820e08fe6534249a64d3afdbf35d0b688. --- .../0002-msxml3-Implement-FreeThreadedXMLHTTP60.patch | 4 ++-- staging/upstream-commit | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/patches/msxml3-FreeThreadedXMLHTTP60/0002-msxml3-Implement-FreeThreadedXMLHTTP60.patch b/patches/msxml3-FreeThreadedXMLHTTP60/0002-msxml3-Implement-FreeThreadedXMLHTTP60.patch index e882e4dd..1c6b49c2 100644 --- a/patches/msxml3-FreeThreadedXMLHTTP60/0002-msxml3-Implement-FreeThreadedXMLHTTP60.patch +++ b/patches/msxml3-FreeThreadedXMLHTTP60/0002-msxml3-Implement-FreeThreadedXMLHTTP60.patch @@ -144,7 +144,7 @@ index 459466a1234..d059c20ae81 100644 + if (This->request_body) ISequentialStream_Release(This->request_body); + if (This->callback3) IXMLHTTPRequest3Callback_Release(This->callback3); + if (This->callback) IXMLHTTPRequest2Callback_Release(This->callback); -+ heap_free(This); ++ free(This); + RtwqShutdown(); + } + @@ -545,7 +545,7 @@ index 459466a1234..d059c20ae81 100644 + struct xml_http_request_2 *xhr2; + TRACE("(%p)\n", obj); + -+ if (!(xhr2 = heap_alloc(sizeof(*xhr2)))) return E_OUTOFMEMORY; ++ if (!(xhr2 = malloc(sizeof(*xhr2)))) return E_OUTOFMEMORY; + + init_httprequest(&xhr2->req); + xhr2->IXMLHTTPRequest3_iface.lpVtbl = &XMLHTTPRequest3Vtbl; diff --git a/staging/upstream-commit b/staging/upstream-commit index b4a73006..b792dcd9 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -340a4b05b50fce02215213c21993fdf793e9d519 +232b18d820e08fe6534249a64d3afdbf35d0b688