June 2024 - Wine-commits - list.winehq.org

Brendan McGrath : ntdll: Treat XDG_SESSION_TYPE as special env variable.
by Alexandre Julliard 14 Jun '24

14 Jun '24

Module: wine Branch: master Commit: 05c0a50454f278fef0f142e11d5491890a979893 URL: https://gitlab.winehq.org/wine/wine/-/commit/05c0a50454f278fef0f142e11d5491… Author: Brendan McGrath <bmcgrath(a)codeweavers.com> Date: Thu Jun 13 07:37:01 2024 +1000 ntdll: Treat XDG_SESSION_TYPE as special env variable. This can be used to incorrectly determine the availability of X graphics. --- dlls/ntdll/unix/env.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index b15db0ec23c..36949b905fb 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -341,7 +341,8 @@ static BOOL is_special_env_var( const char *var ) STARTS_WITH( var, "TEMP=" ) || STARTS_WITH( var, "TMP=" ) || STARTS_WITH( var, "QT_" ) || - STARTS_WITH( var, "VK_" )); + STARTS_WITH( var, "VK_" ) || + STARTS_WITH( var, "XDG_SESSION_TYPE=" )); } /* check if an environment variable changes dynamically in every new process */

1 0

Elizabeth Figura : ntdll: Move IOCTL_SERIAL_WAIT_ON_MASK to the server.
by Alexandre Julliard 14 Jun '24

14 Jun '24

Module: wine Branch: master Commit: 35de72453c4e60876c8ff79280982efd50aeb681 URL: https://gitlab.winehq.org/wine/wine/-/commit/35de72453c4e60876c8ff79280982e… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Tue May 28 18:12:14 2024 -0500 ntdll: Move IOCTL_SERIAL_WAIT_ON_MASK to the server. Tested with a serial pair with a null modem. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55947 --- dlls/ntdll/unix/serial.c | 225 +++++++++++++++++++++-------------------------- server/serial.c | 49 +++++++++++ 2 files changed, 149 insertions(+), 125 deletions(-)

1 0

Eric Pouech : conhost: Handle WM_CHAR for window console.
by Alexandre Julliard 14 Jun '24

14 Jun '24

Module: wine Branch: master Commit: b85c6f5bbb82492fb686a66766b64f073d050be2 URL: https://gitlab.winehq.org/wine/wine/-/commit/b85c6f5bbb82492fb686a66766b64f… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Thu Jun 13 10:06:35 2024 +0200 conhost: Handle WM_CHAR for window console. This lets some characters (like diacritics, generated by two keys, (eg. circumflex-e on a French keyboard layout)) have usable key-down INPUT_RECORD. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/conhost/window.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index a5dd9979534..9817c5fdac9 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -1237,6 +1237,25 @@ static void record_key_input( struct console *console, BOOL down, WPARAM wparam, write_console_input( console, &ir, 1, TRUE ); } +/* generate input_record from WM_CHAR message. */ +static void record_char_input( struct console *console, WCHAR ch, LPARAM lparam ) +{ + INPUT_RECORD ir; + SHORT sh = VkKeyScanW( ch ); + + if (sh == ~0) return; + ir.EventType = KEY_EVENT; + ir.Event.KeyEvent.bKeyDown = TRUE; + ir.Event.KeyEvent.wRepeatCount = 0; + ir.Event.KeyEvent.wVirtualKeyCode = LOBYTE(sh); + ir.Event.KeyEvent.wVirtualScanCode = MapVirtualKeyW( LOBYTE(sh), 0 ); + ir.Event.KeyEvent.uChar.UnicodeChar = ch; + ir.Event.KeyEvent.dwControlKeyState = 0; + if (lparam & (1u << 24)) ir.Event.KeyEvent.dwControlKeyState |= ENHANCED_KEY; + + write_console_input( console, &ir, 1, TRUE ); +} + static void record_mouse_input( struct console *console, COORD c, WPARAM wparam, DWORD event ) { BYTE key_state[256]; @@ -2124,6 +2143,13 @@ static LRESULT WINAPI window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lp record_key_input( console, msg == WM_SYSKEYDOWN, wparam, lparam ); break; + case WM_CHAR: + if (console->window && console->window->in_selection) + handle_selection_key( console, TRUE, LOBYTE( VkKeyScanW( (WCHAR)wparam ) ), lparam ); + else + record_char_input( console, (WCHAR)wparam, lparam ); + break; + case WM_LBUTTONDOWN: if (console->window && (console->window->quick_edit || console->window->in_selection)) {

1 0

Eric Pouech : conhost: Support IME input in window mode.
by Alexandre Julliard 14 Jun '24

14 Jun '24

Module: wine Branch: master Commit: 80342a0c10c73342e52b3b6ff4998c8e72281211 URL: https://gitlab.winehq.org/wine/wine/-/commit/80342a0c10c73342e52b3b6ff4998c… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Thu May 23 12:42:40 2024 +0200 conhost: Support IME input in window mode. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/conhost/conhost.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 4272e8b12f5..7610cb69c72 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -2841,6 +2841,12 @@ static NTSTATUS process_console_ioctls( struct console *console ) } } +static BOOL is_key_message( const MSG *msg ) +{ + return msg->message == WM_KEYDOWN || msg->message == WM_SYSKEYDOWN || + msg->message == WM_KEYUP || msg->message == WM_SYSKEYUP; +} + static int main_loop( struct console *console, HANDLE signal ) { HANDLE signal_event = NULL; @@ -2875,10 +2881,15 @@ static int main_loop( struct console *console, HANDLE signal ) if (res == WAIT_OBJECT_0 + wait_cnt) { MSG msg; + while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) { + BOOL translated = FALSE; if (msg.message == WM_QUIT) return 0; - DispatchMessageW(&msg); + if (is_key_message( &msg ) && msg.wParam == VK_PROCESSKEY) + translated = TranslateMessage( &msg ); + if (!translated || msg.hwnd != console->win) + DispatchMessageW( &msg ); } continue; }

1 0

Alexandre Julliard : Release 9.11.
by Alexandre Julliard 14 Jun '24

14 Jun '24

Module: wine Branch: master Commit: 63e25f9edaf319529e87b380d01bff5cafa17f06 URL: https://gitlab.winehq.org/wine/wine/-/commit/63e25f9edaf319529e87b380d01bff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 14 23:30:18 2024 +0200 Release 9.11. --- ANNOUNCE.md | 674 ++++++++++++++++++++++++++++++------------------------------ AUTHORS | 5 + VERSION | 2 +- configure | 18 +- 4 files changed, 357 insertions(+), 342 deletions(-)

1 0

Tag wine-9.11 : Alexandre Julliard : Release 9.11
by Alexandre Julliard 14 Jun '24

14 Jun '24

Module: wine Branch: refs/tags/wine-9.11 Tag: 49c7765b5e2b06d1dcd4d14e6c487b41876653e3 URL: https://gitlab.winehq.org/wine/wine/-/tags/49c7765b5e2b06d1dcd4d14e6c487b41… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 14 23:30:18 2024 +0200 Release 9.11

1 0

Fabian Maurer : mmdevapi: Implement IAudioSessionControl2 GetIconPath / SetIconPath.
by Alexandre Julliard 14 Jun '24

14 Jun '24

Module: wine Branch: master Commit: 0d4d778b5647c7700dd2aed9d0f5f9289319fd5f URL: https://gitlab.winehq.org/wine/wine/-/commit/0d4d778b5647c7700dd2aed9d0f5f9… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Jun 4 01:36:21 2024 +0200 mmdevapi: Implement IAudioSessionControl2 GetIconPath / SetIconPath. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56763 --- dlls/mmdevapi/mmdevdrv.h | 1 + dlls/mmdevapi/session.c | 28 +++++++++++++++++++++++----- dlls/mmdevapi/tests/render.c | 7 ------- 3 files changed, 24 insertions(+), 12 deletions(-) diff --git a/dlls/mmdevapi/mmdevdrv.h b/dlls/mmdevapi/mmdevdrv.h index 115c5e32fcc..d4060fa304f 100644 --- a/dlls/mmdevapi/mmdevdrv.h +++ b/dlls/mmdevapi/mmdevdrv.h @@ -31,6 +31,7 @@ typedef struct audio_session { BOOL mute; WCHAR *display_name; + WCHAR *icon_path; struct list entry; } AudioSession; diff --git a/dlls/mmdevapi/session.c b/dlls/mmdevapi/session.c index d4948e3b141..3620205ca20 100644 --- a/dlls/mmdevapi/session.c +++ b/dlls/mmdevapi/session.c @@ -186,16 +186,34 @@ static HRESULT WINAPI control_SetDisplayName(IAudioSessionControl2 *iface, const static HRESULT WINAPI control_GetIconPath(IAudioSessionControl2 *iface, WCHAR **path) { struct audio_session_wrapper *This = impl_from_IAudioSessionControl2(iface); - FIXME("(%p)->(%p) - stub\n", This, path); - return E_NOTIMPL; + struct audio_session *session = This->session; + + TRACE("(%p)->(%p) - stub\n", This, path); + + if (!path) + return E_POINTER; + + *path = duplicate_wstr(session->icon_path); + + return S_OK; } static HRESULT WINAPI control_SetIconPath(IAudioSessionControl2 *iface, const WCHAR *path, - const GUID *session) + const GUID *event_context) { struct audio_session_wrapper *This = impl_from_IAudioSessionControl2(iface); - FIXME("(%p)->(%s, %s) - stub\n", This, debugstr_w(path), debugstr_guid(session)); - return E_NOTIMPL; + struct audio_session *session = This->session; + + TRACE("(%p)->(%s, %s) - stub\n", This, debugstr_w(path), debugstr_guid(event_context)); + FIXME("Ignoring event_context\n"); + + if (!path) + return HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER); + + free(session->icon_path); + session->icon_path = wcsdup(path); + + return S_OK; } static HRESULT WINAPI control_GetGroupingParam(IAudioSessionControl2 *iface, GUID *group) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 6d76bff8b22..64bb2799705 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -1605,31 +1605,24 @@ static void test_session(void) /* Test GetIconPath / SetIconPath */ hr = IAudioSessionControl2_GetIconPath(ses1_ctl2, NULL); - todo_wine ok(hr == E_POINTER, "GetIconPath failed: %08lx\n", hr); str = NULL; hr = IAudioSessionControl2_GetIconPath(ses1_ctl2, &str); - todo_wine ok(hr == S_OK, "GetIconPath failed: %08lx\n", hr); - todo_wine ok(str && !wcscmp(str, L""), "Got %s\n", wine_dbgstr_w(str)); if(str) CoTaskMemFree(str); hr = IAudioSessionControl2_SetIconPath(ses1_ctl2, NULL, NULL); - todo_wine ok(hr == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER), "SetIconPath failed: %08lx\n", hr); hr = IAudioSessionControl2_SetIconPath(ses1_ctl2, L"WineIconPath", NULL); - todo_wine ok(hr == S_OK, "SetIconPath failed: %08lx\n", hr); str = NULL; hr = IAudioSessionControl2_GetIconPath(ses1_ctl2, &str); - todo_wine ok(hr == S_OK, "GetIconPath failed: %08lx\n", hr); - todo_wine ok(str && !wcscmp(str, L"WineIconPath"), "Got %s\n", wine_dbgstr_w(str)); if (str) CoTaskMemFree(str);

1 0

Fabian Maurer : mmdevapi: Implement IAudioSessionControl2 GetGroupingParam SetGroupingParam.
by Alexandre Julliard 14 Jun '24

14 Jun '24

Module: wine Branch: master Commit: 75babad433a8df4c8401d9de7ec386780f2f0472 URL: https://gitlab.winehq.org/wine/wine/-/commit/75babad433a8df4c8401d9de7ec386… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Jun 4 01:40:47 2024 +0200 mmdevapi: Implement IAudioSessionControl2 GetGroupingParam SetGroupingParam. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56763 --- dlls/mmdevapi/mmdevdrv.h | 1 + dlls/mmdevapi/session.c | 29 ++++++++++++++++++++++++----- dlls/mmdevapi/tests/render.c | 7 ------- 3 files changed, 25 insertions(+), 12 deletions(-) diff --git a/dlls/mmdevapi/mmdevdrv.h b/dlls/mmdevapi/mmdevdrv.h index d4060fa304f..42b01443ff0 100644 --- a/dlls/mmdevapi/mmdevdrv.h +++ b/dlls/mmdevapi/mmdevdrv.h @@ -32,6 +32,7 @@ typedef struct audio_session { WCHAR *display_name; WCHAR *icon_path; + GUID grouping_param; struct list entry; } AudioSession; diff --git a/dlls/mmdevapi/session.c b/dlls/mmdevapi/session.c index 3620205ca20..d22619b03a1 100644 --- a/dlls/mmdevapi/session.c +++ b/dlls/mmdevapi/session.c @@ -219,16 +219,33 @@ static HRESULT WINAPI control_SetIconPath(IAudioSessionControl2 *iface, const WC static HRESULT WINAPI control_GetGroupingParam(IAudioSessionControl2 *iface, GUID *group) { struct audio_session_wrapper *This = impl_from_IAudioSessionControl2(iface); - FIXME("(%p)->(%p) - stub\n", This, group); - return E_NOTIMPL; + struct audio_session *session = This->session; + + TRACE("(%p)->(%p) - stub\n", This, group); + + if (!group) + return HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER); + + *group = session->grouping_param; + + return S_OK; } static HRESULT WINAPI control_SetGroupingParam(IAudioSessionControl2 *iface, const GUID *group, - const GUID *session) + const GUID *event_context) { struct audio_session_wrapper *This = impl_from_IAudioSessionControl2(iface); - FIXME("(%p)->(%s, %s) - stub\n", This, debugstr_guid(group), debugstr_guid(session)); - return E_NOTIMPL; + struct audio_session *session = This->session; + + TRACE("(%p)->(%s, %s) - stub\n", This, debugstr_guid(group), debugstr_guid(event_context)); + FIXME("Ignoring event_context\n"); + + if (!group) + return HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER); + + session->grouping_param = *group; + + return S_OK; } static HRESULT WINAPI control_RegisterAudioSessionNotification(IAudioSessionControl2 *iface, @@ -631,6 +648,8 @@ static struct audio_session *session_create(const GUID *guid, IMMDevice *device, ret->master_vol = 1.f; + CoCreateGuid(&ret->grouping_param); + return ret; } diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 64bb2799705..b8ef4b5a549 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -1630,30 +1630,23 @@ static void test_session(void) /* Test GetGroupingParam / SetGroupingParam */ hr = IAudioSessionControl2_GetGroupingParam(ses1_ctl2, NULL); - todo_wine ok(hr == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER), "GetGroupingParam failed: %08lx\n", hr); hr = IAudioSessionControl2_GetGroupingParam(ses1_ctl2, &guid1); - todo_wine ok(hr == S_OK, "GetGroupingParam failed: %08lx\n", hr); - todo_wine ok(!IsEqualGUID(&guid1, &guid2), "Expected non null GUID\n"); /* MSDN is wrong here, it is not GUID_NULL */ hr = IAudioSessionControl2_SetGroupingParam(ses1_ctl2, NULL, NULL); - todo_wine ok(hr == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER), "SetGroupingParam failed: %08lx\n", hr); hr = CoCreateGuid(&guid2); ok(hr == S_OK, "CoCreateGuid failed: %08lx\n", hr); hr = IAudioSessionControl2_SetGroupingParam(ses1_ctl2, &guid2, NULL); - todo_wine ok(hr == S_OK, "SetGroupingParam failed: %08lx\n", hr); hr = IAudioSessionControl2_GetGroupingParam(ses1_ctl2, &guid1); - todo_wine ok(hr == S_OK, "GetGroupingParam failed: %08lx\n", hr); - todo_wine ok(IsEqualGUID(&guid1, &guid2), "Got %s\n", wine_dbgstr_guid(&guid1)); /* Test capture */

1 0

Fabian Maurer : mmdevapi/tests: Add tests for IAudioSessionControl2 GetDisplayName / SetDisplayName.
by Alexandre Julliard 14 Jun '24

14 Jun '24

Module: wine Branch: master Commit: 805d0c58d9487a389eebd754538c8722a7d953fb URL: https://gitlab.winehq.org/wine/wine/-/commit/805d0c58d9487a389eebd754538c87… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Jun 1 22:21:20 2024 +0200 mmdevapi/tests: Add tests for IAudioSessionControl2 GetDisplayName / SetDisplayName. --- dlls/mmdevapi/tests/render.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index a7da68ec3f1..4ec2b5e3f04 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -1453,6 +1453,7 @@ static void test_session(void) WAVEFORMATEX *pwfx; ULONG ref; HRESULT hr; + WCHAR *str; hr = CoCreateGuid(&ses1_guid); ok(hr == S_OK, "CoCreateGuid failed: %08lx\n", hr); @@ -1575,6 +1576,40 @@ static void test_session(void) ok(hr == S_OK, "GetState failed: %08lx\n", hr); ok(state == AudioSessionStateInactive, "Got wrong state: %d\n", state); + /* Test GetDisplayName / SetDisplayName */ + + hr = IAudioSessionControl2_GetDisplayName(ses1_ctl2, NULL); + todo_wine + ok(hr == E_POINTER, "GetDisplayName failed: %08lx\n", hr); + + str = NULL; + hr = IAudioSessionControl2_GetDisplayName(ses1_ctl2, &str); + todo_wine + ok(hr == S_OK, "GetDisplayName failed: %08lx\n", hr); + todo_wine + ok(str && !wcscmp(str, L""), "Got %s\n", wine_dbgstr_w(str)); + if (str) + CoTaskMemFree(str); + + hr = IAudioSessionControl2_SetDisplayName(ses1_ctl2, NULL, NULL); + todo_wine + ok(hr == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER), "SetDisplayName failed: %08lx\n", hr); + + hr = IAudioSessionControl2_SetDisplayName(ses1_ctl2, L"WineDisplayName", NULL); + todo_wine + ok(hr == S_OK, "SetDisplayName failed: %08lx\n", hr); + + str = NULL; + hr = IAudioSessionControl2_GetDisplayName(ses1_ctl2, &str); + todo_wine + ok(hr == S_OK, "GetDisplayName failed: %08lx\n", hr); + todo_wine + ok(str && !wcscmp(str, L"WineDisplayName"), "Got %s\n", wine_dbgstr_w(str)); + if (str) + CoTaskMemFree(str); + + /* Test capture */ + if(cap_ctl){ hr = IAudioSessionControl2_GetState(cap_ctl, &state); ok(hr == S_OK, "GetState failed: %08lx\n", hr);

1 0

Fabian Maurer : mmdevapi/tests: Add tests for IAudioSessionControl2 GetIconPath / SetIconPath.
by Alexandre Julliard 14 Jun '24

14 Jun '24

Module: wine Branch: master Commit: 8e7092390a0f1bd2606717a0ebffdda9397acb68 URL: https://gitlab.winehq.org/wine/wine/-/commit/8e7092390a0f1bd2606717a0ebffdd… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Jun 4 01:03:17 2024 +0200 mmdevapi/tests: Add tests for IAudioSessionControl2 GetIconPath / SetIconPath. --- dlls/mmdevapi/tests/render.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 4ec2b5e3f04..77028e9ef77 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -1608,6 +1608,38 @@ static void test_session(void) if (str) CoTaskMemFree(str); + /* Test GetIconPath / SetIconPath */ + + hr = IAudioSessionControl2_GetIconPath(ses1_ctl2, NULL); + todo_wine + ok(hr == E_POINTER, "GetIconPath failed: %08lx\n", hr); + + str = NULL; + hr = IAudioSessionControl2_GetIconPath(ses1_ctl2, &str); + todo_wine + ok(hr == S_OK, "GetIconPath failed: %08lx\n", hr); + todo_wine + ok(str && !wcscmp(str, L""), "Got %s\n", wine_dbgstr_w(str)); + if(str) + CoTaskMemFree(str); + + hr = IAudioSessionControl2_SetIconPath(ses1_ctl2, NULL, NULL); + todo_wine + ok(hr == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER), "SetIconPath failed: %08lx\n", hr); + + hr = IAudioSessionControl2_SetIconPath(ses1_ctl2, L"WineIconPath", NULL); + todo_wine + ok(hr == S_OK, "SetIconPath failed: %08lx\n", hr); + + str = NULL; + hr = IAudioSessionControl2_GetIconPath(ses1_ctl2, &str); + todo_wine + ok(hr == S_OK, "GetIconPath failed: %08lx\n", hr); + todo_wine + ok(str && !wcscmp(str, L"WineIconPath"), "Got %s\n", wine_dbgstr_w(str)); + if (str) + CoTaskMemFree(str); + /* Test capture */ if(cap_ctl){

1 0