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

Francois Gouget : testbot/web: Skip GetDisplayValue() for the JobDetails page.
by Alexandre Julliard April 6, 2022

April 6, 2022

Module: tools Branch: master Commit: 8de0125d8b61145721f7debd2238c2941742983b URL: https://source.winehq.org/git/tools.git/?a=commit;h=8de0125d8b61145721f7deb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 6 01:15:03 2022 +0200 testbot/web: Skip GetDisplayValue() for the JobDetails page. The job details page knows which property it is accessing so there is no need to go through the generic GetDisplayValue(). This makes the code more readable. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/JobDetails.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index ae99b21..5a24204 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -96,7 +96,7 @@ sub GenerateDataCell($$$$) if ($PropertyName eq "VM") { print "<td><a href='#k", $self->escapeHTML($StepTask->GetKey()), "'>"; - print $self->escapeHTML($self->GetDisplayValue($StepTask, $PropertyDescriptor)); + print $self->escapeHTML($StepTask->VM->Name); print "</a></td>\n"; } elsif ($PropertyName eq "FileName") @@ -108,7 +108,7 @@ sub GenerateDataCell($$$$) my $URI = "/GetFile.pl?JobKey=" . uri_escape($JobId) . "&StepKey=" . uri_escape($StepTask->StepNo); print "<td><a href='" . $self->escapeHTML($URI) . "'>"; - print $self->escapeHTML($self->GetDisplayValue($StepTask, $PropertyDescriptor)); + print $self->escapeHTML($StepTask->FileName); print "</a></td>\n"; } else

1 0

Rémi Bernon : include: Add MFSampleExtension_CleanPoint to mfapi.h.
by Alexandre Julliard April 5, 2022

April 5, 2022

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

Huw Davies : wineoss: Move get_endpoint_ids to the unixlib.
by Alexandre Julliard April 5, 2022

April 5, 2022

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

Huw Davies : wineoss: Move get_ossdevice_from_guid() earlier in the file.
by Alexandre Julliard April 5, 2022

April 5, 2022

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

Jacek Caban : user32: Use NtUserMessageCall for SendMessageCallbackA implementation.
by Alexandre Julliard April 5, 2022

April 5, 2022

Module: wine Branch: master Commit: 37de5d24a881e1830c672853e8e31a4844d3f52e URL: https://source.winehq.org/git/wine.git/?a=commit;h=37de5d24a881e1830c672853… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 4 16:59:28 2022 +0200 user32: Use NtUserMessageCall for SendMessageCallbackA implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 570 +------------------------------------------ dlls/win32u/message.c | 2 +- dlls/win32u/sysparams.c | 3 - dlls/win32u/win32u_private.h | 1 - include/ntuser.h | 1 - 5 files changed, 4 insertions(+), 573 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=37de5d24a881e1830c67…

1 0

Nikolay Sivov : shell32/tests: Use CRT memory allocation functions.
by Alexandre Julliard April 5, 2022

April 5, 2022

Module: wine Branch: master Commit: 9140c673070f4061b3ff7e2b5d948861c3ef9d2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9140c673070f4061b3ff7e2b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 5 18:09:07 2022 +0300 shell32/tests: Use CRT memory allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/assoc.c | 7 +++---- dlls/shell32/tests/autocomplete.c | 5 ++--- dlls/shell32/tests/ebrowser.c | 13 ++++++------- dlls/shell32/tests/msg.h | 9 ++++----- dlls/shell32/tests/shelldispatch.c | 5 ++--- dlls/shell32/tests/shelllink.c | 5 ++--- dlls/shell32/tests/shlexec.c | 9 ++++----- dlls/shell32/tests/shlfolder.c | 21 ++++++++++----------- dlls/shell32/tests/shlview.c | 9 ++++----- 9 files changed, 37 insertions(+), 46 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9140c673070f4061b3ff…

1 0

Huw Davies : wineoss: Pass a buffer to oss_clean_devnode().
by Alexandre Julliard April 5, 2022

April 5, 2022

Module: wine Branch: master Commit: 47dafdc7469053055919e839b61ba64afe5b2147 URL: https://source.winehq.org/git/wine.git/?a=commit;h=47dafdc7469053055919e839… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 31 08:21:47 2022 +0100 wineoss: Pass a buffer to oss_clean_devnode(). 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 | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 0269f0fa536..c72f29b5540 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -346,27 +346,23 @@ static void get_device_guid(EDataFlow flow, const char *device, GUID *guid) RegCloseKey(key); } -static const char *oss_clean_devnode(const char *devnode) +/* dst must be large enough to hold devnode */ +static void oss_clean_devnode(char *dest, const char *devnode) { - static char ret[OSS_DEVNODE_SIZE]; - const char *dot, *slash; size_t len; - dot = strrchr(devnode, '.'); + strcpy(dest, devnode); + dot = strrchr(dest, '.'); if(!dot) - return devnode; + return; - slash = strrchr(devnode, '/'); + slash = strrchr(dest, '/'); if(slash && dot < slash) - return devnode; - - len = dot - devnode; - - memcpy(ret, devnode, len); - ret[len] = '\0'; + return; - return ret; + len = dot - dest; + dest[len] = '\0'; } static UINT get_default_index(EDataFlow flow) @@ -374,7 +370,7 @@ static UINT get_default_index(EDataFlow flow) int fd = -1, err; UINT i; oss_audioinfo ai; - const char *devnode; + char devnode[OSS_DEVNODE_SIZE]; OSSDevice *dev_item; if(flow == eRender) @@ -397,7 +393,7 @@ static UINT get_default_index(EDataFlow flow) close(fd); TRACE("Default devnode: %s\n", ai.devnode); - devnode = oss_clean_devnode(ai.devnode); + oss_clean_devnode(devnode, ai.devnode); i = 0; LIST_FOR_EACH_ENTRY(dev_item, &g_devices, OSSDevice, entry){ if(dev_item->flow == flow){ @@ -465,7 +461,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, GUID **guids, *num = 0; for(i = 0; i < sysinfo.numaudios; ++i){ oss_audioinfo ai = {0}; - const char *devnode; + char devnode[OSS_DEVNODE_SIZE]; OSSDevice *dev_item; int fd; @@ -476,7 +472,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, GUID **guids, continue; } - devnode = oss_clean_devnode(ai.devnode); + oss_clean_devnode(devnode, ai.devnode); /* check for duplicates */ LIST_FOR_EACH_ENTRY(dev_item, &g_devices, OSSDevice, entry){

1 0

Huw Davies : wineoss: Add a helper to open the device.
by Alexandre Julliard April 5, 2022

April 5, 2022

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

Rémi Bernon : include: Add CCOlorConvertDMO class declaration to wmcodecdsp.idl.
by Alexandre Julliard April 5, 2022

April 5, 2022

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 CWMAEncMediaObject class declaration to wmcodecdsp.idl.
by Alexandre Julliard April 5, 2022

April 5, 2022

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