December 2023 - Wine-commits

Vijay Kiran Kamuju : dsdmo: Add Gargle effect stub.
by Alexandre Julliard 04 Dec '23

04 Dec '23

Module: wine Branch: master Commit: d37f0892bee3399a7e2c857281b7240ae3d60857 URL: https://gitlab.winehq.org/wine/wine/-/commit/d37f0892bee3399a7e2c857281b724… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sat Dec 2 16:38:42 2023 +0100 dsdmo: Add Gargle effect stub. --- dlls/dsdmo/dsdmo.idl | 8 ++++ dlls/dsdmo/main.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/dsdmo/tests/dsdmo.c | 12 +++--- 3 files changed, 109 insertions(+), 6 deletions(-) diff --git a/dlls/dsdmo/dsdmo.idl b/dlls/dsdmo/dsdmo.idl index df76ac15e96..d1a0765fcf4 100644 --- a/dlls/dsdmo/dsdmo.idl +++ b/dlls/dsdmo/dsdmo.idl @@ -81,3 +81,11 @@ coclass DirectSoundFlangerDMO {} vi_progid("Microsoft.DirectSoundDistortionDMO") ] coclass DirectSoundDistortionDMO {} + +[ + uuid(dafd8210-5711-4b91-9fe3-f75b7ae279bf), + threading(both), + progid("Microsoft.DirectSoundGargleDMO.1"), + vi_progid("Microsoft.DirectSoundGargleDMO") +] +coclass DirectSoundGargleDMO {} diff --git a/dlls/dsdmo/main.c b/dlls/dsdmo/main.c index 5c667816d81..77345b1b5d1 100644 --- a/dlls/dsdmo/main.c +++ b/dlls/dsdmo/main.c @@ -1433,6 +1433,100 @@ static HRESULT distortion_create(IUnknown *outer, IUnknown **out) return S_OK; } +struct gargle +{ + struct effect effect; + IDirectSoundFXGargle IDirectSoundFXGargle_iface; +}; + +static inline struct gargle *impl_from_IDirectSoundFXGargle(IDirectSoundFXGargle *iface) +{ + return CONTAINING_RECORD(iface, struct gargle, IDirectSoundFXGargle_iface); +} + +static HRESULT WINAPI gargle_QueryInterface(IDirectSoundFXGargle *iface, REFIID iid, void **out) +{ + struct gargle *effect = impl_from_IDirectSoundFXGargle(iface); + return IUnknown_QueryInterface(effect->effect.outer_unk, iid, out); +} + +static ULONG WINAPI gargle_AddRef(IDirectSoundFXGargle *iface) +{ + struct gargle *effect = impl_from_IDirectSoundFXGargle(iface); + return IUnknown_AddRef(effect->effect.outer_unk); +} + +static ULONG WINAPI gargle_Release(IDirectSoundFXGargle *iface) +{ + struct gargle *effect = impl_from_IDirectSoundFXGargle(iface); + return IUnknown_Release(effect->effect.outer_unk); +} + +static HRESULT WINAPI gargle_SetAllParameters(IDirectSoundFXGargle *iface, const DSFXGargle *params) +{ + struct gargle *This = impl_from_IDirectSoundFXGargle(iface); + FIXME("(%p) %p\n", This, params); + return E_NOTIMPL; +} + +static HRESULT WINAPI gargle_GetAllParameters(IDirectSoundFXGargle *iface, DSFXGargle *params) +{ + struct gargle *This = impl_from_IDirectSoundFXGargle(iface); + FIXME("(%p) %p\n", This, params); + return E_NOTIMPL; +} + +static const struct IDirectSoundFXGargleVtbl gargle_vtbl = +{ + gargle_QueryInterface, + gargle_AddRef, + gargle_Release, + gargle_SetAllParameters, + gargle_GetAllParameters +}; + +static struct gargle *impl_gargle_from_effect(struct effect *iface) +{ + return CONTAINING_RECORD(iface, struct gargle, effect); +} + +static void *gargle_query_interface(struct effect *iface, REFIID iid) +{ + struct gargle *effect = impl_gargle_from_effect(iface); + + if (IsEqualGUID(iid, &IID_IDirectSoundFXGargle)) + return &effect->IDirectSoundFXGargle_iface; + return NULL; +} + +static void gargle_destroy(struct effect *iface) +{ + struct gargle *effect = impl_gargle_from_effect(iface); + + free(effect); +} + +static const struct effect_ops gargle_ops = +{ + .destroy = gargle_destroy, + .query_interface = gargle_query_interface, +}; + +static HRESULT gargle_create(IUnknown *outer, IUnknown **out) +{ + struct gargle *object; + + if (!(object = calloc(1, sizeof(*object)))) + return E_OUTOFMEMORY; + + effect_init(&object->effect, outer, &gargle_ops); + object->IDirectSoundFXGargle_iface.lpVtbl = &gargle_vtbl; + + TRACE("Created gargle effect %p.\n", object); + *out = &object->effect.IUnknown_inner; + return S_OK; +} + struct class_factory { IClassFactory IClassFactory_iface; @@ -1522,6 +1616,7 @@ class_factories[] = {&GUID_DSFX_STANDARD_CHORUS, {{&class_factory_vtbl}, chorus_create}}, {&GUID_DSFX_STANDARD_FLANGER, {{&class_factory_vtbl}, flanger_create}}, {&GUID_DSFX_STANDARD_DISTORTION, {{&class_factory_vtbl}, distortion_create}}, + {&GUID_DSFX_STANDARD_GARGLE, {{&class_factory_vtbl}, gargle_create}}, }; HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, void **out) diff --git a/dlls/dsdmo/tests/dsdmo.c b/dlls/dsdmo/tests/dsdmo.c index a3eb5a7d864..6b486f62d23 100644 --- a/dlls/dsdmo/tests/dsdmo.c +++ b/dlls/dsdmo/tests/dsdmo.c @@ -446,12 +446,14 @@ static void test_gargle_parameters(void) hr = CoCreateInstance(&GUID_DSFX_STANDARD_GARGLE, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectSoundFXGargle, (void **)&gargle); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); if (hr != S_OK) return; hr = IDirectSoundFXGargle_GetAllParameters(gargle, &params); - ok(hr == S_OK, "Got hr %#lx.\n", hr); + todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); + if (hr != S_OK) + return; ok(params.dwRateHz == 20, "Got rate %lu Hz.\n", params.dwRateHz); ok(params.dwWaveShape == DSFXGARGLE_WAVE_TRIANGLE, "Got wave shape %lu.\n", params.dwWaveShape); @@ -548,7 +550,6 @@ START_TEST(dsdmo) { const GUID *clsid; const GUID *iid; - BOOL todo; } tests[] = { @@ -557,7 +558,7 @@ START_TEST(dsdmo) {&GUID_DSFX_STANDARD_DISTORTION, &IID_IDirectSoundFXDistortion}, {&GUID_DSFX_STANDARD_ECHO, &IID_IDirectSoundFXEcho}, {&GUID_DSFX_STANDARD_FLANGER, &IID_IDirectSoundFXFlanger}, - {&GUID_DSFX_STANDARD_GARGLE, &IID_IDirectSoundFXGargle, TRUE}, + {&GUID_DSFX_STANDARD_GARGLE, &IID_IDirectSoundFXGargle}, {&GUID_DSFX_STANDARD_I3DL2REVERB, &IID_IDirectSoundFXI3DL2Reverb}, {&GUID_DSFX_STANDARD_PARAMEQ, &IID_IDirectSoundFXParamEq}, {&GUID_DSFX_WAVES_REVERB, &IID_IDirectSoundFXWavesReverb}, @@ -572,8 +573,7 @@ START_TEST(dsdmo) HRESULT hr; hr = CoCreateInstance(tests[i].clsid, NULL, CLSCTX_INPROC_SERVER, tests[i].iid, (void **)&unk); - todo_wine_if(tests[i].todo) ok(hr == S_OK, "Failed to create %s, hr %#lx.\n", - debugstr_guid(tests[i].clsid), hr); + ok(hr == S_OK, "For clsid %s, got hr %#lx.\n", debugstr_guid(tests[i].clsid), hr); if (hr == S_OK) IUnknown_Release(unk); else

1 0

Alex Henrie : ole32/tests: Free what get_stgdef returns in test_OleCreateStaticFromData.
by Alexandre Julliard 04 Dec '23

04 Dec '23

Module: wine Branch: master Commit: 3bda0653743928f051a17703a010d2d59d955de3 URL: https://gitlab.winehq.org/wine/wine/-/commit/3bda0653743928f051a17703a010d2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 4 00:03:18 2023 -0700 ole32/tests: Free what get_stgdef returns in test_OleCreateStaticFromData. --- dlls/ole32/tests/ole2.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 5c32ee6c142..61bca7682f6 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -4549,6 +4549,7 @@ static void test_OleCreateStaticFromData(void) IPersist_Release(persist); IStorage_Release(storage); IOleObject_Release(ole_obj); + HeapFree(GetProcessHeap(), 0, (void *)stg_def_dib.stream[2].data); /* CF_ENHMETAFILE */ hr = CreateILockBytesOnHGlobal(NULL, TRUE, &ilb); @@ -4582,6 +4583,7 @@ static void test_OleCreateStaticFromData(void) IPersist_Release(persist); IStorage_Release(storage); IOleObject_Release(ole_obj); + HeapFree(GetProcessHeap(), 0, (void *)stg_def_emf.stream[2].data); /* CF_TEXT */ hr = CreateILockBytesOnHGlobal(NULL, TRUE, &ilb);

1 0

Alex Henrie : ole32/tests: Use CRT allocation functions.
by Alexandre Julliard 04 Dec '23

04 Dec '23

Module: wine Branch: master Commit: 93db373c286157b2d2c6dd478877528a9fb1265d URL: https://gitlab.winehq.org/wine/wine/-/commit/93db373c286157b2d2c6dd47887752… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 4 00:03:18 2023 -0700 ole32/tests: Use CRT allocation functions. --- dlls/ole32/tests/clipboard.c | 28 +++++------ dlls/ole32/tests/compobj.c | 4 +- dlls/ole32/tests/marshal.c | 13 +++--- dlls/ole32/tests/moniker.c | 11 ++--- dlls/ole32/tests/ole2.c | 34 +++++++------- dlls/ole32/tests/ole_server.c | 4 +- dlls/ole32/tests/propvariant.c | 6 +-- dlls/ole32/tests/storage32.c | 12 ++--- dlls/ole32/tests/usrmarshal.c | 104 ++++++++++++++++++++--------------------- 9 files changed, 107 insertions(+), 109 deletions(-)

1 0

Zhiyi Zhang : winegstreamer: Fix a memory leak (Coverity).
by Alexandre Julliard 04 Dec '23

04 Dec '23

Module: wine Branch: master Commit: c1fa6be453f4bf7cfdc3237c40f4b64e8daa7a73 URL: https://gitlab.winehq.org/wine/wine/-/commit/c1fa6be453f4bf7cfdc3237c40f4b6… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sat Dec 2 23:10:55 2023 +0800 winegstreamer: Fix a memory leak (Coverity). video_format can be leaked when encountering an invalid WMV format. --- dlls/winegstreamer/quartz_parser.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index e402e1aab52..c41b0dca0f6 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -625,9 +625,6 @@ static bool amt_from_wg_format_video_wmv(AM_MEDIA_TYPE *mt, const struct wg_form uint32_t frame_time; const GUID *subtype; - if (!(video_format = CoTaskMemAlloc(sizeof(*video_format)))) - return false; - switch (format->u.video_wmv.format) { case WG_WMV_VIDEO_FORMAT_WMV1: @@ -650,6 +647,9 @@ static bool amt_from_wg_format_video_wmv(AM_MEDIA_TYPE *mt, const struct wg_form return false; } + if (!(video_format = CoTaskMemAlloc(sizeof(*video_format)))) + return false; + mt->majortype = MEDIATYPE_Video; mt->subtype = *subtype; mt->bFixedSizeSamples = FALSE;

1 0

Zhiyi Zhang : winegstreamer: Fix wg_transform_get_status() result check (Coverity).
by Alexandre Julliard 04 Dec '23

04 Dec '23

Module: wine Branch: master Commit: c2d56a7e993738c3772411561022d41c22cfb7b9 URL: https://gitlab.winehq.org/wine/wine/-/commit/c2d56a7e993738c3772411561022d4… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sat Dec 2 23:44:00 2023 +0800 winegstreamer: Fix wg_transform_get_status() result check (Coverity). wg_transform_get_status() returns bool, not HRESULT. --- dlls/winegstreamer/aac_decoder.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/aac_decoder.c b/dlls/winegstreamer/aac_decoder.c index 3eb96d0106a..dfab7a8b0c0 100644 --- a/dlls/winegstreamer/aac_decoder.c +++ b/dlls/winegstreamer/aac_decoder.c @@ -535,15 +535,14 @@ static HRESULT WINAPI transform_GetInputStatus(IMFTransform *iface, DWORD id, DW { struct aac_decoder *decoder = impl_from_IMFTransform(iface); bool accepts_input; - HRESULT hr; TRACE("iface %p, id %#lx, flags %p.\n", iface, id, flags); if (!decoder->wg_transform) return MF_E_TRANSFORM_TYPE_NOT_SET; - if (FAILED(hr = wg_transform_get_status(decoder->wg_transform, &accepts_input))) - return hr; + if (!wg_transform_get_status(decoder->wg_transform, &accepts_input)) + return E_FAIL; *flags = accepts_input ? MFT_INPUT_STATUS_ACCEPT_DATA : 0; return S_OK;

1 0

Zhiyi Zhang : mciwave: Use matching memory allocator (Coverity).
by Alexandre Julliard 04 Dec '23

04 Dec '23

Module: wine Branch: master Commit: eeb1826c3f15f4d705789332790cd5be3f1b1b7a URL: https://gitlab.winehq.org/wine/wine/-/commit/eeb1826c3f15f4d705789332790cd5… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sat Dec 2 22:42:52 2023 +0800 mciwave: Use matching memory allocator (Coverity). *pszTmpFileName will be freed with free() but it's allocated with HeapAlloc(). --- dlls/mciwave/mciwave.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index b17c347258f..f2af38b8762 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -432,9 +432,7 @@ static DWORD create_tmp_file(HMMIO* hFile, LPWSTR* pszTmpFileName) return MCIERR_FILE_NOT_FOUND; } - *pszTmpFileName = HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - MAX_PATH * sizeof(WCHAR)); + *pszTmpFileName = calloc(1, MAX_PATH * sizeof(WCHAR)); if (!GetTempFileNameW(szTmpPath, szPrefix, 0, *pszTmpFileName)) { WARN("can't retrieve temp file name!\n"); free(*pszTmpFileName);

1 0

Zhiyi Zhang : tasklist: Fix a possible buffer overrun (Coverity).
by Alexandre Julliard 04 Dec '23

04 Dec '23

Module: wine Branch: master Commit: 1a6deb1cc3a40757b14910f84d882c108d56909b URL: https://gitlab.winehq.org/wine/wine/-/commit/1a6deb1cc3a40757b14910f84d882c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sat Dec 2 23:16:05 2023 +0800 tasklist: Fix a possible buffer overrun (Coverity). process_entry->szExeFile has length of MAX_PATH but info->image_name only has 32. --- programs/tasklist/tasklist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/tasklist/tasklist.c b/programs/tasklist/tasklist.c index 4f866f6b727..6bbb9921d4f 100644 --- a/programs/tasklist/tasklist.c +++ b/programs/tasklist/tasklist.c @@ -176,7 +176,7 @@ static BOOL tasklist_get_process_info(const PROCESSENTRY32W *process_entry, stru info->pid_value = process_entry->th32ProcessID; info->memory_usage_value = memory_counters.WorkingSetSize / 1024; info->session_id_value = session_id; - wcscpy(info->image_name, process_entry->szExeFile); + lstrcpynW(info->image_name, process_entry->szExeFile, ARRAY_SIZE(info->image_name)); swprintf(info->pid, ARRAY_SIZE(info->pid), L"%u", process_entry->th32ProcessID); wcscpy(info->session_name, session_id == 0 ? L"Services" : L"Console"); swprintf(info->session_number, ARRAY_SIZE(info->session_number), L"%u", session_id);

1 0

Zhiyi Zhang : wininet: Fix a use-after-free (Coverity).
by Alexandre Julliard 04 Dec '23

04 Dec '23

Module: wine Branch: master Commit: d36f50c43841bb1e5abdc684724a6be355f94ade URL: https://gitlab.winehq.org/wine/wine/-/commit/d36f50c43841bb1e5abdc684724a6b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sat Dec 2 23:23:02 2023 +0800 wininet: Fix a use-after-free (Coverity). pEntry could be freed after cache_container_unlock_index(pContainer, pHeader). --- dlls/wininet/urlcache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 8e43eaae9f3..7975071ce91 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2550,8 +2550,8 @@ BOOL WINAPI UnlockUrlCacheEntryFileA(LPCSTR lpszUrlName, DWORD dwReserved) pEntry = (entry_header*)((LPBYTE)pHeader + pHashEntry->offset); if (pEntry->signature != URL_SIGNATURE) { - cache_container_unlock_index(pContainer, pHeader); FIXME("Trying to retrieve entry of unknown format %s\n", debugstr_an((LPSTR)&pEntry->signature, sizeof(DWORD))); + cache_container_unlock_index(pContainer, pHeader); SetLastError(ERROR_FILE_NOT_FOUND); return FALSE; }

1 0

Zhiyi Zhang : shell32: Fix a memory leak (Coverity).
by Alexandre Julliard 04 Dec '23

04 Dec '23

Module: wine Branch: master Commit: 2169dd9a550df42dd3cc10d6d53f8f48745de0bc URL: https://gitlab.winehq.org/wine/wine/-/commit/2169dd9a550df42dd3cc10d6d53f8f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sat Dec 2 23:54:28 2023 +0800 shell32: Fix a memory leak (Coverity). --- dlls/shell32/dde.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/shell32/dde.c b/dlls/shell32/dde.c index 976dc2e394a..eea8b8ec4ce 100644 --- a/dlls/shell32/dde.c +++ b/dlls/shell32/dde.c @@ -165,6 +165,7 @@ static inline HDDEDATA Dde_OnRequest(UINT uFmt, HCONV hconv, HSZ hszTopic, { free(groups_data); free(programs); + FindClose(hfind); return NULL; } groups_data = new_groups_data;

1 0

Zhiyi Zhang : ntdll: Fix a memory leak (Coverity).
by Alexandre Julliard 04 Dec '23

04 Dec '23

Module: wine Branch: master Commit: 2eeb5feca78355b3d1294c66d31904f3aa8ec3ea URL: https://gitlab.winehq.org/wine/wine/-/commit/2eeb5feca78355b3d1294c66d31904… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sun Dec 3 00:11:49 2023 +0800 ntdll: Fix a memory leak (Coverity). --- dlls/ntdll/unix/loader.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index aa120ae38ec..5673fdb38cb 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -438,7 +438,12 @@ static void init_paths( char *argv[] ) data_dir = build_path( bin_dir, BIN_TO_DATADIR ); wineloader = build_path( bin_dir, basename ); } - else wineloader = build_path( build_path( build_dir, "loader" ), basename ); + else + { + char *dirname = build_path( build_dir, "loader" ); + wineloader = build_path( dirname, basename ); + free(dirname); + } asprintf( &env, "WINELOADER=%s", wineloader ); putenv( env );

1 0