system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-30 05:08:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

d3d8: Allocate what Validate(Vertex|Pixel)Shader return with HeapAlloc.

Browse source 
Fixes: a70e3059c6
Fixes: 6db89702a3
This commit is contained in:
Alex Henrie 2023-11-16 00:29:49 -07:00 committed by Alexandre Julliard
parent ef34d8139c
commit bdc6132658
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dlls/d3d8/d3d8_main.c
View file

@ -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;

16
dlls/d3d8/tests/device.c
View file

@ -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)