October 2023 - Wine-commits

Paul Gofman : mfplat/sample: Refactor sample_CopyToBuffer().
by Alexandre Julliard 31 Oct '23

31 Oct '23

Module: wine Branch: master Commit: ac4a2c4c75b0891052648e189653b577abfa0440 URL: https://gitlab.winehq.org/wine/wine/-/commit/ac4a2c4c75b0891052648e189653b5… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue May 9 11:14:32 2023 -0600 mfplat/sample: Refactor sample_CopyToBuffer(). --- dlls/mfplat/sample.c | 52 +++++++++++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 23 deletions(-) diff --git a/dlls/mfplat/sample.c b/dlls/mfplat/sample.c index 687ada1a477..3099f903779 100644 --- a/dlls/mfplat/sample.c +++ b/dlls/mfplat/sample.c @@ -810,36 +810,42 @@ static HRESULT WINAPI sample_CopyToBuffer(IMFSample *iface, IMFMediaBuffer *buff dst_ptr = NULL; dst_length = current_length = 0; locked = SUCCEEDED(hr = IMFMediaBuffer_Lock(buffer, &dst_ptr, &dst_length, &current_length)); - if (locked) + if (!locked) + goto done; + + if (dst_length < total_length) { - if (dst_length < total_length) - hr = MF_E_BUFFERTOOSMALL; - else if (dst_ptr) + hr = MF_E_BUFFERTOOSMALL; + goto done; + } + + if (!dst_ptr) + goto done; + + for (i = 0; i < sample->buffer_count && SUCCEEDED(hr); ++i) + { + src_ptr = NULL; + src_max_length = current_length = 0; + + if (FAILED(hr = IMFMediaBuffer_Lock(sample->buffers[i], &src_ptr, &src_max_length, &current_length))) + continue; + + if (src_ptr) { - for (i = 0; i < sample->buffer_count && SUCCEEDED(hr); ++i) + if (current_length > dst_length) + hr = MF_E_BUFFERTOOSMALL; + else if (current_length) { - src_ptr = NULL; - src_max_length = current_length = 0; - if (SUCCEEDED(hr = IMFMediaBuffer_Lock(sample->buffers[i], &src_ptr, &src_max_length, &current_length))) - { - if (src_ptr) - { - if (current_length > dst_length) - hr = MF_E_BUFFERTOOSMALL; - else if (current_length) - { - memcpy(dst_ptr, src_ptr, current_length); - dst_length -= current_length; - dst_current_length += current_length; - dst_ptr += current_length; - } - } - IMFMediaBuffer_Unlock(sample->buffers[i]); - } + memcpy(dst_ptr, src_ptr, current_length); + dst_length -= current_length; + dst_current_length += current_length; + dst_ptr += current_length; } } + IMFMediaBuffer_Unlock(sample->buffers[i]); } +done: IMFMediaBuffer_SetCurrentLength(buffer, dst_current_length); if (locked)

1 0

Paul Gofman : mfplat/sample: Optimize copying to 2d buffer.
by Alexandre Julliard 31 Oct '23

31 Oct '23

Module: wine Branch: master Commit: bf58285a90eb4833fd6013e067353c566b460cd4 URL: https://gitlab.winehq.org/wine/wine/-/commit/bf58285a90eb4833fd6013e067353c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue May 9 12:24:46 2023 -0600 mfplat/sample: Optimize copying to 2d buffer. --- dlls/mfplat/sample.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/sample.c b/dlls/mfplat/sample.c index 3099f903779..a50f81c93d4 100644 --- a/dlls/mfplat/sample.c +++ b/dlls/mfplat/sample.c @@ -796,8 +796,9 @@ static HRESULT WINAPI sample_CopyToBuffer(IMFSample *iface, IMFMediaBuffer *buff struct sample *sample = impl_from_IMFSample(iface); DWORD total_length, dst_length, dst_current_length, src_max_length, current_length; BYTE *src_ptr, *dst_ptr; - BOOL locked; - HRESULT hr; + IMF2DBuffer *buffer2d; + BOOL locked = FALSE; + HRESULT hr = E_FAIL; size_t i; TRACE("%p, %p.\n", iface, buffer); @@ -807,6 +808,25 @@ static HRESULT WINAPI sample_CopyToBuffer(IMFSample *iface, IMFMediaBuffer *buff total_length = sample_get_total_length(sample); dst_current_length = 0; + if (sample->buffer_count == 1 + && SUCCEEDED(IMFMediaBuffer_QueryInterface(buffer, &IID_IMF2DBuffer, (void **)&buffer2d))) + { + if (SUCCEEDED(IMFMediaBuffer_GetCurrentLength(sample->buffers[0], &current_length)) + && SUCCEEDED(IMF2DBuffer_GetContiguousLength(buffer2d, &dst_length)) + && current_length == dst_length + && SUCCEEDED(IMFMediaBuffer_Lock(sample->buffers[0], &src_ptr, &src_max_length, &current_length))) + { + hr = IMF2DBuffer_ContiguousCopyFrom(buffer2d, src_ptr, current_length); + IMFMediaBuffer_Unlock(sample->buffers[0]); + } + IMF2DBuffer_Release(buffer2d); + if (SUCCEEDED(hr)) + { + dst_current_length = current_length; + goto done; + } + } + dst_ptr = NULL; dst_length = current_length = 0; locked = SUCCEEDED(hr = IMFMediaBuffer_Lock(buffer, &dst_ptr, &dst_length, &current_length));

1 0

Nikolay Sivov : shell32: Fix string size condition check (Coverity).
by Alexandre Julliard 31 Oct '23

31 Oct '23

Module: wine Branch: master Commit: eb8cac0f08312b83cf7607925ca0e5996e35499b URL: https://gitlab.winehq.org/wine/wine/-/commit/eb8cac0f08312b83cf7607925ca0e5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 30 17:30:43 2023 +0100 shell32: Fix string size condition check (Coverity). The issue was introduced by 68fd74e7f9bdd2310aebeb59bc86754271cdc063. --- dlls/shell32/shlexec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index e0a768012e6..eb9ca4a06df 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -164,8 +164,8 @@ static BOOL SHELL_ArgifyW(WCHAR* out, int len, const WCHAR* fmt, const WCHAR* lp case 'l': case 'L': if (lpFile) { - if ((size = SearchPathW(NULL, lpFile, L".exe", ARRAY_SIZE(xlpFile), xlpFile, NULL) - && size <= ARRAY_SIZE(xlpFile))) + size = SearchPathW(NULL, lpFile, L".exe", ARRAY_SIZE(xlpFile), xlpFile, NULL); + if (size && size <= ARRAY_SIZE(xlpFile)) cmd = xlpFile; else cmd = lpFile;

1 0

Zebediah Figura : ws2_32/tests: Add a regression test for interaction of sock_reselect() with event select.
by Alexandre Julliard 31 Oct '23

31 Oct '23

Module: wine Branch: master Commit: 99dd3c5cba1debf39bb386790ebee923a50f1b0f URL: https://gitlab.winehq.org/wine/wine/-/commit/99dd3c5cba1debf39bb386790ebee9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Oct 31 12:16:51 2023 -0500 ws2_32/tests: Add a regression test for interaction of sock_reselect() with event select. --- dlls/ws2_32/tests/sock.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 9f6cd487777..5e22496e6ef 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -14002,6 +14002,36 @@ static void test_tcp_sendto_recvfrom(void) closesocket(server); } +/* Regression test for an internal bug affecting wget.exe. */ +static void test_select_after_WSAEventSelect(void) +{ + SOCKET client, server; + HANDLE event; + int ret; + + tcp_socketpair(&client, &server); + event = CreateEventA(NULL, FALSE, FALSE, NULL); + + ret = WSAEventSelect(client, event, FD_READ); + ok(!ret, "got error %u\n", WSAGetLastError()); + + ret = send(server, "data", 4, 0); + ok(ret == 4, "got %d\n", ret); + + ret = WaitForSingleObject(event, 1000); + ok(!ret, "got %d\n", ret); + + /* Poll. This must not trigger any events to be signalled again. */ + check_poll(client, POLLRDNORM | POLLWRNORM); + + ret = WaitForSingleObject(event, 0); + todo_wine ok(ret == WAIT_TIMEOUT, "got %d\n", ret); + + CloseHandle(event); + closesocket(server); + closesocket(client); +} + START_TEST( sock ) { int i; @@ -14061,6 +14091,7 @@ START_TEST( sock ) test_write_watch(); test_events(); + test_select_after_WSAEventSelect(); test_ipv6only(); test_TransmitFile();

1 0

Zebediah Figura : server: Only set sock->event when the event is first noticed.
by Alexandre Julliard 31 Oct '23

31 Oct '23

Module: wine Branch: master Commit: 25f8698fcdb1907010bb34169c0d3ecf46b3bf51 URL: https://gitlab.winehq.org/wine/wine/-/commit/25f8698fcdb1907010bb34169c0d3e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Oct 31 12:22:31 2023 -0500 server: Only set sock->event when the event is first noticed. Do not set it every time another event is polled. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55838 --- dlls/ws2_32/tests/sock.c | 2 +- server/sock.c | 36 ++++++++++++++++++++++-------------- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 5e22496e6ef..f9cc1482c41 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -14025,7 +14025,7 @@ static void test_select_after_WSAEventSelect(void) check_poll(client, POLLRDNORM | POLLWRNORM); ret = WaitForSingleObject(event, 0); - todo_wine ok(ret == WAIT_TIMEOUT, "got %d\n", ret); + ok(ret == WAIT_TIMEOUT, "got %d\n", ret); CloseHandle(event); closesocket(server); diff --git a/server/sock.c b/server/sock.c index 45a4955d603..f774cded733 100644 --- a/server/sock.c +++ b/server/sock.c @@ -787,18 +787,11 @@ static unsigned int afd_poll_flag_to_win32( unsigned int flags ) return ret; } -/* wake anybody waiting on the socket event or send the associated message */ -static void sock_wake_up( struct sock *sock ) +static void post_sock_messages( struct sock *sock ) { unsigned int events = sock->pending_events & sock->mask; int i; - if (sock->event) - { - if (debug_level) fprintf(stderr, "signalling events %x ptr %p\n", events, sock->event ); - if (events) - set_event( sock->event ); - } if (sock->window) { if (debug_level) fprintf(stderr, "signalling events %x win %08x\n", events, sock->window ); @@ -1285,6 +1278,9 @@ static void post_socket_event( struct sock *sock, enum afd_poll_bit event_bit ) { sock->pending_events |= event; sock->reported_events |= event; + + if ((sock->mask & event) && sock->event) + set_event( sock->event ); } } @@ -1329,7 +1325,7 @@ static void sock_dispatch_events( struct sock *sock, enum connection_state prevs break; } - sock_wake_up( sock ); + post_sock_messages( sock ); } static void sock_poll_event( struct fd *fd, int event ) @@ -2858,11 +2854,23 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) sock->nonblocking = 1; sock_reselect( sock ); - /* Explicitly wake the socket up if the mask causes it to become - * signaled. Note that reselecting isn't enough, since we might already - * have had events recorded in sock->reported_events and we don't want - * to select for them again. */ - sock_wake_up( sock ); + + /* Explicitly wake the socket up if the mask matches pending_events. + * + * The logic here is a bit surprising. We always set the event if the + * socket has events that haven't been consumed by + * WSAEnumNetworkEvents() yet, including if WSAEventSelect() is called + * multiple times without consuming the events. + * However, once the events are consumed by WSAEnumNetworkEvents(), we + * don't set the event again (even though e.g. data is still available) + * until a "reset" call (i.e. that clears reported_events). */ + + if (event && (sock->pending_events & mask)) + { + if (debug_level) fprintf( stderr, "signalling pending events %#x due to event select\n", + sock->pending_events & mask ); + set_event( event ); + } return; }

1 0

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

31 Oct '23

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 31 Oct '23

31 Oct '23

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 31 Oct '23

31 Oct '23

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 : d3d11/tests: Use CRT allocation functions.
by Alexandre Julliard 31 Oct '23

31 Oct '23

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

Alex Henrie : d3d8: Use CRT allocation functions.
by Alexandre Julliard 31 Oct '23

31 Oct '23

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