October 2023 - Wine-Commits

Alex Henrie : d3d9/tests: Use CRT allocation functions.
by Alexandre Julliard Oct. 31, 2023

Oct. 31, 2023

Module: wine Branch: master Commit: 042f9304cc8578a48c483f458061273e0d9b9f66 URL: https://gitlab.winehq.org/wine/wine/-/commit/042f9304cc8578a48c483f45806127… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Oct 29 10:46:07 2023 -0600 d3d9/tests: Use CRT allocation functions. --- dlls/d3d9/tests/d3d9ex.c | 16 ++++++++-------- dlls/d3d9/tests/device.c | 27 +++++++++++++-------------- dlls/d3d9/tests/stateblock.c | 40 ++++++++++++++++++++-------------------- dlls/d3d9/tests/visual.c | 17 ++++++++--------- 4 files changed, 49 insertions(+), 51 deletions(-)

1 0

Alex Henrie : d3d9: Use CRT allocation functions.
by Alexandre Julliard Oct. 31, 2023

Oct. 31, 2023

Module: wine Branch: master Commit: 9a5b854e2b0ef80eb9a5d269d2d9ecd6778f7f49 URL: https://gitlab.winehq.org/wine/wine/-/commit/9a5b854e2b0ef80eb9a5d269d2d9ec… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Oct 29 11:42:13 2023 -0600 d3d9: Use CRT allocation functions. --- dlls/d3d9/buffer.c | 4 +-- dlls/d3d9/d3d9_main.c | 8 ++--- dlls/d3d9/d3d9_private.h | 1 - dlls/d3d9/device.c | 80 ++++++++++++++++++------------------------- dlls/d3d9/directx.c | 14 ++++---- dlls/d3d9/query.c | 2 +- dlls/d3d9/shader.c | 4 +-- dlls/d3d9/stateblock.c | 2 +- dlls/d3d9/surface.c | 4 +-- dlls/d3d9/swapchain.c | 6 ++-- dlls/d3d9/texture.c | 2 +- dlls/d3d9/vertexdeclaration.c | 22 ++++++------ dlls/d3d9/volume.c | 2 +- 13 files changed, 68 insertions(+), 83 deletions(-)

1 0

Alex Henrie : ddraw: Use CRT allocation functions.
by Alexandre Julliard Oct. 31, 2023

Oct. 31, 2023

Module: wine Branch: master Commit: e3ac58558f7eaf6e8f20255584fc7e954b49ac45 URL: https://gitlab.winehq.org/wine/wine/-/commit/e3ac58558f7eaf6e8f20255584fc7e… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Oct 29 10:53:02 2023 -0600 ddraw: Use CRT allocation functions. --- dlls/ddraw/clipper.c | 2 +- dlls/ddraw/ddraw.c | 30 ++++++++-------- dlls/ddraw/ddraw_private.h | 1 - dlls/ddraw/device.c | 20 +++++------ dlls/ddraw/executebuffer.c | 6 ++-- dlls/ddraw/light.c | 2 +- dlls/ddraw/main.c | 14 ++++---- dlls/ddraw/material.c | 4 +-- dlls/ddraw/palette.c | 2 +- dlls/ddraw/surface.c | 90 +++++++++++++++++++++++----------------------- dlls/ddraw/vertexbuffer.c | 6 ++-- dlls/ddraw/viewport.c | 2 +- 12 files changed, 89 insertions(+), 90 deletions(-)

1 0

Alex Henrie : ddraw/tests: Use CRT allocation functions.
by Alexandre Julliard Oct. 31, 2023

Oct. 31, 2023

Module: wine Branch: master Commit: 1b7b948a16cdd2b0e05a89f599b99c53d06de440 URL: https://gitlab.winehq.org/wine/wine/-/commit/1b7b948a16cdd2b0e05a89f599b99c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Oct 29 11:09:46 2023 -0600 ddraw/tests: Use CRT allocation functions. --- dlls/ddraw/tests/ddraw1.c | 44 +++++++++++++++++------------------ dlls/ddraw/tests/ddraw2.c | 44 +++++++++++++++++------------------ dlls/ddraw/tests/ddraw4.c | 53 ++++++++++++++++++++----------------------- dlls/ddraw/tests/ddraw7.c | 53 ++++++++++++++++++++----------------------- dlls/ddraw/tests/ddrawmodes.c | 10 ++++---- 5 files changed, 97 insertions(+), 107 deletions(-)

1 0

Alex Henrie : dxgi: Use CRT allocation functions.
by Alexandre Julliard Oct. 31, 2023

Oct. 31, 2023

Module: wine Branch: master Commit: 2369657333cb99d395f6852c07feddb05ee93ae5 URL: https://gitlab.winehq.org/wine/wine/-/commit/2369657333cb99d395f6852c07fedd… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Oct 29 11:28:10 2023 -0600 dxgi: Use CRT allocation functions. --- dlls/dxgi/adapter.c | 4 ++-- dlls/dxgi/device.c | 10 +++++----- dlls/dxgi/dxgi_main.c | 13 +++++-------- dlls/dxgi/dxgi_private.h | 1 - dlls/dxgi/factory.c | 6 +++--- dlls/dxgi/output.c | 4 ++-- dlls/dxgi/resource.c | 2 +- dlls/dxgi/swapchain.c | 26 +++++++++++++------------- 8 files changed, 31 insertions(+), 35 deletions(-)

1 0

Tim Clem : msvcrt: Promote the log from _wassert from a trace to an error.
by Alexandre Julliard Oct. 31, 2023

Oct. 31, 2023

Module: wine Branch: master Commit: ec449cfdeb6b287611d56dce8e6f0d9493431e54 URL: https://gitlab.winehq.org/wine/wine/-/commit/ec449cfdeb6b287611d56dce8e6f0d… Author: Tim Clem <tclem(a)codeweavers.com> Date: Mon Oct 30 11:27:55 2023 -0700 msvcrt: Promote the log from _wassert from a trace to an error. --- dlls/msvcrt/exit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 3a7b5ae0330..cf1e7caeb06 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -292,7 +292,7 @@ unsigned int CDECL _set_abort_behavior(unsigned int flags, unsigned int mask) */ void DECLSPEC_NORETURN CDECL _wassert(const wchar_t* str, const wchar_t* file, unsigned int line) { - TRACE("(%s,%s,%d)\n", debugstr_w(str), debugstr_w(file), line); + ERR("(%s,%s,%d)\n", debugstr_w(str), debugstr_w(file), line); if ((MSVCRT_error_mode == _OUT_TO_MSGBOX) || ((MSVCRT_error_mode == _OUT_TO_DEFAULT) && (MSVCRT_app_type == 2)))

1 0

Hans Leidekker : ntdll: Bump current build number to 19043 (Win10 2009).
by Alexandre Julliard Oct. 31, 2023

Oct. 31, 2023

Module: wine Branch: master Commit: fd00d8e4cc11e494745184897133aff8718316c8 URL: https://gitlab.winehq.org/wine/wine/-/commit/fd00d8e4cc11e494745184897133af… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 30 18:32:18 2023 +0100 ntdll: Bump current build number to 19043 (Win10 2009). Based on Proton commit 0fa76dd66a8. --- dlls/kernel32/version.rc | 10 +++++----- dlls/kernelbase/version.c | 2 +- dlls/ntdll/unix/env.c | 2 +- dlls/ntdll/version.c | 2 +- loader/wine.inf.in | 4 ++-- programs/winecfg/appdefaults.c | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/version.rc b/dlls/kernel32/version.rc index b6002f51f7a..f91262dfa8e 100644 --- a/dlls/kernel32/version.rc +++ b/dlls/kernel32/version.rc @@ -25,10 +25,10 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT #define WINE_FILEDESCRIPTION_STR "Wine kernel DLL" #define WINE_FILENAME_STR "kernel32.dll" -/* these values come from Windows 10 Version 1909 */ -#define WINE_FILEVERSION 10,0,18362,1350 -#define WINE_FILEVERSION_STR "10.0.18362.1350" -#define WINE_PRODUCTVERSION 10,0,18362,1350 -#define WINE_PRODUCTVERSION_STR "10.0.18362.1350" +/* these values come from Windows 10 Version 2009 */ +#define WINE_FILEVERSION 10,0,19043,1466 +#define WINE_FILEVERSION_STR "10.0.19043.1466" +#define WINE_PRODUCTVERSION 10,0,19043,1466 +#define WINE_PRODUCTVERSION_STR "10.0.19043.1466" #include "wine/wine_common_ver.rc" diff --git a/dlls/kernelbase/version.c b/dlls/kernelbase/version.c index 4631ac8d0bc..0636634badb 100644 --- a/dlls/kernelbase/version.c +++ b/dlls/kernelbase/version.c @@ -154,7 +154,7 @@ static const struct }, /* Windows 10 */ { - { 10, 0, 18362 }, + { 10, 0, 19043 }, {0x8e0f7a12,0xbfb3,0x4fe8,{0xb9,0xa5,0x48,0xfd,0x50,0xa1,0x5a,0x9a}} } }; diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 80f151c4cb9..f845d2372e1 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1851,7 +1851,7 @@ static void init_peb( RTL_USER_PROCESS_PARAMETERS *params, void *module ) peb->ProcessParameters = params; peb->OSMajorVersion = 10; peb->OSMinorVersion = 0; - peb->OSBuildNumber = 18362; + peb->OSBuildNumber = 19043; peb->OSPlatformId = VER_PLATFORM_WIN32_NT; peb->ImageSubSystem = main_image_info.SubSystemType; peb->ImageSubSystemMajorVersion = main_image_info.MajorSubsystemVersion; diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 9c396598d4e..71f5b74bb5a 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -168,7 +168,7 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] = }, /* WIN10 */ { - sizeof(RTL_OSVERSIONINFOEXW), 10, 0, 18362, VER_PLATFORM_WIN32_NT, + sizeof(RTL_OSVERSIONINFOEXW), 10, 0, 19043, VER_PLATFORM_WIN32_NT, L"", 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 }, /* WIN11 */ diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 382808c4876..255ea807d7d 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2502,8 +2502,8 @@ HKLM,"System\CurrentControlSet\Services\Winsock2\Parameters\Protocol_Catalog9\Ca HKLM,%CurrentVersionNT%,"CurrentVersion",2,"6.3" HKLM,%CurrentVersionNT%,"CurrentMajorVersionNumber",0x10003,10 HKLM,%CurrentVersionNT%,"CurrentMinorVersionNumber",0x10003,0 -HKLM,%CurrentVersionNT%,"CurrentBuild",2,"18362" -HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"18362" +HKLM,%CurrentVersionNT%,"CurrentBuild",2,"19043" +HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"19043" HKLM,%CurrentVersionNT%,"CurrentType",2,"Multiprocessor Free" HKLM,%CurrentVersionNT%,"DigitalProductId",1,00,00,00,00,00,00,00,00,00,00,00,\ 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index b7a2dc44038..4900c1e14fd 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -51,7 +51,7 @@ struct win_version static const struct win_version win_versions[] = { { L"win11", L"Windows 11", L"6.3", 10, 0, 22000, VER_PLATFORM_WIN32_NT, L"", 0, 0, L"WinNT"}, - { L"win10", L"Windows 10", L"6.3", 10, 0, 18362, VER_PLATFORM_WIN32_NT, L"", 0, 0, L"WinNT"}, + { L"win10", L"Windows 10", L"6.3", 10, 0, 19043, VER_PLATFORM_WIN32_NT, L"", 0, 0, L"WinNT"}, { L"win81", L"Windows 8.1", NULL, 6, 3, 9600, VER_PLATFORM_WIN32_NT, L"", 0, 0, L"WinNT"}, { L"win8", L"Windows 8", NULL, 6, 2, 9200, VER_PLATFORM_WIN32_NT, L"", 0, 0, L"WinNT"}, { L"win2008r2", L"Windows 2008 R2", NULL, 6, 1, 7601, VER_PLATFORM_WIN32_NT, L"Service Pack 1", 1, 0, L"ServerNT"},

1 0

Alex Henrie : d3d10core/tests: Use CRT allocation functions.
by Alexandre Julliard Oct. 31, 2023

Oct. 31, 2023

Module: wine Branch: master Commit: b99ea5133196f29f50ecf160ff855ebc26a8ede8 URL: https://gitlab.winehq.org/wine/wine/-/commit/b99ea5133196f29f50ecf160ff855e… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Oct 29 10:16:43 2023 -0600 d3d10core/tests: Use CRT allocation functions. --- dlls/d3d10core/tests/d3d10core.c | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index a8283da9c18..e885b8678bf 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -23,7 +23,6 @@ #define COBJMACROS #include "initguid.h" #include "d3d11_4.h" -#include "wine/heap.h" #include "wine/wined3d.h" #include "wine/test.h" @@ -88,7 +87,7 @@ static void queue_test(void (*test)(void)) if (mt_test_count >= mt_tests_size) { mt_tests_size = max(16, mt_tests_size * 2); - mt_tests = heap_realloc(mt_tests, mt_tests_size * sizeof(*mt_tests)); + mt_tests = realloc(mt_tests, mt_tests_size * sizeof(*mt_tests)); } mt_tests[mt_test_count++].test = test; } @@ -126,7 +125,7 @@ static void run_queued_tests(void) GetSystemInfo(&si); thread_count = si.dwNumberOfProcessors; - threads = heap_calloc(thread_count, sizeof(*threads)); + threads = calloc(thread_count, sizeof(*threads)); for (i = 0, test_idx = 0; i < thread_count; ++i) { threads[i] = CreateThread(NULL, 0, thread_func, &test_idx, 0, NULL); @@ -137,7 +136,7 @@ static void run_queued_tests(void) { CloseHandle(threads[i]); } - heap_free(threads); + free(threads); } static void set_box(D3D10_BOX *box, UINT left, UINT top, UINT front, UINT right, UINT bottom, UINT back) @@ -3249,7 +3248,7 @@ static void test_render_target_views(void) texture_desc.CPUAccessFlags = 0; texture_desc.MiscFlags = 0; - data = heap_alloc_zero(texture_desc.Width * texture_desc.Height * 4); + data = calloc(texture_desc.Width * texture_desc.Height, 4); ok(!!data, "Failed to allocate memory.\n"); for (i = 0; i < ARRAY_SIZE(tests); ++i) @@ -3290,7 +3289,7 @@ static void test_render_target_views(void) ID3D10Texture2D_Release(texture); } - heap_free(data); + free(data); release_test_context(&test_context); } @@ -10441,7 +10440,7 @@ static void test_resource_access(void) data.SysMemPitch = 0; data.SysMemSlicePitch = 0; - data.pSysMem = heap_alloc(10240); + data.pSysMem = malloc(10240); ok(!!data.pSysMem, "Failed to allocate memory.\n"); for (i = 0; i < ARRAY_SIZE(tests); ++i) @@ -10588,7 +10587,7 @@ static void test_resource_access(void) } } - heap_free((void *)data.pSysMem); + free((void *)data.pSysMem); refcount = ID3D10Device_Release(device); ok(!refcount, "Device has %lu references left.\n", refcount); @@ -15036,7 +15035,7 @@ static void test_buffer_srv(void) resource_data.SysMemSlicePitch = 0; if (current_buffer->data_offset) { - data = heap_alloc_zero(current_buffer->byte_count); + data = calloc(1, current_buffer->byte_count); ok(!!data, "Failed to allocate memory.\n"); memcpy(data + current_buffer->data_offset, current_buffer->data, current_buffer->byte_count - current_buffer->data_offset); @@ -15048,7 +15047,7 @@ static void test_buffer_srv(void) } hr = ID3D10Device_CreateBuffer(device, &buffer_desc, &resource_data, &buffer); ok(SUCCEEDED(hr), "Test %u: Failed to create buffer, hr %#lx.\n", i, hr); - heap_free(data); + free(data); } else { @@ -16100,7 +16099,7 @@ static void test_depth_bias(void) rasterizer_desc.SlopeScaledDepthBias = 0.0f; rasterizer_desc.DepthClipEnable = TRUE; - depth_values = heap_calloc(swapchain_desc.height, sizeof(*depth_values)); + depth_values = calloc(swapchain_desc.height, sizeof(*depth_values)); ok(!!depth_values, "Failed to allocate memory.\n"); for (format_idx = 0; format_idx < ARRAY_SIZE(formats); ++format_idx) @@ -16307,7 +16306,7 @@ static void test_depth_bias(void) winetest_pop_context(); } - heap_free(depth_values); + free(depth_values); release_test_context(&test_context); } @@ -17301,7 +17300,7 @@ static void test_generate_mips(void) device = test_context.device; - data = heap_alloc(sizeof(*data) * 32 * 32 * 32); + data = malloc(sizeof(*data) * 32 * 32 * 32); for (z = 0; z < 32; ++z) { @@ -17328,7 +17327,7 @@ static void test_generate_mips(void) } } - zero_data = heap_alloc_zero(sizeof(*zero_data) * 16 * 16 * 16); + zero_data = calloc(16 * 16 * 16, sizeof(*zero_data)); for (i = 0; i < ARRAY_SIZE(resource_types); ++i) { @@ -17472,8 +17471,8 @@ static void test_generate_mips(void) if (is_warp_device(device)) { win_skip("Creating the next texture crashes WARP on some testbot boxes.\n"); - heap_free(zero_data); - heap_free(data); + free(zero_data); + free(data); release_test_context(&test_context); return; } @@ -17541,8 +17540,8 @@ static void test_generate_mips(void) ID3D10Resource_Release(resource); - heap_free(zero_data); - heap_free(data); + free(zero_data); + free(data); release_test_context(&test_context); } @@ -19069,7 +19068,7 @@ static void test_texture_compressed_3d(void) ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); /* Simply test all combinations of r0 and r1. */ - texture_data = heap_alloc(256 * 256 * sizeof(UINT64)); + texture_data = malloc(256 * 256 * sizeof(UINT64)); for (r1 = 0; r1 < 256; ++r1) { for (r0 = 0; r0 < 256; ++r0) @@ -19094,7 +19093,7 @@ static void test_texture_compressed_3d(void) texture_desc.MiscFlags = 0; hr = ID3D10Device_CreateTexture3D(device, &texture_desc, &resource_data, &texture); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - heap_free(texture_data); + free(texture_data); hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)texture, NULL, &srv); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);

1 0

Alex Henrie : d3d8: Use CRT allocation functions.
by Alexandre Julliard Oct. 31, 2023

Oct. 31, 2023

Module: wine Branch: master Commit: a70e3059c66a375d6757af4ec60a4b2e11896be5 URL: https://gitlab.winehq.org/wine/wine/-/commit/a70e3059c66a375d6757af4ec60a4b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Oct 29 10:28:54 2023 -0600 d3d8: Use CRT allocation functions. --- dlls/d3d8/buffer.c | 4 +-- dlls/d3d8/d3d8_main.c | 8 +++--- dlls/d3d8/d3d8_private.h | 1 - dlls/d3d8/device.c | 64 +++++++++++++++++++++---------------------- dlls/d3d8/directx.c | 10 +++---- dlls/d3d8/shader.c | 8 +++--- dlls/d3d8/surface.c | 4 +-- dlls/d3d8/swapchain.c | 6 ++-- dlls/d3d8/texture.c | 2 +- dlls/d3d8/vertexdeclaration.c | 14 +++++----- dlls/d3d8/volume.c | 2 +- 11 files changed, 61 insertions(+), 62 deletions(-)

1 0

Alex Henrie : d3d11/tests: Use CRT allocation functions.
by Alexandre Julliard Oct. 31, 2023

Oct. 31, 2023

Module: wine Branch: master Commit: f2d173479413bb8ce121615f0d4021e8bf63a21e URL: https://gitlab.winehq.org/wine/wine/-/commit/f2d173479413bb8ce121615f0d4021… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Oct 29 10:17:19 2023 -0600 d3d11/tests: Use CRT allocation functions. --- dlls/d3d11/tests/d3d11.c | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 1b33664befd..984bb845aad 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -26,7 +26,6 @@ #include "initguid.h" #include "d3d11_4.h" #include "winternl.h" -#include "wine/heap.h" #include "wine/wined3d.h" #include "wine/test.h" @@ -135,7 +134,7 @@ static void queue_test_entry(const struct test_entry *t) if (mt_test_count >= mt_tests_size) { mt_tests_size = max(16, mt_tests_size * 2); - mt_tests = heap_realloc(mt_tests, mt_tests_size * sizeof(*t)); + mt_tests = realloc(mt_tests, mt_tests_size * sizeof(*t)); } mt_tests[mt_test_count++] = *t; } @@ -205,7 +204,7 @@ static void run_queued_tests(void) GetSystemInfo(&si); thread_count = si.dwNumberOfProcessors; - threads = heap_calloc(thread_count, sizeof(*threads)); + threads = calloc(thread_count, sizeof(*threads)); for (i = 0, test_idx = 0; i < thread_count; ++i) { threads[i] = CreateThread(NULL, 0, thread_func, &test_idx, 0, NULL); @@ -216,7 +215,7 @@ static void run_queued_tests(void) { CloseHandle(threads[i]); } - heap_free(threads); + free(threads); } static void set_box(D3D11_BOX *box, UINT left, UINT top, UINT front, UINT right, UINT bottom, UINT back) @@ -11473,7 +11472,7 @@ static void test_render_target_views(void) texture_desc.CPUAccessFlags = 0; texture_desc.MiscFlags = 0; - data = heap_alloc_zero(texture_desc.Width * texture_desc.Height * 4); + data = calloc(texture_desc.Width * texture_desc.Height, 4); ok(!!data, "Failed to allocate memory.\n"); for (i = 0; i < ARRAY_SIZE(tests); ++i) @@ -11557,7 +11556,7 @@ static void test_render_target_views(void) ID3D11Resource_Release(resource); } - heap_free(data); + free(data); release_test_context(&test_context); } @@ -15403,7 +15402,7 @@ static void test_resource_access(const D3D_FEATURE_LEVEL feature_level) data.SysMemPitch = 0; data.SysMemSlicePitch = 0; - data.pSysMem = heap_alloc(10240); + data.pSysMem = malloc(10240); ok(!!data.pSysMem, "Failed to allocate memory.\n"); for (i = 0; i < ARRAY_SIZE(tests); ++i) @@ -15588,7 +15587,7 @@ static void test_resource_access(const D3D_FEATURE_LEVEL feature_level) } } - heap_free((void *)data.pSysMem); + free((void *)data.pSysMem); ID3D11DeviceContext_Release(context); refcount = ID3D11Device_Release(device); @@ -24691,7 +24690,7 @@ static void test_buffer_srv(void) resource_data.SysMemSlicePitch = 0; if (current_buffer->data_offset) { - data = heap_alloc_zero(current_buffer->byte_count); + data = calloc(1, current_buffer->byte_count); ok(!!data, "Failed to allocate memory.\n"); memcpy(data + current_buffer->data_offset, current_buffer->data, current_buffer->byte_count - current_buffer->data_offset); @@ -24703,7 +24702,7 @@ static void test_buffer_srv(void) } hr = ID3D11Device_CreateBuffer(device, &buffer_desc, &resource_data, &buffer); ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); - heap_free(data); + free(data); } else { @@ -28460,7 +28459,7 @@ static void test_depth_bias(void) rasterizer_desc.SlopeScaledDepthBias = 0.0f; rasterizer_desc.DepthClipEnable = TRUE; - depth_values = heap_calloc(swapchain_desc.height, sizeof(*depth_values)); + depth_values = calloc(swapchain_desc.height, sizeof(*depth_values)); ok(!!depth_values, "Failed to allocate memory.\n"); for (format_idx = 0; format_idx < ARRAY_SIZE(formats); ++format_idx) @@ -28669,7 +28668,7 @@ static void test_depth_bias(void) winetest_pop_context(); } - heap_free(depth_values); + free(depth_values); release_test_context(&test_context); } @@ -30430,7 +30429,7 @@ static void test_generate_mips(void) device = test_context.device; context = test_context.immediate_context; - data = heap_alloc(sizeof(*data) * 32 * 32 * 32); + data = malloc(sizeof(*data) * 32 * 32 * 32); for (z = 0; z < 32; ++z) { @@ -30457,7 +30456,7 @@ static void test_generate_mips(void) } } - zero_data = heap_alloc_zero(sizeof(*zero_data) * 16 * 16 * 16); + zero_data = calloc(16 * 16 * 16, sizeof(*zero_data)); for (i = 0; i < ARRAY_SIZE(resource_types); ++i) { @@ -30659,8 +30658,8 @@ static void test_generate_mips(void) ID3D11Resource_Release(resource); - heap_free(zero_data); - heap_free(data); + free(zero_data); + free(data); release_test_context(&test_context); } @@ -33987,7 +33986,7 @@ static void test_texture_compressed_3d(void) ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); /* Simply test all combinations of r0 and r1. */ - texture_data = heap_alloc(256 * 256 * sizeof(UINT64)); + texture_data = malloc(256 * 256 * sizeof(UINT64)); for (r1 = 0; r1 < 256; ++r1) { for (r0 = 0; r0 < 256; ++r0) @@ -34012,7 +34011,7 @@ static void test_texture_compressed_3d(void) texture_desc.MiscFlags = 0; hr = ID3D11Device_CreateTexture3D(device, &texture_desc, &resource_data, &texture); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - heap_free(texture_data); + free(texture_data); hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)texture, NULL, &srv); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);

1 0