May 2024 - Wine-Commits - list.winehq.org

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

Alexandre Julliard : msvcrt: Only export stubs of thiscall functions on i386.
by Alexandre Julliard May 28, 2024

May 28, 2024

Module: wine Branch: master Commit: 014cd36a56e090d469d71a737085bb92c6293f15 URL: https://gitlab.winehq.org/wine/wine/-/commit/014cd36a56e090d469d71a737085bb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 28 12:28:27 2024 +0200 msvcrt: Only export stubs of thiscall functions on i386. The mangled names are different on platforms without thiscall. --- dlls/msvcr100/msvcr100.spec | 102 ++++++++++++++++++++++---------------------- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt20/msvcrt20.spec | 4 +- dlls/msvcrt40/msvcrt40.spec | 4 +- 5 files changed, 57 insertions(+), 57 deletions(-)

1 0

Alexandre Julliard : msvcp: Only export stubs of thiscall functions on i386.
by Alexandre Julliard May 28, 2024

May 28, 2024

Module: wine Branch: master Commit: 9f6654652d1fd796d6b78c29972d59b3849351b7 URL: https://gitlab.winehq.org/wine/wine/-/commit/9f6654652d1fd796d6b78c29972d59… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 28 12:28:05 2024 +0200 msvcp: Only export stubs of thiscall functions on i386. The mangled names are different on platforms without thiscall. --- dlls/msvcp100/msvcp100.spec | 152 ++++++------ dlls/msvcp60/msvcp60.spec | 570 ++++++++++++++++++++++---------------------- dlls/msvcp70/msvcp70.spec | 560 +++++++++++++++++++++---------------------- dlls/msvcp71/msvcp71.spec | 478 ++++++++++++++++++------------------- dlls/msvcp80/msvcp80.spec | 516 +++++++++++++++++++-------------------- dlls/msvcp90/msvcp90.spec | 494 +++++++++++++++++++------------------- 6 files changed, 1385 insertions(+), 1385 deletions(-)

1 0

Alexandre Julliard : msvcp: Only export thiscall functions on i386.
by Alexandre Julliard May 28, 2024

May 28, 2024

Module: wine Branch: master Commit: b235c964086535fd348dca795a6714556a642b19 URL: https://gitlab.winehq.org/wine/wine/-/commit/b235c964086535fd348dca795a6714… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 28 12:27:43 2024 +0200 msvcp: Only export thiscall functions on i386. The mangled names are different on platforms without thiscall. --- dlls/msvcp100/msvcp100.spec | 1732 +++++++++--------- dlls/msvcp110/msvcp110.spec | 2 +- dlls/msvcp120/msvcp120.spec | 2 +- dlls/msvcp120_app/msvcp120_app.spec | 2 +- dlls/msvcp60/msvcp60.spec | 2166 +++++++++++----------- dlls/msvcp70/msvcp70.spec | 1834 +++++++++---------- dlls/msvcp71/msvcp71.spec | 3406 +++++++++++++++++------------------ dlls/msvcp80/msvcp80.spec | 2252 +++++++++++------------ dlls/msvcp90/msvcp90.spec | 2268 +++++++++++------------ 9 files changed, 6832 insertions(+), 6832 deletions(-)

1 0

Alexandre Julliard : msvcrt: Only export thiscall functions on i386.
by Alexandre Julliard May 28, 2024

May 28, 2024

Module: wine Branch: master Commit: 4701e2bae0f77dc6d32fc0bd80aed12fbfeac5d5 URL: https://gitlab.winehq.org/wine/wine/-/commit/4701e2bae0f77dc6d32fc0bd80aed1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 28 12:28:17 2024 +0200 msvcrt: Only export thiscall functions on i386. The mangled names are different on platforms without thiscall. --- dlls/msvcirt/msvcirt.spec | 728 +++++++++++++++++++++---------------------- dlls/msvcr100/msvcr100.spec | 150 ++++----- dlls/msvcr110/msvcr110.spec | 24 +- dlls/msvcr70/msvcr70.spec | 20 +- dlls/msvcr71/msvcr71.spec | 4 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 16 +- dlls/msvcrt20/msvcrt20.spec | 708 +++++++++++++++++++++--------------------- dlls/msvcrt40/msvcrt40.spec | 738 ++++++++++++++++++++++---------------------- dlls/msvcrtd/msvcrtd.spec | 20 +- 11 files changed, 1206 insertions(+), 1206 deletions(-)

1 0