December 2024 - Wine-gitlab

Re: [PATCH v4 0/2] MR6904: ntdll.dll: Update NtQueryDirectoryFile to align with current Windows behaviour
by eric pouech (＠epo) 02 Dec '24

02 Dec '24

eric pouech (@epo) commented about dlls/ntdll/tests/directory.c: > + InitializeObjectAttributes(&attr, &ntdirname, OBJ_CASE_INSENSITIVE, 0, NULL); > + > + /* Open a handle for our test directory */ > + status = pNtOpenFile(&dirh, SYNCHRONIZE | FILE_LIST_DIRECTORY, &attr, &io, FILE_SHARE_READ, > + FILE_SYNCHRONOUS_IO_NONALERT | FILE_OPEN_FOR_BACKUP_INTENT | FILE_DIRECTORY_FILE); > + ok( status == STATUS_SUCCESS, "failed to open dir '%s', ret 0x%lx, error %ld\n", testdir, status, GetLastError() ); > + if (status != STATUS_SUCCESS) > + { > + skip("can't test if we can't open the directory\n"); > + goto done; > + } > + > + /* Verify that updated windows 8 and higher behaviour is supported */ > + if (!winetest_platform_is_wine && !test_NtQueryDirectoryFile_mask(dirh, TRUE, atestfile, TRUE, TRUE)) > + run_updated_tests = FALSE; > + if (!winetest_platform_is_wine && !test_NtQueryDirectoryFile_mask(dirh, TRUE, notatestfile, FALSE, TRUE)) question: do you need both calls to test_NtQueryDirectoryFile_mask to invalidate a platform? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6904#note_89399

1 0

Re: [PATCH v4 0/2] MR6904: ntdll.dll: Update NtQueryDirectoryFile to align with current Windows behaviour
by eric pouech (＠epo) 02 Dec '24

02 Dec '24

eric pouech (@epo) commented about dlls/ntdll/tests/directory.c: > + /* Clean up from prior aborted run, if any, then set up test files */ > + ok( GetTempPathA(MAX_PATH, testdir), "couldn't get temp dir\n" ); > + strcat(testdir, "mask.tmp"); > + tear_down_mask_test(testdir); > + set_up_mask_test(testdir); > + > + pRtlMultiByteToUnicodeN(testdir_w, sizeof(testdir_w), NULL, testdir, strlen(testdir) + 1); > + if (!pRtlDosPathNameToNtPathName_U(testdir_w, &ntdirname, NULL, NULL)) > + { > + ok( 0, "RtlDosPathNametoNtPathName_U failed\n" ); > + goto done; > + } > + InitializeObjectAttributes(&attr, &ntdirname, OBJ_CASE_INSENSITIVE, 0, NULL); > + > + /* Open a handle for our test directory */ > + status = pNtOpenFile(&dirh, SYNCHRONIZE | FILE_LIST_DIRECTORY, &attr, &io, FILE_SHARE_READ, indentation issue (mix of tab & spaces?) -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6904#note_89398

1 0

Re: [PATCH v4 0/2] MR6904: ntdll.dll: Update NtQueryDirectoryFile to align with current Windows behaviour
by eric pouech (＠epo) 02 Dec '24

02 Dec '24

eric pouech (@epo) commented about dlls/ntdll/tests/directory.c: > + IO_STATUS_BLOCK io; > + UINT data_size = sizeof(FILE_DIRECTORY_INFORMATION) + (MAX_PATH * sizeof(wchar_t)); > + BYTE data[8192]; > + FILE_DIRECTORY_INFORMATION *dir_info; > + WCHAR *name; > + ULONG name_len; > + ULONG mask_len = mask.Length / sizeof(WCHAR); > + > + /* Perform the query */ > + status = pNtQueryDirectoryFile( handle, NULL, NULL, NULL, &io, data, data_size, > + FileDirectoryInformation, TRUE, &mask, restart_scan ); > + if (expect_success) > + { > + if (validate_only && status != STATUS_SUCCESS) return FALSE; > + > + ok( status == STATUS_SUCCESS, "could not find file mask: '%s', restart: %d, error %ld\n", tracing GetLastError() is pointless here (you're testing ntdll APIs, while GetLastError() reflects kernel32/kernelbase API results) -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6904#note_89397

1 0

Re: [PATCH v10 0/6] MR6569: winex11: Refactor window state/config tracker to fix race conditions.
by Rémi Bernon 02 Dec '24

02 Dec '24

On Sun Dec 1 21:39:49 2024 +0000, Robbert van der Helm wrote: > Thanks for the detailed write up! I only ran into this commit after > bisecting the changes between Wine 9.21 and 9.22, so I'm almost > certainly missing some context! > The problem I'm facing seems to be that as soon as `SWP_STATECHANGED` is > set and `window_set_wm_state()` gets called, `data->wm_state_serial` > gets stuck on a nonzero value since it's set to the X11 connection's > next sequence number and is then never cleared again. That causes > `window_update_client_config()` to always bail before it does anything, > which in turn causes the `NtUserPostMessage( hwnd, > WM_WINE_WINDOW_STATE_CHANGED, 0, 0 )` called from > `X11DRV_ConfigureNotify()` to not do anything anymore. > This doesn't seem to cause any problems under normal use cases, since > normally once a window is mapped, its coordinates relative to the root > window will never suddenly change (not sure if there's a spicy > interaction with multiple monitors though). But in yabridge I have to > reparent a Wine window to another window, and to make that work I've > always had to send these `ConfigureNotify` events to inform Wine about > the window's actual position on screen. Otherwise it thinks it's located > in the top left corner of the screen, and all mouse events will be at an offset. > I can open a regression bug report on bugs.winehq.org, but since what > yabridge is doing is almost certainly not the ended way to interact with > Wine, I thought I'd check here first. `wm_state_serial` should be cleared when the window state actually changes and the `WM_STATE` PropertyNotify event is received, calling `window_wm_state_notify` which clears it. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6569#note_89396

1 0

[PATCH 0/4] MR6940: ole32: Property storage reading improvements
by Piotr Caban (＠piotr) 02 Dec '24

02 Dec '24

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/6940

2 4

Re: [PATCH v4 0/2] MR6904: ntdll.dll: Update NtQueryDirectoryFile to align with current Windows behaviour
by Eugene McArdle (＠eugenemcardle) 01 Dec '24

01 Dec '24

OK, @epo and @DodoGTA - are there any concerns or comments regarding the updated PR? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6904#note_89391

1 0

[PATCH v3 0/2] MR6904: ntdll.dll: Update NtQueryDirectoryFile to align with current Windows behaviour
by Eugene McArdle (＠eugenemcardle) 01 Dec '24

01 Dec '24

This PR updates the behaviour of `NtQueryDirectoryFile`, bringing it in line with current Windows behaviour. The need for this update was discovered when attempting to build the Unreal Engine with MSVC under Wine. In certain cases conditional include statements do not behave as expected, due to MSVC depending on undocumented behaviour of `NtQueryDirectoryFile`. We ran tests on multiple versions of Windows, and discovered that the behaviour has changed since the original Wine implementation, but the documentation has not. The source code for our test tool, and a set of results can be found [here](https://github.com/TensorWorks/NtQueryDirectoryFile-Test). As of Windows 8, calling `NtQueryDirectoryFile` with a re-used handle, a new mask, and setting the `RestartScan` flag to True, causes the cached results to be erased and a new scan to be performed with the updated mask. Currently, Wine performs as did earlier versions of Windows, where the changed mask is ignored, and the cache is reused. This can cause `NtQueryDirectoryFile` under Wine to falsely report that files exist, when they do not. This PR corrects this behaviour, invalidating the cache when required. Implementing this exposed further undocumented behaviour of `NtQueryDirectoryFile`, where a search for a non-existent file will return either `STATUS_NO_MORE_FILES` or `STATUS_NO_SUCH_FILE`, depending on whether or not the handle had been previously used regardless of the value of `RestartScan`. This was reflected in a `winetest` which allowed for the response to be either `STATUS_SUCCESS` or `STATUS_NO_MORE_FILES`. This test has been updated to only allow current Windows behaviour, and `NtQueryDirectoryFile` will return either `STATUS_NO_MORE_FILES` or `STATUS_NO_SUCH_FILE` as appropriate. This patch also adds unit tests for the new behaviour of `NtQueryDirectoryFile`. These tests pass when running `winetest` under Windows, and under Wine with these changes in place, but they will fail under older versions of Wine. -- v3: ntdll: Test updated NtQueryDirectoryFile behaviour if scan is reset with a new mask https://gitlab.winehq.org/wine/wine/-/merge_requests/6904

3 4

[PATCH v11 0/1] MR6884: Iphlpapi.dll: Included SendARP
by Thi Garlet (＠garlett) 01 Dec '24

01 Dec '24

Returns MAC address by: - search local interfaces, or - send UDP packed that does not need linux privilege, then search local cache solve https://bugs.winehq.org/show_bug.cgi?id=9418 files updated - /dlls/iphlpapi/iphlpapi_main.c - /dlls/iphlpapi/tests/iphlpapi.c -- v11: iphlpapi.c: Add SendARP https://gitlab.winehq.org/wine/wine/-/merge_requests/6884

3 2

Re: [PATCH v2 0/7] MR6911: ntdll: Add WaitCompletionPacket.
by Jinoh Kang (＠iamahuman) 01 Dec '24

01 Dec '24

Jinoh Kang (@iamahuman) commented about server/protocol.def: > +(a)REPLY > + obj_handle_t handle; /* wait completion packet handle */ > +(a)END > + > + > +/* Associate a wait completion packet */ > +(a)REQ(associate_wait_completion_packet) > + obj_handle_t packet; /* wait completion packet handle */ > + obj_handle_t completion; /* completion handle */ > + obj_handle_t target; /* target object handle */ > + apc_param_t ckey; /* completion key */ > + apc_param_t cvalue; /* completion value */ > + apc_param_t information; /* IO_STATUS_BLOCK information */ > + unsigned int status; /* completion status */ > +(a)REPLY > + int signaled; /* whether the object is already signaled */ I'd use "completed" instead of "signaled." I find signaled ambiguous, since: 1. The object's signaled status depends on the thread, and 2. The role of wait completion packet is to *complete* the wait, not signaling. Ditto for other places like `remove_signaled`. `cancel_completed` would work for me. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6911#note_89386

1 0

Re: [PATCH v2 0/7] MR6911: ntdll: Add WaitCompletionPacket.
by Jinoh Kang (＠iamahuman) 01 Dec '24

01 Dec '24

On Sun Dec 1 21:51:09 2024 +0000, Jinoh Kang wrote: > This looks wrong. Unless I've mistaken, this should be the thread that > *initiated* the wait (like, the one that created or associated the wait > completion packet), not `current`. I'd advise you to test WaitCompletionPacket againat waitable objects that use `get_wait_queue_thread()`, including keyed events, mutexes, and message queue objects (not exposed via Win32 API, only at win32k level). -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6911#note_89385

1 0