Module: wine Branch: master Commit: bdc6132658f321a126b860f1f9329029b7c581db URL: https://gitlab.winehq.org/wine/wine/-/commit/bdc6132658f321a126b860f1f932902...
Author: Alex Henrie alexhenrie24@gmail.com Date: Thu Nov 16 00:29:49 2023 -0700
d3d8: Allocate what Validate(Vertex|Pixel)Shader return with HeapAlloc.
Fixes: a70e3059c66a375d6757af4ec60a4b2e11896be5 Fixes: 6db89702a3f7e7563c96f4ea3836b9cb261a8685
---
dlls/d3d8/d3d8_main.c | 4 ++-- dlls/d3d8/tests/device.c | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/dlls/d3d8/d3d8_main.c b/dlls/d3d8/d3d8_main.c index 45234c01add..12905ffbce4 100644 --- a/dlls/d3d8/d3d8_main.c +++ b/dlls/d3d8/d3d8_main.c @@ -95,7 +95,7 @@ done: if (!return_error) message = ""; message_size = strlen(message) + 1; - if (errors && (*errors = malloc(message_size))) + if (errors && (*errors = HeapAlloc(GetProcessHeap(), 0, message_size))) memcpy(*errors, message, message_size);
return hr; @@ -140,7 +140,7 @@ done: if (!return_error) message = ""; message_size = strlen(message) + 1; - if (errors && (*errors = malloc(message_size))) + if (errors && (*errors = HeapAlloc(GetProcessHeap(), 0, message_size))) memcpy(*errors, message, message_size);
return hr; diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 3f6174b98db..fd06e1bf79d 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -5051,11 +5051,11 @@ static void test_validate_vs(void) hr = ValidateVertexShader(NULL, NULL, NULL, FALSE, &errors); ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); ok(!*errors, "Got unexpected string "%s".\n", errors); - free(errors); + HeapFree(GetProcessHeap(), 0, errors); hr = ValidateVertexShader(NULL, NULL, NULL, TRUE, &errors); ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); ok(!!*errors, "Got unexpected empty string.\n"); - free(errors); + HeapFree(GetProcessHeap(), 0, errors);
hr = ValidateVertexShader(vs_code, NULL, NULL, FALSE, NULL); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); @@ -5064,7 +5064,7 @@ static void test_validate_vs(void) hr = ValidateVertexShader(vs_code, NULL, NULL, TRUE, &errors); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!*errors, "Got unexpected string "%s".\n", errors); - free(errors); + HeapFree(GetProcessHeap(), 0, errors);
hr = ValidateVertexShader(vs_code, declaration_valid1, NULL, FALSE, NULL); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); @@ -5101,11 +5101,11 @@ static void test_validate_vs(void) hr = ValidateVertexShader(vs_code, NULL, NULL, FALSE, &errors); ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); ok(!*errors, "Got unexpected string "%s".\n", errors); - free(errors); + HeapFree(GetProcessHeap(), 0, errors); hr = ValidateVertexShader(vs_code, NULL, NULL, TRUE, &errors); ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); ok(!!*errors, "Got unexpected empty string.\n"); - free(errors); + HeapFree(GetProcessHeap(), 0, errors); }
static void test_validate_ps(void) @@ -5149,7 +5149,7 @@ static void test_validate_ps(void) hr = ValidatePixelShader(ps_1_1_code, NULL, TRUE, &errors); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!*errors, "Got unexpected string "%s".\n", errors); - free(errors); + HeapFree(GetProcessHeap(), 0, errors);
memset(&caps, 0, sizeof(caps)); caps.PixelShaderVersion = D3DPS_VERSION(1, 1); @@ -5179,11 +5179,11 @@ static void test_validate_ps(void) hr = ValidatePixelShader(ps_1_1_code, NULL, FALSE, &errors); ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); ok(!*errors, "Got unexpected string "%s".\n", errors); - free(errors); + HeapFree(GetProcessHeap(), 0, errors); hr = ValidatePixelShader(ps_1_1_code, NULL, TRUE, &errors); ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); ok(!!*errors, "Got unexpected empty string.\n"); - free(errors); + HeapFree(GetProcessHeap(), 0, errors); }
static void test_volume_get_container(void)