- Wine-Commits - list.winehq.org

Nikolay Sivov : oleaut32/recinfo: Use CRT allocation functions.
by Alexandre Julliard June 20, 2023

June 20, 2023

Module: wine Branch: master Commit: d9d665705e051852c76c36b5e91033de91eb71a9 URL: https://gitlab.winehq.org/wine/wine/-/commit/d9d665705e051852c76c36b5e91033… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 20 11:30:22 2023 +0200 oleaut32/recinfo: Use CRT allocation functions. --- dlls/oleaut32/recinfo.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/recinfo.c b/dlls/oleaut32/recinfo.c index 7d46d6c4299..7e1cb957af9 100644 --- a/dlls/oleaut32/recinfo.c +++ b/dlls/oleaut32/recinfo.c @@ -179,9 +179,9 @@ static ULONG WINAPI IRecordInfoImpl_Release(IRecordInfo *iface) for(i=0; i<This->n_vars; i++) SysFreeString(This->fields[i].name); SysFreeString(This->name); - HeapFree(GetProcessHeap(), 0, This->fields); + free(This->fields); ITypeInfo_Release(This->pTypeInfo); - HeapFree(GetProcessHeap(), 0, This); + free(This); } return ref; } @@ -667,7 +667,7 @@ HRESULT WINAPI GetRecordInfoFromTypeInfo(ITypeInfo* pTI, IRecordInfo** ppRecInfo return E_INVALIDARG; } - ret = HeapAlloc(GetProcessHeap(), 0, sizeof(*ret)); + ret = calloc(1, sizeof(*ret)); ret->IRecordInfo_iface.lpVtbl = &IRecordInfoImplVtbl; ret->ref = 1; ret->pTypeInfo = pTypeInfo; @@ -687,7 +687,7 @@ HRESULT WINAPI GetRecordInfoFromTypeInfo(ITypeInfo* pTI, IRecordInfo** ppRecInfo ret->name = NULL; } - ret->fields = HeapAlloc(GetProcessHeap(), 0, ret->n_vars*sizeof(fieldstr)); + ret->fields = calloc(ret->n_vars, sizeof(fieldstr)); for(i = 0; i<ret->n_vars; i++) { VARDESC *vardesc; hres = ITypeInfo_GetVarDesc(pTypeInfo, i, &vardesc);

1 0

Nikolay Sivov : oleaut32: Trace typelib guid in GetRecordInfoFromGuids().
by Alexandre Julliard June 20, 2023

June 20, 2023

Module: wine Branch: master Commit: 05aa7407871a9a940012bbe553ddebd7b0ef6fdd URL: https://gitlab.winehq.org/wine/wine/-/commit/05aa7407871a9a940012bbe553ddeb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 20 13:04:35 2023 +0200 oleaut32: Trace typelib guid in GetRecordInfoFromGuids(). --- dlls/oleaut32/recinfo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/recinfo.c b/dlls/oleaut32/recinfo.c index 8b6d61adc69..2b1565873d4 100644 --- a/dlls/oleaut32/recinfo.c +++ b/dlls/oleaut32/recinfo.c @@ -595,7 +595,7 @@ HRESULT WINAPI GetRecordInfoFromGuids(REFGUID rGuidTypeLib, ULONG uVerMajor, ITypeLib *pTypeLib; HRESULT hres; - TRACE("%p, %lu, %lu, %#lx, %s, %p.\n", rGuidTypeLib, uVerMajor, uVerMinor, + TRACE("%s, %lu, %lu, %#lx, %s, %p.\n", debugstr_guid(rGuidTypeLib), uVerMajor, uVerMinor, lcid, debugstr_guid(rGuidTypeInfo), ppRecInfo); hres = LoadRegTypeLib(rGuidTypeLib, uVerMajor, uVerMinor, lcid, &pTypeLib);

1 0

Alex Henrie : wbemprox: Fix memory leak on error path in enum_key (scan-build).
by Alexandre Julliard June 20, 2023

June 20, 2023

Module: wine Branch: master Commit: 078f4dcd44d432dcb8db59612f34d24d41796373 URL: https://gitlab.winehq.org/wine/wine/-/commit/078f4dcd44d432dcb8db59612f34d2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jun 18 22:34:21 2023 -0600 wbemprox: Fix memory leak on error path in enum_key (scan-build). --- dlls/wbemprox/reg.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wbemprox/reg.c b/dlls/wbemprox/reg.c index cd7db81aed7..cdfb5d28007 100644 --- a/dlls/wbemprox/reg.c +++ b/dlls/wbemprox/reg.c @@ -186,6 +186,7 @@ static HRESULT enum_key( HKEY root, const WCHAR *subkey, VARIANT *names, IWbemCo if (!(tmp = realloc( strings, count * sizeof(BSTR) ))) { RegCloseKey( hkey ); + free( strings ); return E_OUTOFMEMORY; } strings = tmp;

1 0

Alexandre Julliard : wordpad: Use nameless unions/structs.
by Alexandre Julliard June 20, 2023

June 20, 2023

Module: wine Branch: master Commit: c938f92e4c76744a2ee4d584d0587fbf1b696c3a URL: https://gitlab.winehq.org/wine/wine/-/commit/c938f92e4c76744a2ee4d584d0587f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 30 11:22:37 2023 +0200 wordpad: Use nameless unions/structs. --- programs/wordpad/wordpad.c | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 2a0d380a101..ed55a1d2268 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -37,16 +37,6 @@ #include "wordpad.h" -#ifdef NONAMELESSUNION -# define U(x) (x).u -# define U2(x) (x).u2 -# define U3(x) (x).u3 -#else -# define U(x) (x) -# define U2(x) (x) -# define U3(x) (x) -#endif - /* use LoadString */ static const WCHAR wszAppTitle[] = {'W','i','n','e',' ','W','o','r','d','p','a','d',0}; @@ -1180,7 +1170,7 @@ static void dialog_viewproperties(void) psp[0].dwSize = sizeof(PROPSHEETPAGEW); psp[0].dwFlags = PSP_USETITLE; - U(psp[0]).pszTemplate = MAKEINTRESOURCEW(IDD_FORMATOPTS); + psp[0].pszTemplate = MAKEINTRESOURCEW(IDD_FORMATOPTS); psp[0].pfnDlgProc = formatopts_proc; psp[0].hInstance = hInstance; psp[0].lParam = reg_formatindex(SF_TEXT); @@ -1190,7 +1180,7 @@ static void dialog_viewproperties(void) { psp[i].dwSize = psp[0].dwSize; psp[i].dwFlags = psp[0].dwFlags; - U(psp[i]).pszTemplate = U(psp[0]).pszTemplate; + psp[i].pszTemplate = psp[0].pszTemplate; psp[i].pfnDlgProc = psp[0].pfnDlgProc; psp[i].hInstance = psp[0].hInstance; psp[i].lParam = reg_formatindex(SF_RTF); @@ -1204,13 +1194,13 @@ static void dialog_viewproperties(void) psh.hInstance = hInstance; psh.pszCaption = MAKEINTRESOURCEW(STRING_VIEWPROPS_TITLE); psh.nPages = ARRAY_SIZE(psp); - U3(psh).ppsp = ppsp; - U(psh).pszIcon = MAKEINTRESOURCEW(IDI_WORDPAD); + psh.ppsp = ppsp; + psh.pszIcon = MAKEINTRESOURCEW(IDI_WORDPAD); if(fileFormat & SF_RTF) - U2(psh).nStartPage = 1; + psh.nStartPage = 1; else - U2(psh).nStartPage = 0; + psh.nStartPage = 0; PropertySheetW(&psh); set_bar_states(); target_device(hMainWnd, wordWrap[reg_formatindex(fileFormat)]);

1 0

Alexandre Julliard : winhlp32: Use nameless unions/structs.
by Alexandre Julliard June 20, 2023

June 20, 2023

Module: wine Branch: master Commit: 35299b39cbea8d62093acabf1106829f7f7707d3 URL: https://gitlab.winehq.org/wine/wine/-/commit/35299b39cbea8d62093acabf110682… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 16 17:59:58 2023 +0200 winhlp32: Use nameless unions/structs. --- programs/winhlp32/winhelp.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index 037d319f290..d648cab7982 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -28,8 +28,6 @@ #include <stdarg.h> #include <stdlib.h> -#define NONAMELESSUNION - #include "windef.h" #include "winbase.h" #include "wingdi.h" @@ -1565,12 +1563,12 @@ BOOL WINHELP_CreateIndexWindow(BOOL is_search) psp.dwFlags = 0; psp.hInstance = Globals.hInstance; - psp.u.pszTemplate = MAKEINTRESOURCEA(IDD_INDEX); + psp.pszTemplate = MAKEINTRESOURCEA(IDD_INDEX); psp.lParam = (LPARAM)&id; psp.pfnDlgProc = WINHELP_IndexDlgProc; psPage[0] = CreatePropertySheetPageA(&psp); - psp.u.pszTemplate = MAKEINTRESOURCEA(IDD_SEARCH); + psp.pszTemplate = MAKEINTRESOURCEA(IDD_SEARCH); psp.lParam = (LPARAM)&id; psp.pfnDlgProc = WINHELP_SearchDlgProc; psPage[1] = CreatePropertySheetPageA(&psp); @@ -1583,9 +1581,9 @@ BOOL WINHELP_CreateIndexWindow(BOOL is_search) psHead.pszCaption = buf; psHead.nPages = 2; - psHead.u2.nStartPage = is_search ? 1 : 0; + psHead.nStartPage = is_search ? 1 : 0; psHead.hwndParent = Globals.active_win->hMainWnd; - psHead.u3.phpage = psPage; + psHead.phpage = psPage; psHead.dwFlags = PSH_NOAPPLYNOW; PropertySheetA(&psHead);

1 0

Alexandre Julliard : winedbg: Use nameless unions/structs.
by Alexandre Julliard June 20, 2023

June 20, 2023

Module: wine Branch: master Commit: f20710d9b32ea5366297729c3f82fe7b20a528e1 URL: https://gitlab.winehq.org/wine/wine/-/commit/f20710d9b32ea5366297729c3f82fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 16 17:59:35 2023 +0200 winedbg: Use nameless unions/structs. --- programs/winedbg/be_arm64.c | 148 ++++++++++++++++---------------- programs/winedbg/be_x86_64.c | 185 ++++++++++++++++++++-------------------- programs/winedbg/debugger.h | 2 - programs/winedbg/gdbproxy.c | 3 - programs/winedbg/tgt_minidump.c | 29 +++---- 5 files changed, 178 insertions(+), 189 deletions(-)

1 0

Alexandre Julliard : winefile: Use nameless unions/structs.
by Alexandre Julliard June 20, 2023

June 20, 2023

Module: wine Branch: master Commit: 63f94c4925e25e853f2f2580f0015f53ac9e777a URL: https://gitlab.winehq.org/wine/wine/-/commit/63f94c4925e25e853f2f2580f0015f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 30 11:22:22 2023 +0200 winefile: Use nameless unions/structs. --- programs/winefile/winefile.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 6d18954e05a..018da337d11 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -26,12 +26,6 @@ #include "winefile.h" #include "resource.h" -#ifdef NONAMELESSUNION -#define UNION_MEMBER(x) DUMMYUNIONNAME.x -#else -#define UNION_MEMBER(x) x -#endif - #define DEFAULT_SPLIT_POS 300 static const WCHAR registry_key[] = { 'S','o','f','t','w','a','r','e','\\', @@ -449,7 +443,7 @@ static Entry* read_tree_win(Root* root, LPCWSTR path, SORT_ORDER sortOrder, HWND static void free_strret(STRRET* str) { if (str->uType == STRRET_WSTR) - IMalloc_Free(Globals.iMalloc, str->UNION_MEMBER(pOleStr)); + IMalloc_Free(Globals.iMalloc, str->pOleStr); } static LPWSTR wcscpyn(LPWSTR dest, LPCWSTR source, size_t count) @@ -467,15 +461,15 @@ static void get_strretW(STRRET* str, const SHITEMID* shiid, LPWSTR buffer, int l { switch(str->uType) { case STRRET_WSTR: - wcscpyn(buffer, str->UNION_MEMBER(pOleStr), len); + wcscpyn(buffer, str->pOleStr, len); break; case STRRET_OFFSET: - MultiByteToWideChar(CP_ACP, 0, (LPCSTR)shiid+str->UNION_MEMBER(uOffset), -1, buffer, len); + MultiByteToWideChar(CP_ACP, 0, (LPCSTR)shiid+str->uOffset, -1, buffer, len); break; case STRRET_CSTR: - MultiByteToWideChar(CP_ACP, 0, str->UNION_MEMBER(cStr), -1, buffer, len); + MultiByteToWideChar(CP_ACP, 0, str->cStr, -1, buffer, len); } } @@ -673,7 +667,7 @@ static void fill_w32fdata_shell(IShellFolder* folder, LPCITEMIDLIST pidl, SFGAOF IDataObject_Release(pDataObj); if (SUCCEEDED(hr)) { - LPCWSTR path = GlobalLock(medium.UNION_MEMBER(hGlobal)); + LPCWSTR path = GlobalLock(medium.hGlobal); UINT sem_org = SetErrorMode(SEM_FAILCRITICALERRORS); if (GetFileAttributesExW(path, GetFileExInfoStandard, &fad)) { @@ -690,8 +684,8 @@ static void fill_w32fdata_shell(IShellFolder* folder, LPCITEMIDLIST pidl, SFGAOF SetErrorMode(sem_org); - GlobalUnlock(medium.UNION_MEMBER(hGlobal)); - GlobalFree(medium.UNION_MEMBER(hGlobal)); + GlobalUnlock(medium.hGlobal); + GlobalFree(medium.hGlobal); } } }

1 0

Alexandre Julliard : winemenubuilder: Use nameless unions/structs.
by Alexandre Julliard June 20, 2023

June 20, 2023

Module: wine Branch: master Commit: 6c9246e022af77f3d71fc190a95a97bb7a7493de URL: https://gitlab.winehq.org/wine/wine/-/commit/6c9246e022af77f3d71fc190a95a97… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 16 17:59:47 2023 +0200 winemenubuilder: Use nameless unions/structs. --- programs/winemenubuilder/winemenubuilder.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index ae657d87bb1..c16d22e2a57 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -69,8 +69,6 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSUNION - #include <windows.h> #include <winternl.h> #include <shlobj.h> @@ -2364,9 +2362,9 @@ static BOOL InvokeShellLinkerForURL( IUniformResourceLocatorW *url, LPCWSTR link WINE_TRACE("path : %s\n", wine_dbgstr_w(urlPath)); ps[0].ulKind = PRSPEC_PROPID; - ps[0].u.propid = PID_IS_ICONFILE; + ps[0].propid = PID_IS_ICONFILE; ps[1].ulKind = PRSPEC_PROPID; - ps[1].u.propid = PID_IS_ICONINDEX; + ps[1].propid = PID_IS_ICONINDEX; hr = url->lpVtbl->QueryInterface(url, &IID_IPropertySetStorage, (void **) &pPropSetStg); if (SUCCEEDED(hr))

1 0

Alexandre Julliard : winecfg: Use nameless unions/structs.
by Alexandre Julliard June 20, 2023

June 20, 2023

Module: wine Branch: master Commit: 4368bd8e601e306610474472b8c3238cbff5309b URL: https://gitlab.winehq.org/wine/wine/-/commit/4368bd8e601e306610474472b8c323… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 16 17:59:16 2023 +0200 winecfg: Use nameless unions/structs. --- programs/winecfg/audio.c | 1 - programs/winecfg/main.c | 35 +++++++++++++++++------------------ 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c index 0112a897245..a5065ee5c21 100644 --- a/programs/winecfg/audio.c +++ b/programs/winecfg/audio.c @@ -20,7 +20,6 @@ */ #define WIN32_LEAN_AND_MEAN -#define NONAMELESSUNION #include <assert.h> #include <stdlib.h> diff --git a/programs/winecfg/main.c b/programs/winecfg/main.c index 67df9146f3d..d218d79770c 100644 --- a/programs/winecfg/main.c +++ b/programs/winecfg/main.c @@ -22,7 +22,6 @@ */ #define WIN32_LEAN_AND_MEAN -#define NONAMELESSUNION #include <windows.h> #include <commctrl.h> @@ -74,8 +73,8 @@ doPropertySheet (HINSTANCE hInstance, HWND hOwner) psp[pg].dwSize = sizeof (PROPSHEETPAGEW); psp[pg].dwFlags = PSP_USETITLE; psp[pg].hInstance = hInstance; - psp[pg].u.pszTemplate = MAKEINTRESOURCEW (IDD_APPCFG); - psp[pg].u2.pszIcon = NULL; + psp[pg].pszTemplate = MAKEINTRESOURCEW (IDD_APPCFG); + psp[pg].pszIcon = NULL; psp[pg].pfnDlgProc = AppDlgProc; psp[pg].pszTitle = load_string (IDS_TAB_APPLICATIONS); psp[pg].lParam = 0; @@ -88,8 +87,8 @@ doPropertySheet (HINSTANCE hInstance, HWND hOwner) psp[pg].dwSize = sizeof (PROPSHEETPAGEW); psp[pg].dwFlags = PSP_USETITLE; psp[pg].hInstance = hInstance; - psp[pg].u.pszTemplate = MAKEINTRESOURCEW (IDD_DLLCFG); - psp[pg].u2.pszIcon = NULL; + psp[pg].pszTemplate = MAKEINTRESOURCEW (IDD_DLLCFG); + psp[pg].pszIcon = NULL; psp[pg].pfnDlgProc = LibrariesDlgProc; psp[pg].pszTitle = load_string (IDS_TAB_DLLS); psp[pg].lParam = 0; @@ -102,8 +101,8 @@ doPropertySheet (HINSTANCE hInstance, HWND hOwner) psp[pg].dwSize = sizeof (PROPSHEETPAGEW); psp[pg].dwFlags = PSP_USETITLE; psp[pg].hInstance = hInstance; - psp[pg].u.pszTemplate = MAKEINTRESOURCEW (IDD_GRAPHCFG); - psp[pg].u2.pszIcon = NULL; + psp[pg].pszTemplate = MAKEINTRESOURCEW (IDD_GRAPHCFG); + psp[pg].pszIcon = NULL; psp[pg].pfnDlgProc = GraphDlgProc; psp[pg].pszTitle = load_string (IDS_TAB_GRAPHICS); psp[pg].lParam = 0; @@ -112,8 +111,8 @@ doPropertySheet (HINSTANCE hInstance, HWND hOwner) psp[pg].dwSize = sizeof (PROPSHEETPAGEW); psp[pg].dwFlags = PSP_USETITLE; psp[pg].hInstance = hInstance; - psp[pg].u.pszTemplate = MAKEINTRESOURCEW (IDD_DESKTOP_INTEGRATION); - psp[pg].u2.pszIcon = NULL; + psp[pg].pszTemplate = MAKEINTRESOURCEW (IDD_DESKTOP_INTEGRATION); + psp[pg].pszIcon = NULL; psp[pg].pfnDlgProc = ThemeDlgProc; psp[pg].pszTitle = load_string (IDS_TAB_DESKTOP_INTEGRATION); psp[pg].lParam = 0; @@ -122,8 +121,8 @@ doPropertySheet (HINSTANCE hInstance, HWND hOwner) psp[pg].dwSize = sizeof (PROPSHEETPAGEW); psp[pg].dwFlags = PSP_USETITLE; psp[pg].hInstance = hInstance; - psp[pg].u.pszTemplate = MAKEINTRESOURCEW (IDD_DRIVECFG); - psp[pg].u2.pszIcon = NULL; + psp[pg].pszTemplate = MAKEINTRESOURCEW (IDD_DRIVECFG); + psp[pg].pszIcon = NULL; psp[pg].pfnDlgProc = DriveDlgProc; psp[pg].pszTitle = load_string (IDS_TAB_DRIVES); psp[pg].lParam = 0; @@ -132,8 +131,8 @@ doPropertySheet (HINSTANCE hInstance, HWND hOwner) psp[pg].dwSize = sizeof (PROPSHEETPAGEW); psp[pg].dwFlags = PSP_USETITLE; psp[pg].hInstance = hInstance; - psp[pg].u.pszTemplate = MAKEINTRESOURCEW (IDD_AUDIOCFG); - psp[pg].u2.pszIcon = NULL; + psp[pg].pszTemplate = MAKEINTRESOURCEW (IDD_AUDIOCFG); + psp[pg].pszIcon = NULL; psp[pg].pfnDlgProc = AudioDlgProc; psp[pg].pszTitle = load_string (IDS_TAB_AUDIO); psp[pg].lParam = 0; @@ -146,8 +145,8 @@ doPropertySheet (HINSTANCE hInstance, HWND hOwner) psp[pg].dwSize = sizeof (PROPSHEETPAGEW); psp[pg].dwFlags = PSP_USETITLE; psp[pg].hInstance = hInstance; - psp[pg].u.pszTemplate = MAKEINTRESOURCEW (IDD_ABOUTCFG); - psp[pg].u2.pszIcon = NULL; + psp[pg].pszTemplate = MAKEINTRESOURCEW (IDD_ABOUTCFG); + psp[pg].pszIcon = NULL; psp[pg].pfnDlgProc = AboutDlgProc; psp[pg].pszTitle = load_string (IDS_TAB_ABOUT); psp[pg].lParam = 0; @@ -160,12 +159,12 @@ doPropertySheet (HINSTANCE hInstance, HWND hOwner) psh.dwFlags = PSH_PROPSHEETPAGE | PSH_USEICONID | PSH_USECALLBACK; psh.hwndParent = hOwner; psh.hInstance = hInstance; - psh.u.pszIcon = MAKEINTRESOURCEW (IDI_WINECFG); + psh.pszIcon = MAKEINTRESOURCEW (IDI_WINECFG); psh.pszCaption = load_string (IDS_WINECFG_TITLE); psh.nPages = NUM_PROPERTY_PAGES; - psh.u3.ppsp = psp; + psh.ppsp = psp; psh.pfnCallback = PropSheetCallback; - psh.u2.nStartPage = 0; + psh.nStartPage = 0; /* * Display the modal property sheet

1 0

Rémi Bernon : winegstreamer: Remove the callback mechanism from wg_allocator.
by Alexandre Julliard June 19, 2023

June 19, 2023

Module: wine Branch: master Commit: ca20e06051533aea70200e345cea6a79c072a634 URL: https://gitlab.winehq.org/wine/wine/-/commit/ca20e06051533aea70200e345cea6a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Jun 17 10:46:38 2023 +0200 winegstreamer: Remove the callback mechanism from wg_allocator. --- dlls/winegstreamer/unix_private.h | 4 ++-- dlls/winegstreamer/wg_allocator.c | 37 ++++++++++++++++++++++++++----------- dlls/winegstreamer/wg_transform.c | 21 ++++----------------- 3 files changed, 32 insertions(+), 30 deletions(-) diff --git a/dlls/winegstreamer/unix_private.h b/dlls/winegstreamer/unix_private.h index 808b59dba57..f1847eb27ef 100644 --- a/dlls/winegstreamer/unix_private.h +++ b/dlls/winegstreamer/unix_private.h @@ -60,9 +60,9 @@ extern NTSTATUS wg_transform_flush(void *args) DECLSPEC_HIDDEN; /* wg_allocator_release_sample can be used to release any sample that was requested. */ typedef struct wg_sample *(*wg_allocator_request_sample_cb)(gsize size, void *context); -extern GstAllocator *wg_allocator_create(wg_allocator_request_sample_cb request_sample, - void *request_sample_context) DECLSPEC_HIDDEN; +extern GstAllocator *wg_allocator_create(void) DECLSPEC_HIDDEN; extern void wg_allocator_destroy(GstAllocator *allocator) DECLSPEC_HIDDEN; +extern void wg_allocator_provide_sample(GstAllocator *allocator, struct wg_sample *sample) DECLSPEC_HIDDEN; extern void wg_allocator_release_sample(GstAllocator *allocator, struct wg_sample *sample, bool discard_data) DECLSPEC_HIDDEN; diff --git a/dlls/winegstreamer/wg_allocator.c b/dlls/winegstreamer/wg_allocator.c index 14550ad8bcc..fd940d5961e 100644 --- a/dlls/winegstreamer/wg_allocator.c +++ b/dlls/winegstreamer/wg_allocator.c @@ -51,12 +51,11 @@ typedef struct { GstAllocator parent; - wg_allocator_request_sample_cb request_sample; - void *request_sample_context; - pthread_mutex_t mutex; pthread_cond_t release_cond; struct list memory_list; + + struct wg_sample *next_sample; } WgAllocator; typedef struct @@ -147,7 +146,6 @@ static GstMemory *wg_allocator_alloc(GstAllocator *gst_allocator, gsize size, GstAllocationParams *params) { WgAllocator *allocator = (WgAllocator *)gst_allocator; - struct wg_sample *sample; WgMemory *memory; GST_LOG("allocator %p, size %#zx, params %p", allocator, size, params); @@ -160,11 +158,11 @@ static GstMemory *wg_allocator_alloc(GstAllocator *gst_allocator, gsize size, pthread_mutex_lock(&allocator->mutex); - sample = allocator->request_sample(size, allocator->request_sample_context); - if (sample && sample->max_size < size) - InterlockedDecrement(&sample->refcount); + memory->sample = allocator->next_sample; + if (memory->sample && memory->sample->max_size >= size) + allocator->next_sample = NULL; else - memory->sample = sample; + memory->sample = NULL; list_add_tail(&allocator->memory_list, &memory->entry); @@ -209,15 +207,13 @@ static void wg_allocator_class_init(WgAllocatorClass *klass) root_class->finalize = wg_allocator_finalize; } -GstAllocator *wg_allocator_create(wg_allocator_request_sample_cb request_sample, void *request_sample_context) +GstAllocator *wg_allocator_create(void) { WgAllocator *allocator; if (!(allocator = g_object_new(wg_allocator_get_type(), NULL))) return NULL; - allocator->request_sample = request_sample; - allocator->request_sample_context = request_sample_context; return GST_ALLOCATOR(allocator); } @@ -273,6 +269,25 @@ static WgMemory *find_sample_memory(WgAllocator *allocator, struct wg_sample *sa return NULL; } +void wg_allocator_provide_sample(GstAllocator *gst_allocator, struct wg_sample *sample) +{ + WgAllocator *allocator = (WgAllocator *)gst_allocator; + struct wg_sample *previous; + + GST_LOG("allocator %p, sample %p", allocator, sample); + + if (sample) + InterlockedIncrement(&sample->refcount); + + pthread_mutex_lock(&allocator->mutex); + previous = allocator->next_sample; + allocator->next_sample = sample; + pthread_mutex_unlock(&allocator->mutex); + + if (previous) + InterlockedDecrement(&previous->refcount); +} + void wg_allocator_release_sample(GstAllocator *gst_allocator, struct wg_sample *sample, bool discard_data) { diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index d6218af04b9..01c7aad1268 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -57,7 +57,6 @@ struct wg_transform GstElement *video_flip; struct wg_format output_format; - struct wg_sample *output_wg_sample; GstAtomicQueue *output_queue; GstSample *output_sample; bool output_caps_changed; @@ -281,15 +280,6 @@ NTSTATUS wg_transform_destroy(void *args) return STATUS_SUCCESS; } -static struct wg_sample *transform_request_sample(gsize size, void *context) -{ - struct wg_transform *transform = context; - - GST_LOG("size %#zx, context %p", size, transform); - - return InterlockedExchangePointer((void **)&transform->output_wg_sample, NULL); -} - static bool wg_format_video_is_flipped(const struct wg_format *format) { return format->major_type == WG_MAJOR_TYPE_VIDEO && (format->u.video.height < 0); @@ -318,7 +308,7 @@ NTSTATUS wg_transform_create(void *args) goto out; if (!(transform->drain_query = gst_query_new_drain())) goto out; - if (!(transform->allocator = wg_allocator_create(transform_request_sample, transform))) + if (!(transform->allocator = wg_allocator_create())) goto out; transform->attrs = *params->attrs; transform->output_format = output_format; @@ -762,9 +752,7 @@ static bool get_transform_output(struct wg_transform *transform, struct wg_sampl GstBuffer *input_buffer; GstFlowReturn ret; - /* Provide the sample for transform_request_sample to pick it up */ - InterlockedIncrement(&sample->refcount); - InterlockedExchangePointer((void **)&transform->output_wg_sample, sample); + wg_allocator_provide_sample(transform->allocator, sample); while (!(transform->output_sample = gst_atomic_queue_pop(transform->output_queue)) && (input_buffer = gst_atomic_queue_pop(transform->input_queue))) @@ -773,9 +761,8 @@ static bool get_transform_output(struct wg_transform *transform, struct wg_sampl GST_WARNING("Failed to push transform input, error %d", ret); } - /* Remove the sample so transform_request_sample cannot use it */ - if (InterlockedExchangePointer((void **)&transform->output_wg_sample, NULL)) - InterlockedDecrement(&sample->refcount); + /* Remove the sample so the allocator cannot use it */ + wg_allocator_provide_sample(transform->allocator, NULL); return !!transform->output_sample; }

1 0