September 2023 - Wine-Commits

Rémi Bernon : dmime: Set the port direct sound before activating it.
by Alexandre Julliard Sept. 28, 2023

Sept. 28, 2023

Module: wine Branch: master Commit: 50b09dcf11b2939a5702104b6726d10ad44df43b URL: https://gitlab.winehq.org/wine/wine/-/commit/50b09dcf11b2939a5702104b6726d1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 25 19:10:17 2023 +0200 dmime: Set the port direct sound before activating it. --- dlls/dmime/performance.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index d8624427423..e2d070b0fbe 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -651,10 +651,14 @@ static HRESULT perf_dmport_create(struct performance *perf, DMUS_PORTPARAMS *par if (FAILED(hr = IDirectMusic8_CreatePort(perf->dmusic, &guid, params, &port, NULL))) return hr; - if (FAILED(hr = IDirectMusicPort_Activate(port, TRUE))) { + + if (FAILED(hr = IDirectMusicPort_SetDirectSound(port, perf->dsound, NULL)) + || FAILED(hr = IDirectMusicPort_Activate(port, TRUE))) + { IDirectMusicPort_Release(port); return hr; } + for (i = 0; i < params->dwChannelGroups; i++) pchannel_block_set(&perf->pchannels, i, port, i + 1, FALSE);

1 0

Rémi Bernon : dmime/tests: Remove some duplicated tests.
by Alexandre Julliard Sept. 28, 2023

Sept. 28, 2023

Module: wine Branch: master Commit: ed2eebf2f5b9390f5edad605860a61851ba15623 URL: https://gitlab.winehq.org/wine/wine/-/commit/ed2eebf2f5b9390f5edad605860a61… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 28 08:20:46 2023 +0200 dmime/tests: Remove some duplicated tests. These are now more extensively tested in dmime/tests/dmime.c. --- dlls/dmime/tests/performance.c | 147 ----------------------------------------- 1 file changed, 147 deletions(-) diff --git a/dlls/dmime/tests/performance.c b/dlls/dmime/tests/performance.c index 5cb91a78387..6a8efcdf28a 100644 --- a/dlls/dmime/tests/performance.c +++ b/dlls/dmime/tests/performance.c @@ -489,151 +489,6 @@ static void test_COM(void) ok (refcount == 0, "refcount == %lu, expected 0\n", refcount); } -static void test_notification_type(void) -{ - static unsigned char rifffile[8+4+8+16+8+256] = "RIFF\x24\x01\x00\x00WAVE" /* header: 4 ("WAVE") + (8 + 16) (format segment) + (8 + 256) (data segment) = 0x124 */ - "fmt \x10\x00\x00\x00\x01\x00\x20\x00\xAC\x44\x00\x00\x10\xB1\x02\x00\x04\x00\x10\x00" /* format segment: PCM, 2 chan, 44100 Hz, 16 bits */ - "data\x00\x01\x00\x00"; /* 256 byte data segment (silence) */ - - IDirectMusicPerformance8 *perf; - IDirectMusic *music = NULL; - IDirectMusicSegment8 *prime_segment8; - IDirectMusicSegment8 *segment8 = NULL; - IDirectMusicLoader8 *loader; - IDirectMusicAudioPath8 *path; - IDirectMusicSegmentState *state; - IDirectSound *dsound = NULL; - HRESULT hr; - DWORD result; - HANDLE messages; - DMUS_NOTIFICATION_PMSG *msg; - BOOL found_end = FALSE; - DMUS_OBJECTDESC desc = {0}; - - hr = CoCreateInstance(&CLSID_DirectMusicPerformance, NULL, - CLSCTX_INPROC_SERVER, &IID_IDirectMusicPerformance8, (void**)&perf); - ok(hr == S_OK, "CoCreateInstance failed: %#lx\n", hr); - - hr = IDirectMusicPerformance8_InitAudio(perf, &music, &dsound, NULL, DMUS_APATH_DYNAMIC_STEREO, 64, DMUS_AUDIOF_ALL, NULL); - ok(music != NULL, "Didn't get IDirectMusic pointer\n"); - ok(dsound != NULL, "Didn't get IDirectSound pointer\n"); - - hr = CoCreateInstance(&CLSID_DirectMusicLoader, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicLoader8, (void**)&loader); - ok(hr == S_OK, "CoCreateInstance failed: %#lx\n", hr); - - messages = CreateEventA( NULL, FALSE, FALSE, NULL ); - - hr = IDirectMusicPerformance8_AddNotificationType(perf, &GUID_NOTIFICATION_SEGMENT); - ok(hr == S_OK, "Failed: %#lx\n", hr); - - hr = IDirectMusicPerformance8_SetNotificationHandle(perf, messages, 0); - ok(hr == S_OK, "Failed: %#lx\n", hr); - - hr = IDirectMusicPerformance8_GetDefaultAudioPath(perf, &path); - ok(hr == S_OK, "Failed: %#lx\n", hr); - ok(path != NULL, "Didn't get IDirectMusicAudioPath pointer\n"); - - desc.dwSize = sizeof(DMUS_OBJECTDESC); - desc.dwValidData = DMUS_OBJ_CLASS | DMUS_OBJ_MEMORY; - desc.guidClass = CLSID_DirectMusicSegment; - desc.pbMemData = rifffile; - desc.llMemLength = sizeof(rifffile); - hr = IDirectMusicLoader8_GetObject(loader, &desc, &IID_IDirectMusicSegment8, (void**)&prime_segment8); - ok(hr == S_OK, "Failed: %#lx\n", hr); - ok(prime_segment8 != NULL, "Didn't get IDirectMusicSegment pointer\n"); - - hr = IDirectMusicSegment8_Download(prime_segment8, (IUnknown*)path); - ok(hr == S_OK, "Download failed: %#lx\n", hr); - - hr = IDirectMusicPerformance8_PlaySegmentEx(perf, (IUnknown*)prime_segment8, - NULL, NULL, DMUS_SEGF_SECONDARY, 0, &state, NULL, (IUnknown*)path); - ok(hr == S_OK, "PlaySegmentEx failed: %#lx\n", hr); - ok(state != NULL, "Didn't get IDirectMusicSegmentState pointer\n"); - - while (!found_end) { - result = WaitForSingleObject(messages, 500); - todo_wine ok(result == WAIT_OBJECT_0, "Failed: %ld\n", result); - if (result != WAIT_OBJECT_0) - break; - - msg = NULL; - hr = IDirectMusicPerformance8_GetNotificationPMsg(perf, &msg); - ok(hr == S_OK, "Failed: %#lx\n", hr); - ok(msg != NULL, "Unexpected NULL pointer\n"); - if (FAILED(hr) || !msg) - break; - - trace("Notification: %ld\n", msg->dwNotificationOption); - - if (msg->dwNotificationOption == DMUS_NOTIFICATION_SEGEND || - msg->dwNotificationOption == DMUS_NOTIFICATION_SEGALMOSTEND) { - ok(msg->punkUser != NULL, "Unexpected NULL pointer\n"); - if (msg->punkUser) { - IDirectMusicSegmentState8 *segmentstate; - IDirectMusicSegment *segment; - - hr = IUnknown_QueryInterface(msg->punkUser, &IID_IDirectMusicSegmentState8, (void**)&segmentstate); - ok(hr == S_OK, "Failed: %#lx\n", hr); - - hr = IDirectMusicSegmentState8_GetSegment(segmentstate, &segment); - ok(hr == S_OK, "Failed: %#lx\n", hr); - if (FAILED(hr)) { - IDirectMusicSegmentState8_Release(segmentstate); - break; - } - - hr = IDirectMusicSegment_QueryInterface(segment, &IID_IDirectMusicSegment8, (void**)&segment8); - ok(hr == S_OK, "Failed: %#lx\n", hr); - - found_end = TRUE; - - IDirectMusicSegment_Release(segment); - IDirectMusicSegmentState8_Release(segmentstate); - } - } - - IDirectMusicPerformance8_FreePMsg(perf, (DMUS_PMSG*)msg); - } - todo_wine ok(prime_segment8 == segment8, "Wrong end segment\n"); - todo_wine ok(found_end, "Didn't receive DMUS_NOTIFICATION_SEGEND message\n"); - - CloseHandle(messages); - - if(segment8) - IDirectMusicSegment8_Release(segment8); - IDirectSound_Release(dsound); - IDirectMusicSegmentState_Release(state); - IDirectMusicAudioPath_Release(path); - IDirectMusicLoader8_Release(loader); - IDirectMusic_Release(music); - IDirectMusicPerformance8_Release(perf); -} - -static void test_performance_graph(void) -{ - HRESULT hr; - IDirectMusicPerformance8 *perf; - IDirectMusicGraph *graph = NULL, *graph2; - - create_performance(&perf, NULL, NULL, FALSE); - hr = IDirectMusicPerformance8_Init(perf, NULL, NULL, NULL); - ok(hr == S_OK, "Init failed: %#lx\n", hr); - - hr = IDirectMusicPerformance8_GetGraph(perf, NULL); - ok(hr == E_POINTER, "Failed: %#lx\n", hr); - - hr = IDirectMusicPerformance8_GetGraph(perf, &graph2); - ok(hr == DMUS_E_NOT_FOUND, "Failed: %#lx\n", hr); - ok(graph2 == NULL, "unexpected pointer.\n"); - - hr = IDirectMusicPerformance8_QueryInterface(perf, &IID_IDirectMusicGraph, (void**)&graph); - ok(hr == S_OK, "Failed: %#lx\n", hr); - - if (graph) - IDirectMusicGraph_Release(graph); - destroy_performance(perf, NULL, NULL); -} - START_TEST( performance ) { HRESULT hr; @@ -653,8 +508,6 @@ START_TEST( performance ) test_COM(); test_createport(); test_pchannel(); - test_notification_type(); - test_performance_graph(); CoUninitialize(); }

1 0

Alex Henrie : include: Correct conflicting definition of PSID.
by Alexandre Julliard Sept. 28, 2023

Sept. 28, 2023

Module: wine Branch: master Commit: 0369223f73ce782b2639c421e2903f539a02ef2c URL: https://gitlab.winehq.org/wine/wine/-/commit/0369223f73ce782b2639c421e2903f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Sep 27 19:40:20 2023 -0600 include: Correct conflicting definition of PSID. In the Windows SDK, PSID is void* and PISID is SID*. Both types are defined in both winnt.h and wtypesbase.idl. --- include/wtypes.idl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/wtypes.idl b/include/wtypes.idl index 0db3a397d41..89477880616 100644 --- a/include/wtypes.idl +++ b/include/wtypes.idl @@ -110,7 +110,9 @@ typedef struct _SID { UCHAR SubAuthorityCount; SID_IDENTIFIER_AUTHORITY IdentifierAuthority; [size_is(SubAuthorityCount)] ULONG SubAuthority[*]; -} SID, *PSID; +} SID, *PISID; + +typedef void *PSID; typedef USHORT SECURITY_DESCRIPTOR_CONTROL, *PSECURITY_DESCRIPTOR_CONTROL;

1 0

Alex Henrie : include: Correct conflicting definition of PSECURITY_DESCRIPTOR.
by Alexandre Julliard Sept. 28, 2023

Sept. 28, 2023

Module: wine Branch: master Commit: 25f3ba3e069d38ec2bd5f66980f3780bbf1abe94 URL: https://gitlab.winehq.org/wine/wine/-/commit/25f3ba3e069d38ec2bd5f66980f378… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Sep 27 20:04:42 2023 -0600 include: Correct conflicting definition of PSECURITY_DESCRIPTOR. In the Windows SDK, PSECURITY_DESCRIPTOR is void* and PISECURITY_DESCRIPTOR is SECURITY_DESCRIPTOR*. PSECURITY_DESCRIPTOR is defined in winnt.h and PISECURITY_DESCRIPTOR is defined in wbasetypes.idl. --- include/wtypes.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wtypes.idl b/include/wtypes.idl index 89477880616..d08148dc840 100644 --- a/include/wtypes.idl +++ b/include/wtypes.idl @@ -133,7 +133,7 @@ typedef struct _SECURITY_DESCRIPTOR { PSID Group; PACL Sacl; PACL Dacl; -} SECURITY_DESCRIPTOR, *PSECURITY_DESCRIPTOR; +} SECURITY_DESCRIPTOR, *PISECURITY_DESCRIPTOR; typedef struct _SECURITY_ATTRIBUTES {

1 0

Francois Gouget : tests: Update the documentation.
by Alexandre Julliard Sept. 28, 2023

Sept. 28, 2023

Module: wine Branch: master Commit: 65261f3c80e6cfe96081d3903c7483f99648f9b6 URL: https://gitlab.winehq.org/wine/wine/-/commit/65261f3c80e6cfe96081d3903c7483… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Sep 28 14:40:02 2023 +0200 tests: Update the documentation. --- include/wine/test.h | 70 +++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 65 insertions(+), 5 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index 889923afacc..8f3f3bb0d50 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -148,6 +148,13 @@ extern void winetest_wait_child_process( HANDLE process ); # define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) #endif +/* Records the location of the next check. + * See the xxx_(file, line) macros. + * + * Parameters: + * - file - source file name of the check + * - line - source line number of the check + */ static inline void winetest_set_location( const char *file, int line ) { struct winetest_thread_data *data = winetest_get_thread_data(); @@ -260,12 +267,13 @@ static LONG winetest_add_line( void ) } /* - * Checks condition. + * Checks that a condition has the expected value, that is true except if + * preceded by a todo indicating the check is expected to fail. + * * Parameters: - * - condition - condition to check; - * - msg test description; - * - file - test application source code file name of the check - * - line - test application source code file line number of the check + * - condition - true if the check succeeded, false otherwise; + * - msg - failure message format; + * - args - arguments for the failure message * Return: * 0 if condition does not have the expected value, 1 otherwise */ @@ -400,6 +408,14 @@ static void winetest_vskip( const char *msg, va_list args ) else InterlockedIncrement( &winetest_muted_skipped ); } +/* + * Prints a message to indicate that a group of tests is being skipped + * because the requirements for running them are not met. + * + * Parameters: + * - msg - failure message format; + * - args - arguments for the failure message + */ static void winetest_skip( const char *msg, ... ) __WINE_PRINTF_ATTR(1,2); static inline void winetest_skip( const char *msg, ... ) { @@ -421,6 +437,18 @@ static inline void winetest_win_skip( const char *msg, ... ) va_end(valist); } +/* If is_flaky is true, indicates that the next test may occasionally fail due + * to unavoidable outside race conditions. Such failures will be flagged as + * flaky so they can be ignored by automated testing tools. + * + * Remarks: + * - This is not meant to paper over race conditions within the test itself. + * Those are bugs and should be fixed. + * - This is not meant to be used for tests that normally succeed but + * systematically fail on a specific platform or locale. + * - The failures should be rare to start with. If a test fails 25% of the time + * it is probably wrong. + */ static inline void winetest_start_flaky( int is_flaky ) { struct winetest_thread_data *data = winetest_get_thread_data(); @@ -442,6 +470,13 @@ static inline void winetest_end_flaky(void) data->flaky_level >>= 1; } +/* If is_todo is true, indicates that the next test is expected to fail on this + * platform. This is used to identify tests that are known to fail in Wine. + * + * Remarks: + * - is_todo should never be true on Windows. To ensure this, always use + * todo_wine_if(). + */ static inline void winetest_start_todo( int is_todo ) { struct winetest_thread_data *data = winetest_get_thread_data(); @@ -463,6 +498,31 @@ static inline void winetest_end_todo(void) data->todo_level >>= 1; } +/* Adds a string to be prepended to the test traces and failure messages. + * This must be paired with a winetest_pop_context() call. + * + * Parameters: + * - msg - failure message format; + * - args - arguments for the failure message + * + * Remarks: + * - Failure messages must always make it possible to figure out what was being + * tested. While not ideal the line number can usually be used for that + * purpose except when the test loops on a list of test parameters. In such + * cases either the test parameters or the loop index should be added to the + * context. + * + * Example: + * + * for (i = 0; i < ARRAY_SIZE(test_parameters); i++) + * { + * winetest_push_context("%d", i); + * ... + * ok(WinAPI(test_parameters[i]), ...); + * ... + * winetest_pop_context(); + * } + */ static void winetest_push_context( const char *fmt, ... ) __WINE_PRINTF_ATTR(1, 2); static inline void winetest_push_context( const char *fmt, ... ) {

1 0

Hans Leidekker : secur32: Only return success from initialize_package() when initialization fully succeeds.
by Alexandre Julliard Sept. 28, 2023

Sept. 28, 2023

Module: wine Branch: master Commit: ed71abd1ccfdec44aa487ec6a14fdf4c54f52ad2 URL: https://gitlab.winehq.org/wine/wine/-/commit/ed71abd1ccfdec44aa487ec6a14fdf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 28 12:07:09 2023 +0200 secur32: Only return success from initialize_package() when initialization fully succeeds. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55522 --- dlls/secur32/lsa.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 3b124c4da1f..7af9c285d86 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -907,10 +907,12 @@ static BOOL initialize_package(struct lsa_package *package, { status = pSpUserModeInitialize(SECPKG_INTERFACE_VERSION, &package->user_api_version, &package->user_api, &package->user_table_count); if (status == STATUS_SUCCESS) + { package->user_api->InstanceInit(SECPKG_INTERFACE_VERSION, &lsa_dll_dispatch, NULL); + return TRUE; + } } } - return TRUE; } return FALSE;

1 0

Martin Storsjö : include: Update the d3d12 header from vkd3d.
by Alexandre Julliard Sept. 28, 2023

Sept. 28, 2023

Module: wine Branch: master Commit: 65a6019df99952a2f4dad622c9989a23188f49f3 URL: https://gitlab.winehq.org/wine/wine/-/commit/65a6019df99952a2f4dad622c9989a… Author: Martin Storsjö <martin(a)martin.st> Date: Thu Sep 28 12:15:06 2023 +0300 include: Update the d3d12 header from vkd3d. This corresponds to vkd3d as of commit acd3ed97dc8e1ac192b2ec6fc19596831a6b61c6. The cpp_quoted #include directive is fixed up to match the file naming outside of vkd3d, renaming the reference to vkd3d_d3d12sdklayers.h back to d3d12sdklayers.h. This matches other renamings that are done at the start of the file for vkd3d renamed idl files as well. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- include/d3d12.idl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/d3d12.idl b/include/d3d12.idl index 9744b9c9cb5..593a40a02a7 100644 --- a/include/d3d12.idl +++ b/include/d3d12.idl @@ -5082,6 +5082,10 @@ interface ID3D12GraphicsCommandList7 : ID3D12GraphicsCommandList6 const D3D12_BARRIER_GROUP *barrier_groups); }; +cpp_quote("#ifndef D3D12_IGNORE_SDK_LAYERS") +cpp_quote("#include \"d3d12sdklayers.h\"") +cpp_quote("#endif") + typedef HRESULT (__stdcall *PFN_D3D12_CREATE_ROOT_SIGNATURE_DESERIALIZER)( const void *data, SIZE_T data_size, REFIID iid, void **deserializer);

1 0

Alexandre Julliard : ntdll: Release the low address space reservation for 64-bit apps.
by Alexandre Julliard Sept. 28, 2023

Sept. 28, 2023

Module: wine Branch: master Commit: a81c53504ae32715e6e91bd020fdebd5bef20d48 URL: https://gitlab.winehq.org/wine/wine/-/commit/a81c53504ae32715e6e91bd020fdeb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 28 16:30:32 2023 +0200 ntdll: Release the low address space reservation for 64-bit apps. --- dlls/ntdll/unix/env.c | 2 +- dlls/ntdll/unix/server.c | 2 -- dlls/ntdll/unix/virtual.c | 11 ++++++++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index f42c6a8f59f..feae7d4b954 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1865,7 +1865,6 @@ static void init_peb( RTL_USER_PROCESS_PARAMETERS *params, void *module ) NtCurrentTeb()->WowTebOffset = teb_offset; NtCurrentTeb()->Tib.ExceptionList = (void *)((char *)NtCurrentTeb() + teb_offset); wow_peb = (PEB32 *)((char *)peb + page_size); - user_space_wow_limit = ((main_image_info.ImageCharacteristics & IMAGE_FILE_LARGE_ADDRESS_AWARE) ? limit_4g : limit_2g) - 1; set_thread_id( NtCurrentTeb(), GetCurrentProcessId(), GetCurrentThreadId() ); ERR( "starting %s in experimental wow64 mode\n", debugstr_us(&params->ImagePathName) ); break; @@ -1876,6 +1875,7 @@ static void init_peb( RTL_USER_PROCESS_PARAMETERS *params, void *module ) } #endif + virtual_set_large_address_space(); load_global_options( &params->ImagePathName ); if (wow_peb) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index e5e234d05ae..24653904308 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -1687,8 +1687,6 @@ void server_init_process_done(void) #ifdef __APPLE__ send_server_task_port(); #endif - if (main_image_info.ImageCharacteristics & IMAGE_FILE_LARGE_ADDRESS_AWARE) - virtual_set_large_address_space(); /* Install signal handlers; this cannot be done earlier, since we cannot * send exceptions to the debugger before the create process event that diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 94e68edab77..67778453666 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -4184,9 +4184,14 @@ static void virtual_release_address_space(void) */ void virtual_set_large_address_space(void) { - /* no large address space on win9x */ - if (peb->OSPlatformId != VER_PLATFORM_WIN32_NT) return; - +#ifdef _WIN64 + if (is_wow64()) + user_space_wow_limit = ((main_image_info.ImageCharacteristics & IMAGE_FILE_LARGE_ADDRESS_AWARE) ? limit_4g : limit_2g) - 1; + else + free_reserved_memory( 0, (char *)0x7ffe0000 ); +#else + if (!(main_image_info.ImageCharacteristics & IMAGE_FILE_LARGE_ADDRESS_AWARE)) return; +#endif user_space_limit = working_set_limit = address_space_limit; }

1 0

Alexandre Julliard : ntdll: Don't release the low address space reservation on wow64.
by Alexandre Julliard Sept. 28, 2023

Sept. 28, 2023

Module: wine Branch: master Commit: 9b60b671da82123590253472318d95547d8d138d URL: https://gitlab.winehq.org/wine/wine/-/commit/9b60b671da82123590253472318d95… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 28 16:59:36 2023 +0200 ntdll: Don't release the low address space reservation on wow64. --- dlls/ntdll/unix/virtual.c | 43 ++++++++++++------------------------------- 1 file changed, 12 insertions(+), 31 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 67778453666..3784cb6c16a 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -4110,12 +4110,6 @@ void virtual_set_force_exec( BOOL enable ) server_leave_uninterrupted_section( &virtual_mutex, &sigset ); } -struct free_range -{ - char *base; - char *limit; -}; - /* free reserved areas within a given range */ static void free_reserved_memory( char *base, char *limit ) { @@ -4142,6 +4136,8 @@ static void free_reserved_memory( char *base, char *limit ) } } +#ifndef _WIN64 + /*********************************************************************** * virtual_release_address_space * @@ -4149,33 +4145,14 @@ static void free_reserved_memory( char *base, char *limit ) */ static void virtual_release_address_space(void) { - char *base = (char *)0x82000000; - char *limit = get_wow_user_space_limit(); - -#if defined(__APPLE__) && !defined(__i386__) - /* On 64-bit macOS, don't release any address space. - * It needs to be reserved for use by Wow64 - */ - return; -#endif - - if (limit > (char *)0xfffff000) return; /* 64-bit limit, nothing to do */ - - if (limit > base) - { - free_reserved_memory( base, limit ); -#ifdef __APPLE__ - /* On macOS, we still want to free some of low memory, for OpenGL resources */ - base = (char *)0x40000000; -#else - return; +#ifndef __APPLE__ /* On macOS, we still want to free some of low memory, for OpenGL resources */ + if (user_space_limit > (void *)limit_2g) return; #endif - } - else base = (char *)0x20000000; - - free_reserved_memory( base, (char *)0x7f000000 ); + free_reserved_memory( (char *)0x20000000, (char *)0x7f000000 ); } +#endif /* _WIN64 */ + /*********************************************************************** * virtual_set_large_address_space @@ -4191,6 +4168,7 @@ void virtual_set_large_address_space(void) free_reserved_memory( 0, (char *)0x7ffe0000 ); #else if (!(main_image_info.ImageCharacteristics & IMAGE_FILE_LARGE_ADDRESS_AWARE)) return; + free_reserved_memory( (char *)0x80000000, address_space_limit ); #endif user_space_limit = working_set_limit = address_space_limit; } @@ -4564,9 +4542,12 @@ NTSTATUS WINAPI NtFreeVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T *si /* avoid freeing the DOS area when a broken app passes a NULL pointer */ if (!base) { +#ifndef _WIN64 /* address 1 is magic to mean release reserved space */ if (addr == (void *)1 && !size && type == MEM_RELEASE) virtual_release_address_space(); - else status = STATUS_INVALID_PARAMETER; + else +#endif + status = STATUS_INVALID_PARAMETER; } else if (!(view = find_view( base, 0 ))) status = STATUS_MEMORY_NOT_ALLOCATED; else if (!is_view_valloc( view )) status = STATUS_INVALID_PARAMETER;

1 0

Henri Verbeet : tests: Add some missing vkd3d_test_pop_context() calls to test_shader_instructions().
by Alexandre Julliard Sept. 28, 2023

Sept. 28, 2023

Module: vkd3d Branch: master Commit: 5503a025d94d728e5d01db5516a678e51f4c27fa URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5503a025d94d728e5d01db5516a67… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 27 21:36:24 2023 +0200 tests: Add some missing vkd3d_test_pop_context() calls to test_shader_instructions(). --- tests/d3d12.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 6ffcd92e..86e8a8b1 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -10483,12 +10483,14 @@ static void test_shader_instructions(void) if (uint_tests[i].skip_on_warp && test_options.use_warp_device) { skip("Skipping shader '%s' test on WARP.\n", uint_tests[i].ps->name); + vkd3d_test_pop_context(); continue; } if (uint_tests[i].is_float64 && !test_shader_float64) { skip("Skipping shader '%s' float64 test.\n", uint_tests[i].ps->name); + vkd3d_test_pop_context(); continue; }

1 0