August 2020 - Wine-Devel - list.winehq.org

[PATCH 1/3] ucrtbase: Support overriding return value in _matherr.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 130 ++++++++++++++++++++----------------- dlls/ucrtbase/tests/misc.c | 7 ++ 2 files changed, 76 insertions(+), 61 deletions(-)

Aug. 3, 2020

Re: [PATCH] ole32/tests: Use wide string literal constants in more tests.

by Esme Povirk (they/them)

- ok(lstrcmpiW(stat.pwcsName, stmname) == 0, "expected CONTENTS, got %s\n", wine_dbgstr_w(stat.pwcsName)); + ok(!lstrcmpiW(stat.pwcsName, contentsW), "expected CONTENTS, got %s\n", wine_dbgstr_w(stat.pwcsName)); I prefer the "strcmp comparison 0" style because it helps me remember what the return value of strcmp means. I have to think about which of strcmp and !strcmp means "equal".

Aug. 3, 2020

[PATCH] winevulkan: harden calibrated_timestamps failure paths

by Liam Middlebrook

Addresses some comments that Zhiyi had made on the initial review thread. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Andy Ritger <aritger(a)nvidia.com> --- dlls/winevulkan/vulkan.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index be614f1cef..0b3923dc15 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1333,6 +1333,8 @@ VkResult WINAPI wine_vkGetCalibratedTimestampsEXT(VkDevice device, } res = device->funcs.p_vkGetCalibratedTimestampsEXT(device->device, timestamp_count, host_timestamp_infos, timestamps, max_deviation); + if (res != VK_SUCCESS) + return res; for (i = 0; i < timestamp_count; i++) timestamps[i] = convert_timestamp(host_timestamp_infos[i].timeDomain, timestamp_infos[i].timeDomain, timestamps[i]); @@ -1366,7 +1368,10 @@ VkResult WINAPI wine_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(VkPhysicalDe res = phys_dev->instance->funcs.p_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(phys_dev->phys_dev, &host_time_domain_count, host_time_domains); if (res != VK_SUCCESS) + { + heap_free(host_time_domains); return res; + } for (i = 0; i < host_time_domain_count; i++) { -- 2.26.2

Aug. 3, 2020

Re: [PATCH 2/2] wininet: Implement INTERNET_OPTION_SECURITY_CERTIFICATE flag for InternetQueryOption.

by Jacek Caban

Hi Daniel, On 03.08.2020 01:23, Daniel Lehman wrote: > + if (PRIMARYLANGID(GetUserDefaultLangID()) != LANG_ENGLISH) > + FIXME("INTERNET_OPTION_SECURITY_CERTIFICATE currently English-only\n"); I sent the sign off too soon. Is this FIXME accurate? It seems that you added everything that's needed for other languages in the code itself. Once translators translate resources, it will be supported, which is not different than any other locale-dependent place. Thanks, Jacek

Aug. 3, 2020

Re: [PATCH 2/2] wininet: Implement INTERNET_OPTION_SECURITY_CERTIFICATE flag for InternetQueryOption.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>

Aug. 3, 2020

Re: [PATCH 1/2] wininet: Move INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT handling to helper.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>

Aug. 3, 2020

Re: [PATCH] wbemprox: Avoid a use after free (Coverity).

by Hans Leidekker

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>

Aug. 3, 2020

Re: [PATCH] msi: Fix a leak (Coverity).

by Hans Leidekker

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>

Aug. 3, 2020

Re: [PATCH v2] dsound: Select the nth effect matching the given CLSID in GetObjectInPath().

by Andrew Eikum

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> On Tue, Jul 28, 2020 at 08:29:42PM -0500, Zebediah Figura wrote: > Instead of selecting the nth effect overall and checking whether it matches. > > Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> > --- > dlls/dsound/buffer.c | 32 +++++++++++++++----------------- > dlls/dsound/tests/dsound8.c | 24 ++++++++++-------------- > 2 files changed, 25 insertions(+), 31 deletions(-) > > diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c > index ea428c08166..bc30a8a5448 100644 > --- a/dlls/dsound/buffer.c > +++ b/dlls/dsound/buffer.c > @@ -845,27 +845,25 @@ static HRESULT WINAPI IDirectSoundBufferImpl_AcquireResources(IDirectSoundBuffer > } > > static HRESULT WINAPI IDirectSoundBufferImpl_GetObjectInPath(IDirectSoundBuffer8 *iface, > - REFGUID rguidObject, DWORD dwIndex, REFGUID rguidInterface, void **ppObject) > + REFGUID clsid, DWORD index, REFGUID iid, void **out) > { > - IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); > + IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); > + DWORD i, count = 0; > > - TRACE("(%p,%s,%u,%s,%p)\n",This,debugstr_guid(rguidObject),dwIndex,debugstr_guid(rguidInterface),ppObject); > + TRACE("(%p,%s,%u,%s,%p)\n", This, debugstr_guid(clsid), index, debugstr_guid(iid), out); > > - if (dwIndex >= This->num_filters) > - return DSERR_CONTROLUNAVAIL; > - > - if (!ppObject) > - return E_INVALIDARG; > + if (!out) > + return E_INVALIDARG; > > - if (IsEqualGUID(rguidObject, &This->filters[dwIndex].guid) || IsEqualGUID(rguidObject, &GUID_All_Objects)) { > - if (SUCCEEDED(IMediaObject_QueryInterface(This->filters[dwIndex].obj, rguidInterface, ppObject))) > - return DS_OK; > - else > - return E_NOINTERFACE; > - } else { > - WARN("control unavailable\n"); > - return DSERR_OBJECTNOTFOUND; > - } > + for (i = 0; i < This->num_filters; i++) > + { > + if (IsEqualGUID(clsid, &This->filters[i].guid) || IsEqualGUID(clsid, &GUID_All_Objects)) > + { > + if (count++ == index) > + return IMediaObject_QueryInterface(This->filters[i].obj, iid, out); > + } > + } > + return DSERR_OBJECTNOTFOUND; > } > > static HRESULT WINAPI IDirectSoundBufferImpl_Initialize(IDirectSoundBuffer8 *iface, > diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c > index fcac31ba637..81c5710dbaf 100644 > --- a/dlls/dsound/tests/dsound8.c > +++ b/dlls/dsound/tests/dsound8.c > @@ -1678,7 +1678,7 @@ static void test_effects(void) > > dmo = (IMediaObject *)0xdeadbeef; > hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_All_Objects, 1, &IID_IMediaObject, (void **)&dmo); > - todo_wine ok(hr == DSERR_OBJECTNOTFOUND, "Got hr %#x.\n", hr); > + ok(hr == DSERR_OBJECTNOTFOUND, "Got hr %#x.\n", hr); > ok(dmo == (IMediaObject *)0xdeadbeef, "Got object %p.\n", dmo); > > effects[0].guidDSFXClass = GUID_DSFX_STANDARD_PARAMEQ; > @@ -1705,9 +1705,8 @@ static void test_effects(void) > echo = dmo; > hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, > &GUID_DSFX_STANDARD_I3DL2REVERB, 0, &IID_IMediaObject, (void **)&dmo); > - todo_wine ok(hr == DS_OK, "Got hr %#x.\n", hr); > - if (hr == DS_OK) > - reverb = dmo; > + ok(hr == DS_OK, "Got hr %#x.\n", hr); > + reverb = dmo; > > hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_All_Objects, 0, &IID_IMediaObject, (void **)&dmo); > ok(hr == DS_OK, "Got hr %#x.\n", hr); > @@ -1716,12 +1715,12 @@ static void test_effects(void) > > hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_All_Objects, 1, &IID_IMediaObject, (void **)&dmo); > ok(hr == DS_OK, "Got hr %#x.\n", hr); > - todo_wine ok(dmo == reverb, "Expected %p, got %p.\n", reverb, dmo); > + ok(dmo == reverb, "Expected %p, got %p.\n", reverb, dmo); > IMediaObject_Release(dmo); > > hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, > &GUID_DSFX_STANDARD_I3DL2REVERB, 1, &IID_IMediaObject, (void **)&dmo); > - todo_wine ok(hr == DSERR_OBJECTNOTFOUND, "Got hr %#x.\n", hr); > + ok(hr == DSERR_OBJECTNOTFOUND, "Got hr %#x.\n", hr); > > hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_All_Objects, 0, &IID_IDirectSoundFXParamEq, (void **)&unk); > ok(hr == DS_OK, "Got hr %#x.\n", hr); > @@ -1743,14 +1742,11 @@ static void test_effects(void) > > hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, > &GUID_DSFX_STANDARD_I3DL2REVERB, 0, &IID_IDirectSoundFXI3DL2Reverb, (void **)&unk); > - todo_wine ok(hr == DS_OK, "Got hr %#x.\n", hr); > - if (hr == DS_OK) > - IUnknown_Release(unk); > + ok(hr == DS_OK, "Got hr %#x.\n", hr); > + IUnknown_Release(unk); > > - if (echo) > - IMediaObject_Release(echo); > - if (reverb) > - IMediaObject_Release(reverb); > + IMediaObject_Release(echo); > + IMediaObject_Release(reverb); > > got_Process = CreateEventA(NULL, TRUE, FALSE, NULL); > > @@ -1786,7 +1782,7 @@ static void test_effects(void) > ok(hr == DS_OK, "Got hr %#x.\n", hr); > > hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_All_Objects, 0, &IID_IMediaObject, (void **)&dmo); > - todo_wine ok(hr == DSERR_OBJECTNOTFOUND, "Got hr %#x.\n", hr); > + ok(hr == DSERR_OBJECTNOTFOUND, "Got hr %#x.\n", hr); > > CloseHandle(got_Process); > IDirectSoundBuffer8_Release(buffer8); > -- > 2.27.0 > >

Aug. 3, 2020

[PATCH] iphlpapi: Update comment for SOCK_DGRAM since Linux also supports it from 3.0.

by Gabriel Ivăncescu

Linux does require the user to be in the range specified by /proc/sys/net/ipv4/ping_group_range though, but otherwise works fine. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/iphlpapi/icmp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/icmp.c b/dlls/iphlpapi/icmp.c index 0dc2f12..8e425ea 100644 --- a/dlls/iphlpapi/icmp.c +++ b/dlls/iphlpapi/icmp.c @@ -160,7 +160,8 @@ HANDLE WINAPI Icmp6CreateFile(VOID) int sid=socket(AF_INET6,SOCK_RAW,IPPROTO_ICMPV6); if (sid < 0) { - /* Mac OS X supports non-privileged ICMP via SOCK_DGRAM type. */ + /* Some systems (e.g. Linux 3.0+ and Mac OS X) support + non-privileged ICMP via SOCK_DGRAM type. */ sid=socket(AF_INET6,SOCK_DGRAM,IPPROTO_ICMPV6); } if (sid < 0) { @@ -217,7 +218,8 @@ HANDLE WINAPI IcmpCreateFile(VOID) int sid=socket(AF_INET,SOCK_RAW,IPPROTO_ICMP); if (sid < 0) { - /* Mac OS X supports non-privileged ICMP via SOCK_DGRAM type. */ + /* Some systems (e.g. Linux 3.0+ and Mac OS X) support + non-privileged ICMP via SOCK_DGRAM type. */ sid=socket(AF_INET,SOCK_DGRAM,IPPROTO_ICMP); } if (sid < 0) { -- 2.21.0

Aug. 3, 2020