wine-commits July 2022

wine-commits@winehq.org

1 participants
639 discussions

Jeremy White : gitlab: Improve assignment diagnostics slightly.
by Alexandre Julliard 19 Jul '22

19 Jul '22

Module: tools Branch: master Commit: bd7a265bd46ae1cb167c2e62156586f055ec2133 URL: https://gitlab.winehq.org/winehq/tools/-/commit/bd7a265bd46ae1cb167c2e62156… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Mon Jul 18 15:33:59 2022 -0500 gitlab: Improve assignment diagnostics slightly. Log the reviewers before we post. Hopefully will help identify issues with post failures. Log a unique set of reviewer names. --- gitlab/gitlab-to-mail/assign.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gitlab/gitlab-to-mail/assign.py b/gitlab/gitlab-to-mail/assign.py index 9b6acb69..6b35f577 100755 --- a/gitlab/gitlab-to-mail/assign.py +++ b/gitlab/gitlab-to-mail/assign.py @@ -117,12 +117,10 @@ def assign_reviewers(mr_iid, version, maintainers_map, update_db): paths.append(d['new_path']) ids, names = get_assignees(maintainers_map, paths) if len(ids) > 0: + unique_names = list(set(names)) + print(f"Asking {unique_names} to review MR {mr_iid}") if update_db: - # set() prunes dupes, list() makes it json transmittable again post_reviewers(mr_iid, list(set(ids))) - print(f"Asking {names} to review MR {mr_iid}") - else: - print("Debug: would set reviewers for {} to {}".format(mr_iid, set(names))) else: print(f"No suitable reviewers found for MR {mr_iid}")

1 0

Brendan McGrath : qedit: Do not force the sample to be freed in SampleGrabber_callback().
by Alexandre Julliard 18 Jul '22

18 Jul '22

Module: wine Branch: master Commit: 1113f42aa748d9e0a27c4663b9d8de1237f95e73 URL: https://gitlab.winehq.org/wine/wine/-/commit/1113f42aa748d9e0a27c4663b9d8de… Author: Brendan McGrath <brendan(a)redmandi.com> Date: Sun Jul 17 12:38:09 2022 +1000 qedit: Do not force the sample to be freed in SampleGrabber_callback(). Remove a work around that causes a crash in Unravel Two. There is a callback in Unravel Two that appears to add a reference to a IMediaSample, which this workaround treats as a leak and releases. However, the application also later releases the reference itself, causing a use-after-free. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51616 Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/samplegrabber.c | 3 --- dlls/qedit/tests/mediadet.c | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index 9b9780e564a..cefb2f37078 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -164,9 +164,6 @@ static void SampleGrabber_callback(struct sample_grabber *This, IMediaSample *sa if (ref) { ERR("(%p) Callback referenced sample %p by %lu\n", This, sample, ref); - /* ugly as hell but some apps are sooo buggy */ - while (ref--) - IMediaSample_Release(sample); } } break; diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index 6e7017f865c..05805c56eb5 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -1094,7 +1094,7 @@ static void test_samplegrabber(void) ok(samplecb_called == TRUE, "SampleCB should have been called\n"); refcount = IUnknown_Release(&my_sample.sample); - todo_wine ok(!refcount, "Got unexpected refcount %ld.\n", refcount); + ok(!refcount, "Got unexpected refcount %ld.\n", refcount); IMemInputPin_Release(inpin); IPin_Release(pin);

1 0

Brendan McGrath : qedit/tests: Test adding a reference to the sample from ISampleGrabberCB::SampleCB().
by Alexandre Julliard 18 Jul '22

18 Jul '22

Module: wine Branch: master Commit: 2f280d0dda2b85533fedc15e092185c4e648fcf3 URL: https://gitlab.winehq.org/wine/wine/-/commit/2f280d0dda2b85533fedc15e092185… Author: Brendan McGrath <brendan(a)redmandi.com> Date: Sun Jul 17 12:38:08 2022 +1000 qedit/tests: Test adding a reference to the sample from ISampleGrabberCB::SampleCB(). Unravel Two adds a reference to the IMediaSample during its callback. This patch adds a test that checks if an application does do this, that it can free it later and the reference count will finish at zero. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51616 Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/tests/mediadet.c | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index 3202baca924..6e7017f865c 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -866,6 +866,17 @@ static void test_put_filter(void) ok(!ref, "Got outstanding refcount %ld.\n", ref); } +struct test_sample +{ + IMediaSample sample; + LONG refcount; +}; + +static struct test_sample *impl_from_IMediaSample(IMediaSample *iface) +{ + return CONTAINING_RECORD(iface, struct test_sample, sample); +} + static HRESULT WINAPI ms_QueryInterface(IMediaSample *iface, REFIID riid, void **ppvObject) { @@ -874,12 +885,14 @@ static HRESULT WINAPI ms_QueryInterface(IMediaSample *iface, REFIID riid, static ULONG WINAPI ms_AddRef(IMediaSample *iface) { - return 2; + struct test_sample *sample = impl_from_IMediaSample(iface); + return InterlockedIncrement(&sample->refcount); } static ULONG WINAPI ms_Release(IMediaSample *iface) { - return 1; + struct test_sample *sample = impl_from_IMediaSample(iface); + return InterlockedDecrement(&sample->refcount); } static HRESULT WINAPI ms_GetPointer(IMediaSample *iface, BYTE **ppBuffer) @@ -989,7 +1002,7 @@ static const IMediaSampleVtbl my_sample_vt = { ms_SetMediaTime }; -static IMediaSample my_sample = { &my_sample_vt }; +static struct test_sample my_sample = { {&my_sample_vt}, 0 }; static BOOL samplecb_called = FALSE; @@ -1012,8 +1025,9 @@ static ULONG WINAPI sgcb_Release(ISampleGrabberCB *iface) static HRESULT WINAPI sgcb_SampleCB(ISampleGrabberCB *iface, double SampleTime, IMediaSample *pSample) { - ok(pSample == &my_sample, "Got wrong IMediaSample: %p, expected %p\n", pSample, &my_sample); + ok(pSample == &my_sample.sample, "Got wrong IMediaSample: %p, expected %p\n", pSample, &my_sample); samplecb_called = TRUE; + IMediaSample_AddRef(pSample); return E_NOTIMPL; } @@ -1043,6 +1057,7 @@ static void test_samplegrabber(void) IEnumPins *pins; HRESULT hr; FILTER_STATE fstate; + ULONG refcount; /* Invalid RIID */ hr = CoCreateInstance(&CLSID_SampleGrabber, NULL, CLSCTX_INPROC_SERVER, &IID_IClassFactory, @@ -1074,10 +1089,13 @@ static void test_samplegrabber(void) hr = IPin_QueryInterface(pin, &IID_IMemInputPin, (void**)&inpin); ok(hr == S_OK, "Got hr %#lx.\n", hr); - hr = IMemInputPin_Receive(inpin, &my_sample); + hr = IMemInputPin_Receive(inpin, &my_sample.sample); ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(samplecb_called == TRUE, "SampleCB should have been called\n"); + refcount = IUnknown_Release(&my_sample.sample); + todo_wine ok(!refcount, "Got unexpected refcount %ld.\n", refcount); + IMemInputPin_Release(inpin); IPin_Release(pin);

1 0

Francois Gouget : include: Fix the spelling of some comments.
by Alexandre Julliard 18 Jul '22

18 Jul '22

Module: wine Branch: master Commit: 3ff91992d4ebe9edab9e2384620c026eeca9c580 URL: https://gitlab.winehq.org/wine/wine/-/commit/3ff91992d4ebe9edab9e2384620c02… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 9 16:02:31 2022 +0200 include: Fix the spelling of some comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- include/wine/iaccessible2.idl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/wine/iaccessible2.idl b/include/wine/iaccessible2.idl index 0091c529f0d..34c1f169939 100644 --- a/include/wine/iaccessible2.idl +++ b/include/wine/iaccessible2.idl @@ -1350,7 +1350,7 @@ IA2_STATE_PINNED = 0x80000 @ref _indexes\n @ref _enumBase\n @ref _specialOffsets\n - @ref _dicoveringInterfaces\n + @ref _discoveringInterfaces\n @ref _changingInterfaces\n @ref _applicationInfo\n @ref _childIDs\n @@ -1440,7 +1440,7 @@ IA2_STATE_PINNED = 0x80000 Since the same offset is associated with two different lines a special means is needed to fetch text from the line where the caret is physically located. - @section _dicoveringInterfaces Discovery of Interfaces + @section _discoveringInterfaces Discovery of Interfaces In general AT (Assistive Technology) should try IAccessible2 interfaces, followed by using the MSAA (Microsoft® Active Accessibility®) interfaces. (In cases where the an application is known to have custom interfaces which provide information not supplied by IAccessible2 @@ -2381,7 +2381,7 @@ enum IA2TextBoundaryType { that present textual information on the display like buttons, text entry fields, or text portions of the document window. The interface provides access to the text's content, attributes, and spatial location. - However, text can not be modified with this interface. That is the task + However, text cannot be modified with this interface. That is the task of the IAccessibleEditableText interface. The text length, i.e. the number of characters in the text, is @@ -3686,7 +3686,7 @@ interface IAccessibleHypertext : IAccessibleText /** @brief This interface exposes information about hypertext in a document. The %IAccessibleHypertext2 interface extends the functinality of the - %IAccessibleHypertext inteface. + %IAccessibleHypertext interface. */ [object, uuid(CF64D89F-8287-4B44-8501-A827453A6077)] interface IAccessibleHypertext2 : IAccessibleHypertext @@ -4326,7 +4326,7 @@ interface IAccessibleTable : IUnknown Please also refer to the IAccessibleTableCell interface. If you want to support older applications you should also support the - IAccessibleTable inteface. + IAccessibleTable interface. */ [object, uuid(6167f295-06f0-4cdd-a1fa-02e25153d869)] interface IAccessibleTable2 : IUnknown @@ -4821,7 +4821,7 @@ interface IAccessibleTableCell : IUnknown [out, retval] boolean *isSelected ); - /** @brief Returns a reference to the accessbile of the containing table. + /** @brief Returns a reference to the accessible of the containing table. @param [out] table Returns a reference to the IUnknown of the containing table.

1 0

Francois Gouget : urlmon/tests: Fix the spelling of a trace() message.
by Alexandre Julliard 18 Jul '22

18 Jul '22

Module: wine Branch: master Commit: d01b13f49519479b461740fb6c5318aa8434a04e URL: https://gitlab.winehq.org/wine/wine/-/commit/d01b13f49519479b461740fb6c5318… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 9 15:59:56 2022 +0200 urlmon/tests: Fix the spelling of a trace() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/urlmon/tests/url.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 1521f8af99b..5e6792742ac 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -4181,7 +4181,7 @@ START_TEST(url) trace("emulated about test (to object)...\n"); test_BindToObject(ABOUT_TEST, BINDTEST_EMULATE, S_OK); - trace("emulalated test reporting result in read...\n"); + trace("emulated test reporting result in read...\n"); test_BindToStorage(WINETEST_SYNC_TEST, BINDTEST_EMULATE, TYMED_ISTREAM); trace("file test...\n");

1 0

Francois Gouget : win32u: Fix the spelling of a variable name.
by Alexandre Julliard 18 Jul '22

18 Jul '22

Module: wine Branch: master Commit: 7040cf17ff7ca3731d012adaa63ab4de22858425 URL: https://gitlab.winehq.org/wine/wine/-/commit/7040cf17ff7ca3731d012adaa63ab4… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 9 15:59:25 2022 +0200 win32u: Fix the spelling of a variable name. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/win32u/menu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/win32u/menu.c b/dlls/win32u/menu.c index c67d0e00615..2530c04241c 100644 --- a/dlls/win32u/menu.c +++ b/dlls/win32u/menu.c @@ -159,7 +159,7 @@ static HMENU top_popup_hmenu; static BOOL exit_menu = FALSE; static SIZE menucharsize; -static UINT od_item_hight; /* default owner drawn item height */ +static UINT od_item_height; /* default owner drawn item height */ /********************************************************************** * NtUserCopyAcceleratorTable (win32u.@) @@ -1986,7 +1986,7 @@ static void calc_menu_item_size( HDC hdc, struct menu_item *item, HWND owner, IN menucharsize.cx = get_char_dimensions( hdc, NULL, &menucharsize.cy ); /* Win95/98/ME will use menucharsize.cy here. Testing is possible * but it is unlikely an application will depend on that */ - od_item_hight = HIWORD( get_dialog_base_units() ); + od_item_height = HIWORD( get_dialog_base_units() ); } SetRect( &item->rect, org_x, org_y, org_x, org_y ); @@ -1998,7 +1998,7 @@ static void calc_menu_item_size( HDC hdc, struct menu_item *item, HWND owner, IN mis.CtlID = 0; mis.itemID = item->wID; mis.itemData = item->dwItemData; - mis.itemHeight = od_item_hight; + mis.itemHeight = od_item_height; mis.itemWidth = 0; send_message( owner, WM_MEASUREITEM, 0, (LPARAM)&mis ); /* Tests reveal that Windows ( Win95 through WinXP) adds twice the average

1 0

Francois Gouget : ntdll: Fix the spelling of a comment.
by Alexandre Julliard 18 Jul '22

18 Jul '22

Module: wine Branch: master Commit: 15831e0dcc76ced1adfda503da7fdc3237ceb595 URL: https://gitlab.winehq.org/wine/wine/-/commit/15831e0dcc76ced1adfda503da7fdc… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 9 15:58:51 2022 +0200 ntdll: Fix the spelling of a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/ntdll/heap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 40c317417ce..91a231e01b7 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -755,7 +755,7 @@ static void free_used_block( struct heap *heap, SUBHEAP *subheap, struct block * } else if (!heap->shared) { - /* keep room for a full commited block as hysteresis */ + /* keep room for a full committed block as hysteresis */ subheap_decommit( heap, subheap, (char *)(entry + 1) + (COMMIT_MASK + 1) ); } }

1 0

Francois Gouget : dbghelp: Fix the spelling of a comment.
by Alexandre Julliard 18 Jul '22

18 Jul '22

Module: wine Branch: master Commit: 188e8988abf80d6264e1b255d99a664cb3a75ba1 URL: https://gitlab.winehq.org/wine/wine/-/commit/188e8988abf80d6264e1b255d99a66… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 9 15:57:55 2022 +0200 dbghelp: Fix the spelling of a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/dbghelp/msc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index bec9dec2532..2fca1f229d1 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -803,7 +803,7 @@ static BOOL codeview_resolve_forward_type(struct codeview_type_parse* ctp, const unsigned hash; /* Unfortunately, hash of forward defs are computed on the whole type record, not its name - * (unlike hash of UDT & enum implementations which is based primarly on the name... sigh) + * (unlike hash of UDT & enum implementations which is based primarily on the name... sigh) * So compute the hash of the expected implementation. */ if (!codeview_type_extract_name(cvref, &nameref, &lenref, &decoratedref)) return FALSE;

1 0

Francois Gouget : urlmon/tests: Trace why the test file creation failed.
by Alexandre Julliard 18 Jul '22

18 Jul '22

Module: wine Branch: master Commit: 58b686090d38faaa5fa4cc9a464b1854d7a88aa6 URL: https://gitlab.winehq.org/wine/wine/-/commit/58b686090d38faaa5fa4cc9a464b18… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Jul 9 16:05:51 2022 +0200 urlmon/tests: Trace why the test file creation failed. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/urlmon/tests/url.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index cfd29910f35..1521f8af99b 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -3771,7 +3771,7 @@ static void create_file(const char *file_name, const char *content) file = CreateFileA(file_name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - ok(file != INVALID_HANDLE_VALUE, "CreateFile failed\n"); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed: %lu\n", GetLastError()); if(file == INVALID_HANDLE_VALUE) return;

1 0

Francois Gouget : advapi32/tests: Fix the print format, LARGE_INTEGER is signed.
by Alexandre Julliard 18 Jul '22

18 Jul '22

Module: wine Branch: master Commit: 321ec274d7a2bd8b7921b45aeba3233d28ae6453 URL: https://gitlab.winehq.org/wine/wine/-/commit/321ec274d7a2bd8b7921b45aeba323… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 17 23:13:01 2022 +0200 advapi32/tests: Fix the print format, LARGE_INTEGER is signed. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/advapi32/tests/registry.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 51e391fb134..df56b0968ee 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -3676,18 +3676,18 @@ static void test_performance_keys(void) ok(data->PerfTime.QuadPart >= perftime1.QuadPart && data->PerfTime.QuadPart <= perftime2.QuadPart, - "got times %I64u, %I64u, %I64u\n", + "got times %I64d, %I64d, %I64d\n", perftime1.QuadPart, data->PerfTime.QuadPart, perftime2.QuadPart); - ok(data->PerfFreq.QuadPart == freq.QuadPart, "expected frequency %I64u, got %I64u\n", + ok(data->PerfFreq.QuadPart == freq.QuadPart, "expected frequency %I64d, got %I64d\n", freq.QuadPart, data->PerfFreq.QuadPart); ok(data->PerfTime100nSec.QuadPart >= systime1.QuadPart && data->PerfTime100nSec.QuadPart <= systime2.QuadPart, - "got times %I64u, %I64u, %I64u\n", + "got times %I64d, %I64d, %I64d\n", systime1.QuadPart, data->PerfTime100nSec.QuadPart, systime2.QuadPart); SystemTimeToFileTime(&data->SystemTime, &file_time.f); /* SYSTEMTIME has a granularity of 1 ms */ ok(file_time.l >= systime1.QuadPart - 10000 && file_time.l <= systime2.QuadPart, - "got times %I64u, %I64u, %I64u\n", systime1.QuadPart, file_time.l, systime2.QuadPart); + "got times %I64d, %I64d, %I64d\n", systime1.QuadPart, file_time.l, systime2.QuadPart); ok(data->SystemNameLength == (sysname_len + 1) * sizeof(WCHAR), "expected name len %Iu, got %lu\n",

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
64
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2022