- Wine-Commits - list.winehq.org

Rémi Bernon : win32u: Pass the DPI awareness context in win_proc_params.
by Alexandre Julliard May 28, 2024

May 28, 2024

Module: wine Branch: master Commit: dc05a4499e6c25af22e45e247114ceb464c6b554 URL: https://gitlab.winehq.org/wine/wine/-/commit/dc05a4499e6c25af22e45e247114ce… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 23 15:58:02 2024 +0200 win32u: Pass the DPI awareness context in win_proc_params. --- dlls/user32/winproc.c | 2 +- dlls/win32u/message.c | 4 ++-- dlls/wow64win/user.c | 4 ++-- include/ntuser.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 4525f604beb..5678e75b4e9 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -698,7 +698,7 @@ static LRESULT WINPROC_CallProcWtoA( winproc_callback_t callback, HWND hwnd, UIN LRESULT dispatch_win_proc_params( struct win_proc_params *params ) { - DPI_AWARENESS_CONTEXT context = SetThreadDpiAwarenessContext( params->dpi_awareness ); + DPI_AWARENESS_CONTEXT context = SetThreadDpiAwarenessContext( ULongToHandle( params->dpi_context ) ); LRESULT result = 0; if (!params->ansi) diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index bf393e2b7c9..877be545810 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -379,7 +379,7 @@ static BOOL init_win_proc_params( struct win_proc_params *params, HWND hwnd, UIN params->lparam = lparam; params->ansi = params->ansi_dst = ansi; params->mapping = WMCHAR_MAP_CALLWINDOWPROC; - params->dpi_awareness = ULongToHandle( get_window_dpi_awareness_context( params->hwnd ) ); + params->dpi_context = get_window_dpi_awareness_context( params->hwnd ); get_winproc_params( params, TRUE ); return TRUE; } @@ -410,7 +410,7 @@ static BOOL init_window_call_params( struct win_proc_params *params, HWND hwnd, params->lparam = lParam; params->ansi = ansi; params->mapping = mapping; - params->dpi_awareness = ULongToHandle( get_window_dpi_awareness_context( params->hwnd ) ); + params->dpi_context = get_window_dpi_awareness_context( params->hwnd ); get_winproc_params( params, !is_dialog ); return TRUE; } diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 9a293826ba9..33d4d786714 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -355,7 +355,7 @@ struct win_proc_params32 BOOL ansi; BOOL ansi_dst; enum wm_char_mapping mapping; - ULONG dpi_awareness; + ULONG dpi_context; ULONG procA; ULONG procW; }; @@ -471,7 +471,7 @@ static void win_proc_params_64to32( const struct win_proc_params *src, struct wi params.ansi = src->ansi; params.ansi_dst = src->ansi_dst; params.mapping = src->mapping; - params.dpi_awareness = HandleToUlong( src->dpi_awareness ); + params.dpi_context = src->dpi_context; params.procA = PtrToUlong( src->procA ); params.procW = PtrToUlong( src->procW ); memcpy( dst, &params, sizeof(params) ); diff --git a/include/ntuser.h b/include/ntuser.h index b58413ac4db..88453c46749 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -160,7 +160,7 @@ struct win_proc_params BOOL ansi; BOOL ansi_dst; enum wm_char_mapping mapping; - DPI_AWARENESS_CONTEXT dpi_awareness; + UINT dpi_context; WNDPROC procA; WNDPROC procW; };

1 0

Zhiyi Zhang : comctl32/ipaddress: Delete font when destroying the control.
by Alexandre Julliard May 28, 2024

May 28, 2024

Module: wine Branch: master Commit: 23c5d4c065d5b7cfa14f43d9136650ff4534652d URL: https://gitlab.winehq.org/wine/wine/-/commit/23c5d4c065d5b7cfa14f43d9136650… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 14 12:30:28 2024 +0800 comctl32/ipaddress: Delete font when destroying the control. For bug for bug compatibility, delete the font set by WM_SETFONT when destroying the control even if the font is not owned by the control according to tests. --- dlls/comctl32/ipaddress.c | 7 +++++++ dlls/comctl32/tests/misc.c | 5 ----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c index 493ea77f618..be7e45def97 100644 --- a/dlls/comctl32/ipaddress.c +++ b/dlls/comctl32/ipaddress.c @@ -55,6 +55,7 @@ typedef struct HWND Self; HWND Notify; BOOL Enabled; + HFONT hFont; IPPART_INFO Part[4]; } IPADDRESS_INFO; @@ -269,6 +270,8 @@ static LRESULT IPADDRESS_Destroy (IPADDRESS_INFO *infoPtr) SetWindowLongPtrW (part->EditHwnd, GWLP_WNDPROC, (DWORD_PTR)part->OrigProc); } + if (infoPtr->hFont) + DeleteObject (infoPtr->hFont); SetWindowLongPtrW (infoPtr->Self, 0, 0); theme = GetWindowTheme (infoPtr->Self); CloseThemeData (theme); @@ -651,6 +654,10 @@ IPADDRESS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) IPADDRESS_SetFocusToField (infoPtr, 0); break; + case WM_SETFONT: + infoPtr->hFont = (HFONT)wParam; + return 0; + default: if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg)) ERR("unknown msg %04x, wp %Ix, lp %Ix\n", uMsg, wParam, lParam); diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 0ecf240ae4d..ff6336f31af 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -1239,14 +1239,9 @@ static void test_WM_SETFONT(void) ret = GetObjectA(hfont, sizeof(lf), &lf); if (!lstrcmpA(tests[i].class_name, WC_IPADDRESSA)) - { - todo_wine ok(ret == 0, "GetObjectA succeeded.\n"); - } else - { ok(ret == sizeof(lf), "GetObjectA failed, error %lu.\n", GetLastError()); - } winetest_pop_context(); }

1 0

Zhiyi Zhang : comctl32/tooltips: Don't duplicate font when handling WM_SETFONT.
by Alexandre Julliard May 28, 2024

May 28, 2024

Module: wine Branch: master Commit: c9452db7693970eb182f841f5bcb43cd4e03501a URL: https://gitlab.winehq.org/wine/wine/-/commit/c9452db7693970eb182f841f5bcb43… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 14 12:24:31 2024 +0800 comctl32/tooltips: Don't duplicate font when handling WM_SETFONT. This reverts 06effbf0. --- dlls/comctl32/tests/misc.c | 1 - dlls/comctl32/tooltips.c | 12 +++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index c57f4581a4b..0ecf240ae4d 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -1231,7 +1231,6 @@ static void test_WM_SETFONT(void) if (tests[i].use_system_font) ok(hfont2 == NULL, "Got unexpected font %p.\n", hfont2); else - todo_wine_if(!lstrcmpA(tests[i].class_name, TOOLTIPS_CLASSA)) ok(hfont2 == hfont, "Got unexpected font %p.\n", hfont2); ret = GetObjectA(hfont, sizeof(lf), &lf); ok(ret == sizeof(lf), "GetObjectA failed, error %lu.\n", GetLastError()); diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 95ef8da6794..2353d4018ac 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -131,6 +131,7 @@ typedef struct COLORREF clrBk; COLORREF clrText; HFONT hFont; + HFONT hStatusFont; HFONT hTitleFont; INT xTrackPos; INT yTrackPos; @@ -194,14 +195,16 @@ TOOLTIPS_InitSystemSettings (TOOLTIPS_INFO *infoPtr) infoPtr->clrBk = comctl32_color.clrInfoBk; infoPtr->clrText = comctl32_color.clrInfoText; - DeleteObject (infoPtr->hFont); + DeleteObject (infoPtr->hStatusFont); nclm.cbSize = sizeof(nclm); SystemParametersInfoW (SPI_GETNONCLIENTMETRICS, sizeof(nclm), &nclm, 0); - infoPtr->hFont = CreateFontIndirectW (&nclm.lfStatusFont); + infoPtr->hStatusFont = CreateFontIndirectW (&nclm.lfStatusFont); DeleteObject (infoPtr->hTitleFont); nclm.lfStatusFont.lfWeight = FW_BOLD; infoPtr->hTitleFont = CreateFontIndirectW (&nclm.lfStatusFont); + + infoPtr->hFont = infoPtr->hStatusFont; } /* Custom draw routines */ @@ -1854,7 +1857,7 @@ TOOLTIPS_Destroy (TOOLTIPS_INFO *infoPtr) DeleteObject(infoPtr->hTitleIcon); /* delete fonts */ - DeleteObject (infoPtr->hFont); + DeleteObject (infoPtr->hStatusFont); DeleteObject (infoPtr->hTitleFont); /* free tool tips info data */ @@ -1952,8 +1955,7 @@ TOOLTIPS_SetFont (TOOLTIPS_INFO *infoPtr, HFONT hFont, BOOL redraw) if(!GetObjectW(hFont, sizeof(lf), &lf)) return 0; - DeleteObject (infoPtr->hFont); - infoPtr->hFont = CreateFontIndirectW(&lf); + infoPtr->hFont = hFont; DeleteObject (infoPtr->hTitleFont); lf.lfWeight = FW_BOLD;

1 0

Paul Gofman : mf: Implement audio capture device enumeration in MFEnumDeviceSources().
by Alexandre Julliard May 28, 2024

May 28, 2024

Module: wine Branch: master Commit: b32c69b0866a369e67d3abaae22e6f302cbd24c7 URL: https://gitlab.winehq.org/wine/wine/-/commit/b32c69b0866a369e67d3abaae22e6f… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri May 24 19:08:52 2024 -0600 mf: Implement audio capture device enumeration in MFEnumDeviceSources(). --- dlls/mf/Makefile.in | 1 + dlls/mf/main.c | 23 +++++++-- dlls/mf/mf_private.h | 2 + dlls/mf/sac.c | 131 +++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/mf/tests/mf.c | 10 ++-- 5 files changed, 157 insertions(+), 10 deletions(-) diff --git a/dlls/mf/Makefile.in b/dlls/mf/Makefile.in index 8eb1809be9b..d9f0123767d 100644 --- a/dlls/mf/Makefile.in +++ b/dlls/mf/Makefile.in @@ -13,6 +13,7 @@ SOURCES = \ mf.idl \ mf.rc \ quality.c \ + sac.c \ samplegrabber.c \ sar.c \ scheme_handler.c \ diff --git a/dlls/mf/main.c b/dlls/mf/main.c index 92558a86b30..e74a4ae8e4c 100644 --- a/dlls/mf/main.c +++ b/dlls/mf/main.c @@ -747,16 +747,29 @@ HRESULT WINAPI MFShutdownObject(IUnknown *object) /*********************************************************************** * MFEnumDeviceSources (mf.@) */ -HRESULT WINAPI MFEnumDeviceSources(IMFAttributes *attributes, IMFActivate ***sources, UINT32 *count) +HRESULT WINAPI MFEnumDeviceSources(IMFAttributes *attributes, IMFActivate ***sources, UINT32 *ret_count) { - FIXME("%p, %p, %p.\n", attributes, sources, count); + GUID source_type; + HRESULT hr; + + TRACE("%p, %p, %p.\n", attributes, sources, ret_count); - if (!attributes || !sources || !count) + if (!attributes || !sources || !ret_count) return E_INVALIDARG; - *count = 0; + if (FAILED(hr = IMFAttributes_GetGUID(attributes, &MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE, &source_type))) + return hr; - return S_OK; + if (IsEqualGUID(&source_type, &MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_GUID)) + { + FIXME("Not implemented for video capture devices.\n"); + *ret_count = 0; + return S_OK; + } + if (IsEqualGUID(&source_type, &MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_AUDCAP_GUID)) + return enum_audio_capture_sources(attributes, sources, ret_count); + + return E_INVALIDARG; } struct simple_type_handler diff --git a/dlls/mf/mf_private.h b/dlls/mf/mf_private.h index 401e1f55b49..7d169c0711f 100644 --- a/dlls/mf/mf_private.h +++ b/dlls/mf/mf_private.h @@ -122,3 +122,5 @@ extern HRESULT create_topology(TOPOID id, IMFTopology **topology); extern HRESULT topology_node_get_object(IMFTopologyNode *node, REFIID riid, void **obj); extern HRESULT topology_node_get_type_handler(IMFTopologyNode *node, DWORD stream, BOOL output, IMFMediaTypeHandler **handler); extern HRESULT topology_node_init_media_type(IMFTopologyNode *node, DWORD stream, BOOL output, IMFMediaType **type); + +extern HRESULT enum_audio_capture_sources(IMFAttributes *attributes, IMFActivate ***sources, UINT32 *ret_count); diff --git a/dlls/mf/sac.c b/dlls/mf/sac.c new file mode 100644 index 00000000000..d5c6518a72c --- /dev/null +++ b/dlls/mf/sac.c @@ -0,0 +1,131 @@ +/* + * Copyright 2024 Paul Gofman for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include "mfapi.h" +#include "mfidl.h" +#include "mf_private.h" +#include "mmdeviceapi.h" +#include "audioclient.h" + +#include "initguid.h" +#include "devpkey.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mfplat); + +static HRESULT audio_capture_create_object(IMFAttributes *attributes, void *user_context, IUnknown **obj) +{ + FIXME("%p, %p, %p stub.\n", attributes, user_context, obj); + + return E_NOTIMPL; +} + +static void audio_capture_shutdown_object(void *user_context, IUnknown *obj) +{ + TRACE("%p %p.\n", user_context, obj); +} + +static void audio_capture_free_private(void *user_context) +{ + TRACE("%p.\n", user_context); +} + +static const struct activate_funcs audio_capture_activate_funcs = +{ + audio_capture_create_object, + audio_capture_shutdown_object, + audio_capture_free_private, +}; + +HRESULT enum_audio_capture_sources(IMFAttributes *attributes, IMFActivate ***ret_sources, UINT32 *ret_count) +{ + IMMDeviceEnumerator *devenum = NULL; + IMMDeviceCollection *devices = NULL; + UINT32 i, count, created_count = 0; + IMFActivate **sources = NULL; + ERole role; + HRESULT hr; + + if (FAILED(hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, + (void **)&devenum))) + goto done; + if (SUCCEEDED(IMFAttributes_GetUINT32(attributes, &MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_AUDCAP_ROLE, (UINT32 *)&role))) + FIXME("Specifying role (%d) is not supported.\n", role); + if (FAILED(hr = IMMDeviceEnumerator_EnumAudioEndpoints(devenum, eCapture, DEVICE_STATE_ACTIVE, &devices))) + goto done; + if (FAILED(hr = IMMDeviceCollection_GetCount(devices, &count))) + goto done; + sources = CoTaskMemAlloc(count * sizeof(*sources)); + for (i = 0; i < count; ++i) + { + IMMDevice *device = NULL; + IPropertyStore *ps; + WCHAR *str = NULL; + PROPVARIANT pv; + + if (FAILED(hr = create_activation_object(NULL, &audio_capture_activate_funcs, &sources[i]))) + goto done; + ++created_count; + + hr = IMFActivate_SetGUID(sources[i], &MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE, &MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_AUDCAP_GUID); + if (SUCCEEDED(hr)) + hr = IMMDeviceCollection_Item(devices, i, &device); + if (SUCCEEDED(hr)) + hr = IMMDevice_GetId(device, &str); + if (SUCCEEDED(hr)) + hr = IMFActivate_SetString(sources[i], &MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_AUDCAP_ENDPOINT_ID, str); + CoTaskMemFree(str); + + PropVariantInit(&pv); + if (SUCCEEDED(hr) && SUCCEEDED((hr = IMMDevice_OpenPropertyStore(device, STGM_READ, &ps)))) + { + hr = IPropertyStore_GetValue(ps, (const PROPERTYKEY*)&DEVPKEY_Device_FriendlyName, &pv); + IPropertyStore_Release(ps); + } + if (device) + IMMDevice_Release(device); + + if (SUCCEEDED(hr) && pv.vt != VT_LPWSTR) + hr = E_FAIL; + + if (SUCCEEDED(hr)) + hr = IMFActivate_SetString(sources[i], &MF_DEVSOURCE_ATTRIBUTE_FRIENDLY_NAME, pv.pwszVal); + PropVariantClear(&pv); + if (FAILED(hr)) + goto done; + } + *ret_count = count; + *ret_sources = sources; + +done: + if (FAILED(hr)) + { + for (i = 0; i < created_count; ++i) + IMFActivate_Release(sources[i]); + CoTaskMemFree(sources); + } + if (devices) + IMMDeviceCollection_Release(devices); + if (devenum) + IMMDeviceEnumerator_Release(devenum); + TRACE("ret %#lx, *ret_count %u.\n", hr, *ret_count); + return hr; +} diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 6847030b329..a2f183e5cc4 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6446,8 +6446,8 @@ static void test_MFEnumDeviceSources(void) sources = (void *)0xdeadbeef; count = 0xdeadbeef; hr = MFEnumDeviceSources(attrs, &sources, &count); - todo_wine ok(hr == MF_E_ATTRIBUTENOTFOUND, "got %#lx.\n", hr); - todo_wine ok(count == 0xdeadbeef, "got %#x.\n", count); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "got %#lx.\n", hr); + ok(count == 0xdeadbeef, "got %#x.\n", count); ok(sources == (void *)0xdeadbeef, "got %p.\n", sources); hr = CoInitialize(NULL); @@ -6456,7 +6456,7 @@ static void test_MFEnumDeviceSources(void) hr = IMFAttributes_SetGUID(attrs, &MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE, &MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE); ok(hr == S_OK, "got %#lx.\n", hr); hr = MFEnumDeviceSources(attrs, &sources, &count); - todo_wine ok(hr == E_INVALIDARG, "got %#lx.\n", hr); + ok(hr == E_INVALIDARG, "got %#lx.\n", hr); hr = IMFAttributes_SetGUID(attrs, &MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE, &MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_AUDCAP_GUID); ok(hr == S_OK, "got %#lx.\n", hr); @@ -6474,7 +6474,7 @@ static void test_MFEnumDeviceSources(void) ok(hr == S_OK, "got %#lx.\n", hr); hr = IMMDeviceCollection_GetCount(devices, &count2); ok(hr == S_OK, "got %#lx.\n", hr); - todo_wine ok(count2 == count, "got %u, %u.\n", count, count2); + ok(count2 == count, "got %u, %u.\n", count, count2); for (i = 0; i < count; ++i) { @@ -6493,7 +6493,7 @@ static void test_MFEnumDeviceSources(void) ok(!wcscmp(str, device_id), "got %s, %s.\n", debugstr_w(str), debugstr_w(device_id)); hr = IMFActivate_GetString(source, &MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_AUDCAP_SYMBOLIC_LINK, str, sizeof(str), NULL); - ok(hr == S_OK || broken(hr == MF_E_ATTRIBUTENOTFOUND) /* Win7 */, "got %#lx.\n", hr); + todo_wine ok(hr == S_OK || broken(hr == MF_E_ATTRIBUTENOTFOUND) /* Win7 */, "got %#lx.\n", hr); if (hr == S_OK) { swprintf(expect_str, ARRAY_SIZE(expect_str), L"%s%s#%s", mmdev_path_prefix, device_id, devinterface_audio_capture_wstr);

1 0

Elizabeth Figura : wined3d: Remove the no longer needed wined3d_vertex_caps.ffp_generic_attributes flag.
by Alexandre Julliard May 28, 2024

May 28, 2024

Module: wine Branch: master Commit: 4f2f51526b75deebae1c8a49ca4cefefd901dd9d URL: https://gitlab.winehq.org/wine/wine/-/commit/4f2f51526b75deebae1c8a49ca4cef… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Wed Mar 20 17:51:07 2024 -0500 wined3d: Remove the no longer needed wined3d_vertex_caps.ffp_generic_attributes flag. --- dlls/wined3d/adapter_gl.c | 1 - dlls/wined3d/adapter_vk.c | 1 - dlls/wined3d/buffer.c | 39 +--- dlls/wined3d/context.c | 25 +-- dlls/wined3d/context_gl.c | 461 +---------------------------------------- dlls/wined3d/cs.c | 9 - dlls/wined3d/glsl_shader.c | 1 - dlls/wined3d/shader_spirv.c | 1 - dlls/wined3d/wined3d_gl.h | 2 - dlls/wined3d/wined3d_private.h | 3 - 10 files changed, 12 insertions(+), 531 deletions(-)

1 0

Elizabeth Figura : wined3d: Remove the no longer used buffer conversion code.
by Alexandre Julliard May 28, 2024

May 28, 2024

Module: wine Branch: master Commit: a8ea6ae268bc1aa9255bf906c8dbdc800e336e33 URL: https://gitlab.winehq.org/wine/wine/-/commit/a8ea6ae268bc1aa9255bf906c8dbdc… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Wed Mar 20 17:57:42 2024 -0500 wined3d: Remove the no longer used buffer conversion code. --- dlls/wined3d/buffer.c | 348 ++--------------------------------------- dlls/wined3d/wined3d_private.h | 14 -- 2 files changed, 9 insertions(+), 353 deletions(-)

1 0

Zhiyi Zhang : comctl32/syslink: Don't delete font when destroying the control.
by Alexandre Julliard May 28, 2024

May 28, 2024

Module: wine Branch: master Commit: 480598680ceb86661bd269b7a64bd90e38a40f98 URL: https://gitlab.winehq.org/wine/wine/-/commit/480598680ceb86661bd269b7a64bd9… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jan 1 18:04:44 2024 +0800 comctl32/syslink: Don't delete font when destroying the control. The font set by WM_SETFONT is not owned by syslink so it shouldn't be deleted when handling WM_DESTROY for the control. Fix Toad for Oracle text gets reset to the system font after installing Team Coding. The application creates a font and set it to a syslink. Then after the syslink destroys itself, the font becomes invalid so other controls using the font end up falling back to the system font. --- dlls/comctl32/syslink.c | 1 - dlls/comctl32/tests/misc.c | 1 - 2 files changed, 2 deletions(-) diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c index 6af516ea1e6..f5a70e982c3 100644 --- a/dlls/comctl32/syslink.c +++ b/dlls/comctl32/syslink.c @@ -1711,7 +1711,6 @@ static LRESULT WINAPI SysLinkWindowProc(HWND hwnd, UINT message, case WM_DESTROY: TRACE("SysLink Ctrl destruction, hwnd=%p\n", hwnd); SYSLINK_ClearDoc(infoPtr); - if(infoPtr->Font != 0) DeleteObject(infoPtr->Font); if(infoPtr->LinkFont != 0) DeleteObject(infoPtr->LinkFont); SetWindowLongPtrW(hwnd, 0, 0); Free (infoPtr); diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index e5ac43a7ae0..c57f4581a4b 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -1246,7 +1246,6 @@ static void test_WM_SETFONT(void) } else { - todo_wine_if(!lstrcmpA(tests[i].class_name, "SysLink")) ok(ret == sizeof(lf), "GetObjectA failed, error %lu.\n", GetLastError()); }

1 0

Zhiyi Zhang : comctl32/tests: Add WM_SETFONT tests.
by Alexandre Julliard May 28, 2024

May 28, 2024

Module: wine Branch: master Commit: daa6f9b1b20c5e1cd1b9e5a16c8d80e77fb7cc38 URL: https://gitlab.winehq.org/wine/wine/-/commit/daa6f9b1b20c5e1cd1b9e5a16c8d80… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 14 11:43:46 2024 +0800 comctl32/tests: Add WM_SETFONT tests. --- dlls/comctl32/tests/misc.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index d2bb85b2d75..e5ac43a7ae0 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -1160,6 +1160,102 @@ static void test_WM_STYLECHANGED(void) DestroyWindow(parent); } +static void test_WM_SETFONT(void) +{ + HFONT hfont, hfont2; + HWND parent, hwnd; + LOGFONTA lf; + int i, ret; + + static const struct + { + const CHAR *class_name; + BOOL use_system_font; + } + tests[] = + { + {ANIMATE_CLASSA, TRUE}, + {WC_BUTTONA}, + {WC_COMBOBOXA}, + {WC_COMBOBOXEXA}, + {DATETIMEPICK_CLASSA}, + {WC_EDITA}, + {WC_HEADERA}, + {HOTKEY_CLASSA}, + {WC_IPADDRESSA, TRUE}, + {WC_LISTBOXA}, + {WC_LISTVIEWA}, + {MONTHCAL_CLASSA}, + {WC_NATIVEFONTCTLA, TRUE}, + {WC_PAGESCROLLERA, TRUE}, + {PROGRESS_CLASSA}, + {REBARCLASSNAMEA}, + {WC_STATICA}, + {STATUSCLASSNAMEA}, + {"SysLink"}, + {WC_TABCONTROLA}, + {TOOLBARCLASSNAMEA}, + {TOOLTIPS_CLASSA}, + {TRACKBAR_CLASSA, TRUE}, + {WC_TREEVIEWA}, + {UPDOWN_CLASSA, TRUE}, + {WC_SCROLLBARA, TRUE}, + }; + + parent = CreateWindowA(WC_STATICA, "parent", WS_POPUP | WS_VISIBLE, 100, 100, 100, 100, + 0, 0, 0, 0); + ok(parent != NULL, "CreateWindowA failed, error %lu.\n", GetLastError()); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + winetest_push_context("%s", tests[i].class_name); + + hwnd = CreateWindowA(tests[i].class_name, "test", WS_POPUP | WS_VISIBLE, 0, 0, 50, 50, parent, + 0, 0, 0); + /* SysLink is unavailable in comctl32 v5 */ + if (!hwnd && !lstrcmpA(tests[i].class_name, "SysLink")) + { + winetest_pop_context(); + continue; + } + + ZeroMemory(&lf, sizeof(lf)); + lf.lfWeight = FW_NORMAL; + lf.lfHeight = 20; + lstrcpyA(lf.lfFaceName, "Tahoma"); + hfont = CreateFontIndirectA(&lf); + ok(hfont != NULL, "CreateFontIndirectA failed, error %lu.\n", GetLastError()); + + SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, TRUE); + hfont2 = (HFONT)SendMessageA(hwnd, WM_GETFONT, 0, 0); + if (tests[i].use_system_font) + ok(hfont2 == NULL, "Got unexpected font %p.\n", hfont2); + else + todo_wine_if(!lstrcmpA(tests[i].class_name, TOOLTIPS_CLASSA)) + ok(hfont2 == hfont, "Got unexpected font %p.\n", hfont2); + ret = GetObjectA(hfont, sizeof(lf), &lf); + ok(ret == sizeof(lf), "GetObjectA failed, error %lu.\n", GetLastError()); + + DestroyWindow(hwnd); + + ret = GetObjectA(hfont, sizeof(lf), &lf); + if (!lstrcmpA(tests[i].class_name, WC_IPADDRESSA)) + { + todo_wine + ok(ret == 0, "GetObjectA succeeded.\n"); + } + else + { + todo_wine_if(!lstrcmpA(tests[i].class_name, "SysLink")) + ok(ret == sizeof(lf), "GetObjectA failed, error %lu.\n", GetLastError()); + } + + winetest_pop_context(); + } + + DestroyWindow(parent); +} + START_TEST(misc) { ULONG_PTR ctx_cookie; @@ -1173,6 +1269,7 @@ START_TEST(misc) test_Alloc(); test_comctl32_classes(FALSE); test_WM_STYLECHANGED(); + test_WM_SETFONT(); FreeLibrary(hComctl32); @@ -1188,6 +1285,7 @@ START_TEST(misc) test_WM_THEMECHANGED(); test_WM_SYSCOLORCHANGE(); test_WM_STYLECHANGED(); + test_WM_SETFONT(); unload_v6_module(ctx_cookie, hCtx); FreeLibrary(hComctl32);

1 0

Paul Gofman : mf/tests: Add a test for MFEnumDeviceSources().
by Alexandre Julliard May 28, 2024

May 28, 2024

Module: wine Branch: master Commit: 499af3e4f2cd57190e3047e0f18b1de29be033f3 URL: https://gitlab.winehq.org/wine/wine/-/commit/499af3e4f2cd57190e3047e0f18b1d… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon May 27 13:30:08 2024 -0600 mf/tests: Add a test for MFEnumDeviceSources(). --- dlls/mf/tests/mf.c | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 110 insertions(+), 1 deletion(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index fa5b0f55391..6847030b329 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -30,7 +30,6 @@ #include "mfapi.h" #include "mferror.h" #include "mfidl.h" -#include "mmdeviceapi.h" #include "uuids.h" #include "wmcodecdsp.h" #include "nserror.h" @@ -40,6 +39,8 @@ #include "wine/test.h" #include "initguid.h" +#include "mmdeviceapi.h" +#include "devpkey.h" #include "evr9.h" #define DEFINE_EXPECT(func) \ @@ -6426,6 +6427,113 @@ static void test_media_session_Start(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); } +static void test_MFEnumDeviceSources(void) +{ + static const WCHAR devinterface_audio_capture_wstr[] = L"{2eef81be-33fa-4800-9670-1cd474972c3f}"; + static const WCHAR mmdev_path_prefix[] = L"\\\\?\\SWD#MMDEVAPI#"; + IMMDeviceEnumerator *devenum; + IMMDeviceCollection *devices; + UINT32 i, count, count2; + IMFActivate **sources; + IMFAttributes *attrs; + IMMDevice *device; + HRESULT hr; + GUID guid; + + hr = MFCreateAttributes(&attrs, 3); + ok(hr == S_OK, "got %#lx.\n", hr); + + sources = (void *)0xdeadbeef; + count = 0xdeadbeef; + hr = MFEnumDeviceSources(attrs, &sources, &count); + todo_wine ok(hr == MF_E_ATTRIBUTENOTFOUND, "got %#lx.\n", hr); + todo_wine ok(count == 0xdeadbeef, "got %#x.\n", count); + ok(sources == (void *)0xdeadbeef, "got %p.\n", sources); + + hr = CoInitialize(NULL); + ok(hr == S_OK, "got %#lx.\n", hr); + + hr = IMFAttributes_SetGUID(attrs, &MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE, &MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE); + ok(hr == S_OK, "got %#lx.\n", hr); + hr = MFEnumDeviceSources(attrs, &sources, &count); + todo_wine ok(hr == E_INVALIDARG, "got %#lx.\n", hr); + + hr = IMFAttributes_SetGUID(attrs, &MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE, &MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_AUDCAP_GUID); + ok(hr == S_OK, "got %#lx.\n", hr); + + /* Some random guid. */ + hr = IMFAttributes_SetUINT32(attrs, &CLSID_MMDeviceEnumerator, 1); + ok(hr == S_OK, "got %#lx.\n", hr); + + hr = MFEnumDeviceSources(attrs, &sources, &count); + ok(hr == S_OK, "got %#lx.\n", hr); + + hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void **)&devenum); + ok(hr == S_OK, "got %#lx.\n", hr); + hr = IMMDeviceEnumerator_EnumAudioEndpoints(devenum, eCapture, DEVICE_STATE_ACTIVE, &devices); + ok(hr == S_OK, "got %#lx.\n", hr); + hr = IMMDeviceCollection_GetCount(devices, &count2); + ok(hr == S_OK, "got %#lx.\n", hr); + todo_wine ok(count2 == count, "got %u, %u.\n", count, count2); + + for (i = 0; i < count; ++i) + { + WCHAR str[512], expect_str[512], *device_id; + IMFActivate *source = sources[i]; + IPropertyStore *ps; + PROPVARIANT pv; + + hr = IMMDeviceCollection_Item(devices, i, &device); + ok(hr == S_OK, "got %#lx.\n", hr); + + hr = IMFActivate_GetString(source, &MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_AUDCAP_ENDPOINT_ID, str, sizeof(str), NULL); + ok(hr == S_OK, "got %#lx.\n", hr); + hr = IMMDevice_GetId(device, &device_id); + ok(hr == S_OK, "got %#lx.\n", hr); + ok(!wcscmp(str, device_id), "got %s, %s.\n", debugstr_w(str), debugstr_w(device_id)); + + hr = IMFActivate_GetString(source, &MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_AUDCAP_SYMBOLIC_LINK, str, sizeof(str), NULL); + ok(hr == S_OK || broken(hr == MF_E_ATTRIBUTENOTFOUND) /* Win7 */, "got %#lx.\n", hr); + if (hr == S_OK) + { + swprintf(expect_str, ARRAY_SIZE(expect_str), L"%s%s#%s", mmdev_path_prefix, device_id, devinterface_audio_capture_wstr); + ok(!wcscmp(str, expect_str), "got %s, expected %s.\n", debugstr_w(str), debugstr_w(expect_str)); + } + + hr = IMFActivate_GetGUID(source, &MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE, &guid); + ok(hr == S_OK, "got %#lx.\n", hr); + ok(IsEqualGUID(&guid, &MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_AUDCAP_GUID), "got %s.\n", debugstr_guid(&guid)); + + hr = IMFActivate_GetUINT32(source, &MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_AUDCAP_ROLE, &count2); + /* The attribute is filled if specified in input attributes as a filter. */ + ok(hr == MF_E_ATTRIBUTENOTFOUND, "got %#lx.\n", hr); + + hr = IMMDevice_OpenPropertyStore(device, STGM_READ, &ps); + ok(hr == S_OK, "got %#lx.\n", hr); + hr = IPropertyStore_GetValue(ps, (const PROPERTYKEY*)&DEVPKEY_Device_FriendlyName, &pv); + ok(hr == S_OK, "got %#lx.\n", hr); + IPropertyStore_Release(ps); + + ok(pv.vt == VT_LPWSTR, "got %#x.\n", pv.vt); + hr = IMFActivate_GetString(source, &MF_DEVSOURCE_ATTRIBUTE_FRIENDLY_NAME, str, sizeof(str), NULL); + ok(hr == S_OK, "got %#lx.\n", hr); + ok(!wcscmp(str, pv.pwszVal), "got %s, %s.\n", debugstr_w(str), debugstr_w(pv.pwszVal)); + + PropVariantClear(&pv); + + CoTaskMemFree(device_id); + IMMDevice_Release(device); + IMFActivate_Release(source); + } + + IMMDeviceCollection_Release(devices); + IMMDeviceEnumerator_Release(devenum); + IMFAttributes_Release(attrs); + + CoTaskMemFree(sources); + CoUninitialize(); +} + START_TEST(mf) { init_functions(); @@ -6459,4 +6567,5 @@ START_TEST(mf) test_mpeg4_media_sink(); test_MFCreateSequencerSegmentOffset(); test_media_session_Start(); + test_MFEnumDeviceSources(); }

1 0

Elizabeth Figura : wined3d: Remove the no longer needed wined3d_vertex_caps.xyzrhw flag.
by Alexandre Julliard May 28, 2024

May 28, 2024

Module: wine Branch: master Commit: a080a2a1a8ef959301b61e4e725db236b7a8076f URL: https://gitlab.winehq.org/wine/wine/-/commit/a080a2a1a8ef959301b61e4e725db2… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Wed Mar 20 17:35:55 2024 -0500 wined3d: Remove the no longer needed wined3d_vertex_caps.xyzrhw flag. --- dlls/wined3d/adapter_gl.c | 24 +----------------------- dlls/wined3d/adapter_vk.c | 1 - dlls/wined3d/buffer.c | 37 ------------------------------------- dlls/wined3d/context.c | 3 +-- dlls/wined3d/cs.c | 2 +- dlls/wined3d/glsl_shader.c | 1 - dlls/wined3d/shader_spirv.c | 1 - dlls/wined3d/wined3d_private.h | 3 --- 8 files changed, 3 insertions(+), 69 deletions(-)

1 0