April 2022 - Wine-commits - list.winehq.org

Huw Davies : wineoss: Add a helper to open the device.
by Alexandre Julliard 05 Apr '22

05 Apr '22

Module: wine Branch: master Commit: 61d4000e382be4c65829026762887d022dc1a5b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61d4000e382be4c658290267… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 31 08:21:48 2022 +0100 wineoss: Add a helper to open the device. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineoss.drv/mmdevdrv.c | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index c72f29b5540..8a0011ff9eb 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -365,6 +365,13 @@ static void oss_clean_devnode(char *dest, const char *devnode) dest[len] = '\0'; } +static int open_device(const char *device, EDataFlow flow) +{ + int flags = ((flow == eRender) ? O_WRONLY : O_RDONLY) | O_NONBLOCK; + + return open(device, flags, 0); +} + static UINT get_default_index(EDataFlow flow) { int fd = -1, err; @@ -373,11 +380,7 @@ static UINT get_default_index(EDataFlow flow) char devnode[OSS_DEVNODE_SIZE]; OSSDevice *dev_item; - if(flow == eRender) - fd = open("/dev/dsp", O_WRONLY | O_NONBLOCK); - else - fd = open("/dev/dsp", O_RDONLY | O_NONBLOCK); - + fd = open_device("/dev/dsp", flow); if(fd < 0){ WARN("Couldn't open default device!\n"); return 0; @@ -482,10 +485,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, GUID **guids, if(&dev_item->entry != &g_devices) continue; - if(flow == eRender) - fd = open(devnode, O_WRONLY | O_NONBLOCK, 0); - else - fd = open(devnode, O_RDONLY | O_NONBLOCK, 0); + fd = open_device(devnode, flow); if(fd < 0){ WARN("Opening device \"%s\" failed, pretending it doesn't exist: %d (%s)\n", devnode, errno, strerror(errno)); @@ -578,14 +578,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, return hr; } - if(oss_dev->flow == eRender) - This->fd = open(oss_dev->devnode, O_WRONLY | O_NONBLOCK, 0); - else if(oss_dev->flow == eCapture) - This->fd = open(oss_dev->devnode, O_RDONLY | O_NONBLOCK, 0); - else{ - HeapFree(GetProcessHeap(), 0, This); - return E_INVALIDARG; - } + This->fd = open_device(oss_dev->devnode, oss_dev->flow); if(This->fd < 0){ WARN("Unable to open device %s: %d (%s)\n", oss_dev->devnode, errno, strerror(errno)); @@ -1236,11 +1229,7 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient3 *iface, outpwfx = NULL; } - if(This->dataflow == eRender) - fd = open(This->devnode, O_WRONLY | O_NONBLOCK, 0); - else if(This->dataflow == eCapture) - fd = open(This->devnode, O_RDONLY | O_NONBLOCK, 0); - + fd = open_device(This->devnode, This->dataflow); if(fd < 0){ WARN("Unable to open device %s: %d (%s)\n", This->devnode, errno, strerror(errno));

1 0

Huw Davies : wineoss: Move get_ossdevice_from_guid() earlier in the file.
by Alexandre Julliard 05 Apr '22

05 Apr '22

Module: wine Branch: master Commit: d416b200a882c8a8ddd6d1d64f4d39c766ebfa50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d416b200a882c8a8ddd6d1d6… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 31 08:21:49 2022 +0100 wineoss: Move get_ossdevice_from_guid() earlier in the file. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineoss.drv/mmdevdrv.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 8a0011ff9eb..e5206627528 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -410,6 +410,15 @@ static UINT get_default_index(EDataFlow flow) return 0; } +static const OSSDevice *get_ossdevice_from_guid(const GUID *guid) +{ + OSSDevice *dev_item; + LIST_FOR_EACH_ENTRY(dev_item, &g_devices, OSSDevice, entry) + if(IsEqualGUID(guid, &dev_item->guid)) + return dev_item; + return NULL; +} + HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, GUID **guids, UINT *num, UINT *def_index) { @@ -544,15 +553,6 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, GUID **guids, return S_OK; } -static const OSSDevice *get_ossdevice_from_guid(const GUID *guid) -{ - OSSDevice *dev_item; - LIST_FOR_EACH_ENTRY(dev_item, &g_devices, OSSDevice, entry) - if(IsEqualGUID(guid, &dev_item->guid)) - return dev_item; - return NULL; -} - HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient **out) {

1 0

Huw Davies : wineoss: Move get_endpoint_ids to the unixlib.
by Alexandre Julliard 05 Apr '22

05 Apr '22

Module: wine Branch: master Commit: ab12c81febae15e13d15eadeb0fd8cf6fab08d8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab12c81febae15e13d15eade… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 31 08:21:50 2022 +0100 wineoss: Move get_endpoint_ids to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineoss.drv/mmdevdrv.c | 251 ++++++++++++-------------------------------- dlls/wineoss.drv/oss.c | 207 ++++++++++++++++++++++++++++++++++++ dlls/wineoss.drv/unixlib.h | 19 ++++ 3 files changed, 294 insertions(+), 183 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ab12c81febae15e13d15…

1 0

Rémi Bernon : include: Add CWMAEncMediaObject class declaration to wmcodecdsp.idl.
by Alexandre Julliard 05 Apr '22

05 Apr '22

Module: wine Branch: master Commit: bffe90496c904a0f95242e1bbfd3709fb1ff5e5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=bffe90496c904a0f95242e1b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Apr 5 14:56:58 2022 +0200 include: Add CWMAEncMediaObject class declaration to wmcodecdsp.idl. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wmcodecdsp.idl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/wmcodecdsp.idl b/include/wmcodecdsp.idl index ae2a42419b4..4ad965ab3d9 100644 --- a/include/wmcodecdsp.idl +++ b/include/wmcodecdsp.idl @@ -45,6 +45,11 @@ coclass CMSH264DecoderMFT {} ] coclass CWMADecMediaObject {}; +[ + uuid(70f598e9-f4ab-495a-99e2-a7c4d3d89abf) +] +coclass CWMAEncMediaObject {}; + [ uuid(93af0c51-2275-45d2-a35b-f2ba21caed00) ]

1 0

Rémi Bernon : include: Add CCOlorConvertDMO class declaration to wmcodecdsp.idl.
by Alexandre Julliard 05 Apr '22

05 Apr '22

Module: wine Branch: master Commit: 3b83fe637e8b1f0e0cbac1d53106718f56b6afdc URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b83fe637e8b1f0e0cbac1d5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Apr 5 14:56:59 2022 +0200 include: Add CCOlorConvertDMO class declaration to wmcodecdsp.idl. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wmcodecdsp.idl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/wmcodecdsp.idl b/include/wmcodecdsp.idl index 4ad965ab3d9..1f7024ee7d9 100644 --- a/include/wmcodecdsp.idl +++ b/include/wmcodecdsp.idl @@ -54,3 +54,8 @@ coclass CWMAEncMediaObject {}; uuid(93af0c51-2275-45d2-a35b-f2ba21caed00) ] coclass AACMFTEncoder {}; + +[ + uuid(98230571-0087-4204-b020-3282538e57d3) +] +coclass CColorConvertDMO {};

1 0

Rémi Bernon : include: Add some MEDIASUBTYPE_V* GUIDs to wmcodecdsp.idl.
by Alexandre Julliard 05 Apr '22

05 Apr '22

Module: wine Branch: master Commit: 38b98c653680cd87ecd3060601a57f996c35272e URL: https://source.winehq.org/git/wine.git/?a=commit;h=38b98c653680cd87ecd30606… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Apr 5 14:57:00 2022 +0200 include: Add some MEDIASUBTYPE_V* GUIDs to wmcodecdsp.idl. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wmcodecdsp.idl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/wmcodecdsp.idl b/include/wmcodecdsp.idl index 1f7024ee7d9..dcf28ab682c 100644 --- a/include/wmcodecdsp.idl +++ b/include/wmcodecdsp.idl @@ -24,6 +24,10 @@ cpp_quote("DEFINE_GUID(MEDIASUBTYPE_MSAUDIO1,0x00000160,0x0000,0x0010,0x80,0x00, cpp_quote("DEFINE_GUID(MEDIASUBTYPE_WMAUDIO2,0x00000161,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") cpp_quote("DEFINE_GUID(MEDIASUBTYPE_WMAUDIO3,0x00000162,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") cpp_quote("DEFINE_GUID(MEDIASUBTYPE_WMAUDIO_LOSSLESS,0x00000163,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("DEFINE_GUID(MEDIASUBTYPE_V216,0x36313256,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("DEFINE_GUID(MEDIASUBTYPE_V410,0x30313456,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("DEFINE_GUID(MEDIASUBTYPE_Y41T,0x54313459,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("DEFINE_GUID(MEDIASUBTYPE_Y42T,0x54323459,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") [ uuid(bbeea841-0a63-4f52-a7ab-a9b3a84ed38a)

1 0

Rémi Bernon : include: Add MFSampleExtension_CleanPoint to mfapi.h.
by Alexandre Julliard 05 Apr '22

05 Apr '22

Module: wine Branch: master Commit: 8091f3a0b8463d41049ed4ade98c79f82c86ebbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=8091f3a0b8463d41049ed4ad… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Apr 5 14:57:01 2022 +0200 include: Add MFSampleExtension_CleanPoint to mfapi.h. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfapi.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/mfapi.h b/include/mfapi.h index b4e4d095bb4..575b034c490 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -385,6 +385,7 @@ DEFINE_GUID(MFMediaType_Subtitle, 0xa6d13581, 0xed50, 0x4e65, 0xae, 0x0 DEFINE_GUID(MFMediaType_Video, 0x73646976, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); DEFINE_GUID(MFSampleExtension_DecodeTimestamp, 0x73a954d4, 0x09e2, 0x4861, 0xbe, 0xfc, 0x94, 0xbd, 0x97, 0xc0, 0x8e, 0x6e); +DEFINE_GUID(MFSampleExtension_CleanPoint, 0x9cdf01d8, 0xa0f0, 0x43ba, 0xb0, 0x77, 0xea, 0xa0, 0x6c, 0xbd, 0x72, 0x8a); DEFINE_GUID(MFSampleExtension_Timestamp, 0x1e436999, 0x69be, 0x4c7a, 0x93, 0x69, 0x70, 0x06, 0x8c, 0x02, 0x60, 0xcb); DEFINE_GUID(MFSampleExtension_Token, 0x8294da66, 0xf328, 0x4805, 0xb5, 0x51, 0x00, 0xde, 0xb4, 0xc5, 0x7a, 0x61); DEFINE_GUID(MFSampleExtension_3DVideo, 0xf86f97a4, 0xdd54, 0x4e2e, 0x9a, 0x5e, 0x55, 0xfc, 0x2d, 0x74, 0xa0, 0x05);

1 0

Dmitry Timoshkov : dwrite/tests: Add some fallback tests for Segoe UI Symbol.
by Alexandre Julliard 05 Apr '22

05 Apr '22

Module: wine Branch: master Commit: a90d976bb45e26cc64bcb1a4304a6dc7a1ad0571 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a90d976bb45e26cc64bcb1a4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 5 08:38:22 2022 +0300 dwrite/tests: Add some fallback tests for Segoe UI Symbol. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/layout.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index c77c6ff2034..43b6efa107b 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -4747,6 +4747,86 @@ if (font) { IDWriteFactory2_Release(factory2); } +static void get_font_name(IDWriteFont *font, WCHAR *name, UINT32 size) +{ + IDWriteLocalizedStrings *names; + IDWriteFontFamily *family; + UINT32 index; + BOOL exists; + HRESULT hr; + + hr = IDWriteFont_GetFontFamily(font, &family); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IDWriteFontFamily_GetFamilyNames(family, &names); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IDWriteLocalizedStrings_FindLocaleName(names, L"en-us", &index, &exists); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(index != UINT_MAX && exists, "Name was not found.\n"); + hr = IDWriteLocalizedStrings_GetString(names, index, name, size); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + IDWriteLocalizedStrings_Release(names); + IDWriteFontFamily_Release(family); +} + +static void test_system_fallback(void) +{ + static const struct fallback_test + { + const WCHAR text[2]; + const WCHAR *name; + } + tests[] = + { + { { 0x25d4, 0}, L"Segoe UI Symbol" }, + }; + IDWriteFontFallback *fallback; + IDWriteFactory2 *factory; + IDWriteFont *font; + UINT32 i, length; + WCHAR name[256]; + BOOL exists; + float scale; + HRESULT hr; + + if (!(factory = create_factory_iid(&IID_IDWriteFactory2))) + { + win_skip("System font fallback API is not supported.\n"); + return; + } + + hr = IDWriteFactory2_GetSystemFontFallback(factory, &fallback); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + g_source = tests[i].text; + hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 1, NULL, NULL, DWRITE_FONT_WEIGHT_NORMAL, + DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &length, &font, &scale); + todo_wine + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + if (hr != S_OK) continue; + ok(length == 1, "Unexpected length %u\n", length); + ok(scale == 1.0f, "got %f\n", scale); + + get_font_name(font, name, ARRAY_SIZE(name)); + todo_wine + ok(!wcscmp(name, tests[i].name), "%u: unexpected name %s.\n", i, wine_dbgstr_w(name)); + + hr = IDWriteFont_HasCharacter(font, g_source[0], &exists); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine + ok(exists, "%s missing character %#x\n", wine_dbgstr_w(name), g_source[0]); + + IDWriteFont_Release(font); + } + + IDWriteFontFallback_Release(fallback); + IDWriteFactory2_Release(factory); +} + static void test_FontFallbackBuilder(void) { IDWriteFontFallback *fallback, *fallback2; @@ -6529,6 +6609,7 @@ START_TEST(layout) test_pixelsnapping(); test_SetWordWrapping(); test_MapCharacters(); + test_system_fallback(); test_FontFallbackBuilder(); test_SetTypography(); test_SetLastLineWrapping();

1 0

Esme Povirk : mscoree/tests: Build loadpaths.exe as GUI instead of CUI.
by Alexandre Julliard 05 Apr '22

05 Apr '22

Module: wine Branch: master Commit: d971600cae1b898d4d31df1f1b0cad79c3ed2c5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d971600cae1b898d4d31df1f… Author: Esme Povirk <esme(a)codeweavers.com> Date: Mon Apr 4 14:26:42 2022 -0500 mscoree/tests: Build loadpaths.exe as GUI instead of CUI. This prevents unnecessary console windows from being created for it if mscoree_test.exe does not have a console. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/tests/mscoree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index b49465fb16f..a2bb3449839 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -709,7 +709,7 @@ static void test_loadpaths(BOOL neutral) ret = write_resource(exe_source, exe_source); ok(ret, "Could not write resource: %lu\n", GetLastError()); DeleteFileW(exe_name); - ret = compile_cs(exe_source, exe_name, L"exe", L"/reference:libloadpaths.dll"); + ret = compile_cs(exe_source, exe_name, L"winexe", L"/reference:libloadpaths.dll"); if (!ret) return; ret = DeleteFileW(exe_source); ok(ret, "DeleteFileW failed: %lu\n", GetLastError());

1 0

Esme Povirk : mscoree/tests: Create csc.exe process as detached.
by Alexandre Julliard 05 Apr '22

05 Apr '22

Module: wine Branch: master Commit: c943f924cb10fe522b0b932137a2cd9f74349e9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c943f924cb10fe522b0b9321… Author: Esme Povirk <esme(a)codeweavers.com> Date: Mon Apr 4 14:26:43 2022 -0500 mscoree/tests: Create csc.exe process as detached. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/tests/mscoree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index a2bb3449839..7da40d92887 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -580,7 +580,7 @@ static BOOL compile_cs(const WCHAR *source, const WCHAR *target, const WCHAR *ty swprintf(cmdline, ARRAY_SIZE(cmdline), L"%s /t:%s %s /out:\"%s\" \"%s\"", csc, type, args, target, source); si.cb = sizeof(si); - ret = CreateProcessW(csc, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ret = CreateProcessW(csc, cmdline, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &si, &pi); ok(ret, "Could not create process: %lu\n", GetLastError()); wait_child_process(pi.hProcess);

1 0