August 2023 - Wine-Commits - list.winehq.org

Jeff Smith : d3dx9_36/tests: Use compare_uint() in compare_float() instead of abs().
by Alexandre Julliard Aug. 8, 2023

Aug. 8, 2023

Module: wine Branch: master Commit: c449da64e18b70914ff0da6b3fb55530ee369faa URL: https://gitlab.winehq.org/wine/wine/-/commit/c449da64e18b70914ff0da6b3fb555… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Wed Aug 2 22:39:03 2023 -0500 d3dx9_36/tests: Use compare_uint() in compare_float() instead of abs(). The result of abs(INT_MIN) is INT_MIN, which breaks the ulps comparison. --- dlls/d3dx9_36/tests/effect.c | 12 ++++++++---- dlls/d3dx9_36/tests/math.c | 12 ++++++++---- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index aed30118a44..edc35235c3e 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -23,6 +23,13 @@ #include "d3dx9.h" /* helper functions */ +static BOOL compare_uint(unsigned int x, unsigned int y, unsigned int max_diff) +{ + unsigned int diff = x > y ? x - y : y - x; + + return diff <= max_diff; +} + static BOOL compare_float(FLOAT f, FLOAT g, UINT ulps) { INT x = *(INT *)&f; @@ -33,10 +40,7 @@ static BOOL compare_float(FLOAT f, FLOAT g, UINT ulps) if (y < 0) y = INT_MIN - y; - if (abs(x - y) > ulps) - return FALSE; - - return TRUE; + return compare_uint(x, y, ulps); } static inline INT get_int(D3DXPARAMETER_TYPE type, const void *data) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 5d112bd4b92..79f02e6536e 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -24,6 +24,13 @@ #include <math.h> #include <stdint.h> +static BOOL compare_uint(unsigned int x, unsigned int y, unsigned int max_diff) +{ + unsigned int diff = x > y ? x - y : y - x; + + return diff <= max_diff; +} + static BOOL compare_float(float f, float g, unsigned int ulps) { int x = *(int *)&f; @@ -34,10 +41,7 @@ static BOOL compare_float(float f, float g, unsigned int ulps) if (y < 0) y = INT_MIN - y; - if (abs(x - y) > ulps) - return FALSE; - - return TRUE; + return compare_uint(x, y, ulps); } static BOOL compare_vec2(const D3DXVECTOR2 *v1, const D3DXVECTOR2 *v2, unsigned int ulps)

1 0

Sven Baars : quartz/tests: Fix some memory leaks in test_add_source_filter() (Valgrind).
by Alexandre Julliard Aug. 8, 2023

Aug. 8, 2023

Module: wine Branch: master Commit: 5d97f12521a88eeea716c292cc4132db9ba78300 URL: https://gitlab.winehq.org/wine/wine/-/commit/5d97f12521a88eeea716c292cc4132… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Mon Aug 7 17:30:46 2023 +0200 quartz/tests: Fix some memory leaks in test_add_source_filter() (Valgrind). --- dlls/quartz/tests/filtergraph.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 00232ea7a52..92baa0e74e8 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -23,6 +23,7 @@ #define CONST_VTABLE #include "dshow.h" +#include "wine/strmbase.h" #include "wine/test.h" static const GUID testguid = {0xabbccdde}; @@ -5076,6 +5077,8 @@ static void test_add_source_filter(void) ok(IsEqualGUID(&mt.majortype, &MEDIATYPE_Stream), "Got major type %s.\n", wine_dbgstr_guid(&mt.majortype)); ok(IsEqualGUID(&mt.subtype, &MEDIASUBTYPE_MPEG1Audio), "Got subtype %s.\n", wine_dbgstr_guid(&mt.subtype)); IFileSourceFilter_Release(filesource); + CoTaskMemFree(ret_filename); + FreeMediaType(&mt); hr = IFilterGraph2_AddSourceFilter(graph, filename, L"test", &filter2); ok(hr == S_OK, "Got hr %#lx.\n", hr); @@ -5115,6 +5118,8 @@ static void test_add_source_filter(void) ok(IsEqualGUID(&mt.majortype, &MEDIATYPE_Stream), "Got major type %s.\n", wine_dbgstr_guid(&mt.majortype)); ok(IsEqualGUID(&mt.subtype, &MEDIATYPE_Midi), "Got subtype %s.\n", wine_dbgstr_guid(&mt.subtype)); IFileSourceFilter_Release(filesource); + CoTaskMemFree(ret_filename); + FreeMediaType(&mt); hr = IFilterGraph2_RemoveFilter(graph, filter); ok(hr == S_OK, "Got hr %#lx.\n", hr);

1 0

Sven Baars : strmbase: Fix a critical section leak (Valgrind).
by Alexandre Julliard Aug. 8, 2023

Aug. 8, 2023

Module: wine Branch: master Commit: 076d064140f8b7fab4da7cdaf4ba436648b4a351 URL: https://gitlab.winehq.org/wine/wine/-/commit/076d064140f8b7fab4da7cdaf4ba43… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Mon Aug 7 17:31:07 2023 +0200 strmbase: Fix a critical section leak (Valgrind). --- libs/strmbase/seeking.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/strmbase/seeking.c b/libs/strmbase/seeking.c index b3991f0a5b3..91e9ccedfb4 100644 --- a/libs/strmbase/seeking.c +++ b/libs/strmbase/seeking.c @@ -56,6 +56,7 @@ HRESULT strmbase_seeking_init(SourceSeeking *pSeeking, const IMediaSeekingVtbl * void strmbase_seeking_cleanup(SourceSeeking *seeking) { + seeking->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&seeking->cs); }

1 0

Sven Baars : quartz: Fix a system clock leak (Valgrind).
by Alexandre Julliard Aug. 8, 2023

Aug. 8, 2023

Module: wine Branch: master Commit: c1b832cdfef719b8fc2ff288804b8d9fc168a88e URL: https://gitlab.winehq.org/wine/wine/-/commit/c1b832cdfef719b8fc2ff288804b8d… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Mon Aug 7 17:30:15 2023 +0200 quartz: Fix a system clock leak (Valgrind). --- dlls/quartz/dsoundrender.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 1abd4bdbcec..38a7d6f7ad7 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -536,6 +536,8 @@ static void dsound_render_destroy(struct strmbase_filter *iface) IDirectSound8_Release(filter->dsound); filter->dsound = NULL; + IUnknown_Release(filter->system_clock); + if (filter->sink.pin.peer) IPin_Disconnect(filter->sink.pin.peer); IPin_Disconnect(&filter->sink.pin.IPin_iface);

1 0

Davide Beatrici : winealsa: Remove GetPropValue.
by Alexandre Julliard Aug. 8, 2023

Aug. 8, 2023

Module: wine Branch: master Commit: a1f52a95201ee83f5f97fd25ba799b400f9ff0dd URL: https://gitlab.winehq.org/wine/wine/-/commit/a1f52a95201ee83f5f97fd25ba799b… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Sun Jul 30 22:49:42 2023 +0200 winealsa: Remove GetPropValue. --- dlls/winealsa.drv/mmdevdrv.c | 45 ------------------------------------- dlls/winealsa.drv/winealsa.drv.spec | 1 - 2 files changed, 46 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 50e53dcda41..caeade5be56 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -286,48 +286,3 @@ BOOL WINAPI get_device_name_from_guid(GUID *guid, char **name, EDataFlow *flow) return FALSE; } - -HRESULT WINAPI AUDDRV_GetPropValue(GUID *guid, const PROPERTYKEY *prop, PROPVARIANT *out) -{ - struct get_prop_value_params params; - char *name; - EDataFlow flow; - unsigned int size = 0; - - TRACE("%s, (%s,%lu), %p\n", wine_dbgstr_guid(guid), wine_dbgstr_guid(&prop->fmtid), prop->pid, out); - - if(!get_device_name_from_guid(guid, &name, &flow)) - { - WARN("Unknown interface %s\n", debugstr_guid(guid)); - return E_NOINTERFACE; - } - - params.device = name; - params.flow = flow; - params.guid = guid; - params.prop = prop; - params.value = out; - params.buffer = NULL; - params.buffer_size = &size; - - while(1) { - ALSA_CALL(get_prop_value, &params); - - if(params.result != E_NOT_SUFFICIENT_BUFFER) - break; - - CoTaskMemFree(params.buffer); - params.buffer = CoTaskMemAlloc(*params.buffer_size); - if(!params.buffer) - { - free(name); - return E_OUTOFMEMORY; - } - } - if(FAILED(params.result)) - CoTaskMemFree(params.buffer); - - free(name); - - return params.result; -} diff --git a/dlls/winealsa.drv/winealsa.drv.spec b/dlls/winealsa.drv/winealsa.drv.spec index ae6cfdd84ca..64089c6df10 100644 --- a/dlls/winealsa.drv/winealsa.drv.spec +++ b/dlls/winealsa.drv/winealsa.drv.spec @@ -6,4 +6,3 @@ # MMDevAPI driver functions @ stdcall -private get_device_name_from_guid(ptr ptr ptr) get_device_name_from_guid @ stdcall -private GetEndpointIDs(long ptr ptr ptr ptr) AUDDRV_GetEndpointIDs -@ stdcall -private GetPropValue(ptr ptr ptr) AUDDRV_GetPropValue

1 0

Davide Beatrici : winepulse: Move GetPropValue into mmdevapi.
by Alexandre Julliard Aug. 8, 2023

Aug. 8, 2023

Module: wine Branch: master Commit: 906ad69b0a7e7f4b5aca2ddd24893e97de176c46 URL: https://gitlab.winehq.org/wine/wine/-/commit/906ad69b0a7e7f4b5aca2ddd24893e… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Sat Aug 5 23:17:15 2023 +0200 winepulse: Move GetPropValue into mmdevapi. --- dlls/mmdevapi/devenum.c | 41 +++++++++++++++++++++++++++++------ dlls/mmdevapi/main.c | 3 --- dlls/mmdevapi/mmdevapi_private.h | 2 -- dlls/winepulse.drv/mmdevdrv.c | 39 --------------------------------- dlls/winepulse.drv/winepulse.drv.spec | 1 - 5 files changed, 34 insertions(+), 52 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index c1625cf177a..6344ec66d34 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -240,21 +240,48 @@ static HRESULT MMDevice_SetPropValue(const GUID *devguid, DWORD flow, REFPROPERT static HRESULT set_driver_prop_value(GUID *id, const EDataFlow flow, const PROPERTYKEY *prop) { - HRESULT hr; + struct get_prop_value_params params; PROPVARIANT pv; + char *dev_name; + unsigned int size = 0; + + TRACE("%s, (%s,%lu)\n", wine_dbgstr_guid(id), wine_dbgstr_guid(&prop->fmtid), prop->pid); - if (!drvs.pGetPropValue) - return E_NOTIMPL; + if (!drvs.pget_device_name_from_guid(id, &dev_name, &params.flow)) + return E_FAIL; - hr = drvs.pGetPropValue(id, prop, &pv); + params.device = dev_name; + params.guid = id; + params.prop = prop; + params.value = &pv; + params.buffer = NULL; + params.buffer_size = &size; - if (SUCCEEDED(hr)) - { + while (1) { + __wine_unix_call(drvs.module_unixlib, get_prop_value, &params); + + if (params.result != E_NOT_SUFFICIENT_BUFFER) + break; + + CoTaskMemFree(params.buffer); + params.buffer = CoTaskMemAlloc(*params.buffer_size); + if (!params.buffer) { + free(dev_name); + return E_OUTOFMEMORY; + } + } + + if (FAILED(params.result)) + CoTaskMemFree(params.buffer); + + free(dev_name); + + if (SUCCEEDED(params.result)) { MMDevice_SetPropValue(id, flow, prop, &pv); PropVariantClear(&pv); } - return hr; + return params.result; } struct product_name_overrides diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index 5ed27c9debd..43b5921dcc5 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -102,9 +102,6 @@ static BOOL load_driver(const WCHAR *name, DriverFuncs *driver) LDFC(GetEndpointIDs); #undef LDFC - /* optional - do not fail if not found */ - driver->pGetPropValue = (void*)GetProcAddress(driver->module, "GetPropValue"); - GetModuleFileNameW(NULL, path, ARRAY_SIZE(path)); params.name = wcsrchr(path, '\\'); params.name = params.name ? params.name + 1 : path; diff --git a/dlls/mmdevapi/mmdevapi_private.h b/dlls/mmdevapi/mmdevapi_private.h index 78582f4db69..f8bf7d3a440 100644 --- a/dlls/mmdevapi/mmdevapi_private.h +++ b/dlls/mmdevapi/mmdevapi_private.h @@ -50,8 +50,6 @@ typedef struct _DriverFuncs { * all of the elements in both arrays with HeapFree() */ HRESULT (WINAPI *pGetEndpointIDs)(EDataFlow flow, WCHAR ***ids, GUID **guids, UINT *num, UINT *default_index); - HRESULT (WINAPI *pGetPropValue)(GUID *guid, - const PROPERTYKEY *prop, PROPVARIANT *out); } DriverFuncs; extern DriverFuncs drvs DECLSPEC_HIDDEN; diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 3dbb88d880e..f7de3296567 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -311,42 +311,3 @@ BOOL WINAPI get_device_name_from_guid(GUID *guid, char **name, EDataFlow *flow) WARN("No matching device in registry for GUID %s\n", debugstr_guid(guid)); return FALSE; } - -HRESULT WINAPI AUDDRV_GetPropValue(GUID *guid, const PROPERTYKEY *prop, PROPVARIANT *out) -{ - struct get_prop_value_params params; - char *pulse_name; - unsigned int size = 0; - - TRACE("%s, (%s,%lu), %p\n", wine_dbgstr_guid(guid), wine_dbgstr_guid(&prop->fmtid), prop->pid, out); - - if (!get_device_name_from_guid(guid, &pulse_name, &params.flow)) - return E_FAIL; - - params.device = pulse_name; - params.guid = guid; - params.prop = prop; - params.value = out; - params.buffer = NULL; - params.buffer_size = &size; - - while(1) { - pulse_call(get_prop_value, &params); - - if(params.result != E_NOT_SUFFICIENT_BUFFER) - break; - - CoTaskMemFree(params.buffer); - params.buffer = CoTaskMemAlloc(*params.buffer_size); - if(!params.buffer) { - free(pulse_name); - return E_OUTOFMEMORY; - } - } - if(FAILED(params.result)) - CoTaskMemFree(params.buffer); - - free(pulse_name); - - return params.result; -} diff --git a/dlls/winepulse.drv/winepulse.drv.spec b/dlls/winepulse.drv/winepulse.drv.spec index fe5b62e053b..5bb84b1764d 100644 --- a/dlls/winepulse.drv/winepulse.drv.spec +++ b/dlls/winepulse.drv/winepulse.drv.spec @@ -1,7 +1,6 @@ # MMDevAPI driver functions @ stdcall -private get_device_name_from_guid(ptr ptr ptr) get_device_name_from_guid @ stdcall -private GetEndpointIDs(long ptr ptr ptr ptr) AUDDRV_GetEndpointIDs -@ stdcall -private GetPropValue(ptr ptr ptr) AUDDRV_GetPropValue # WinMM driver functions @ stdcall -private DriverProc(long long long long long) winealsa.drv.DriverProc

1 0

Davide Beatrici : winecoreaudio: Add get_prop_value stub in unixlib.
by Alexandre Julliard Aug. 8, 2023

Aug. 8, 2023

Module: wine Branch: master Commit: 62b5ee8be1896b6cc33cd9bb269b99679f2dde5b URL: https://gitlab.winehq.org/wine/wine/-/commit/62b5ee8be1896b6cc33cd9bb269b99… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Mon Aug 7 13:14:41 2023 +0200 winecoreaudio: Add get_prop_value stub in unixlib. --- dlls/winecoreaudio.drv/coreaudio.c | 69 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 67 insertions(+), 2 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 18b70738215..e2bce64ea14 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1733,6 +1733,15 @@ static NTSTATUS unix_is_started(void *args) return STATUS_SUCCESS; } +static NTSTATUS unix_get_prop_value(void *args) +{ + struct get_prop_value_params *params = args; + + params->result = E_NOTIMPL; + + return STATUS_SUCCESS; +} + static NTSTATUS unix_set_volumes(void *args) { struct set_volumes_params *params = args; @@ -1816,7 +1825,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = unix_set_event_handle, unix_not_implemented, unix_is_started, - unix_not_implemented, + unix_get_prop_value, unix_midi_init, unix_midi_release, unix_midi_out_message, @@ -2184,6 +2193,62 @@ static NTSTATUS unix_wow64_set_event_handle(void *args) return STATUS_SUCCESS; } +static NTSTATUS unix_wow64_get_prop_value(void *args) +{ + struct propvariant32 + { + WORD vt; + WORD pad1, pad2, pad3; + union + { + ULONG ulVal; + PTR32 ptr; + ULARGE_INTEGER uhVal; + }; + } *value32; + struct + { + PTR32 device; + EDataFlow flow; + PTR32 guid; + PTR32 prop; + HRESULT result; + PTR32 value; + PTR32 buffer; /* caller allocated buffer to hold value's strings */ + PTR32 buffer_size; + } *params32 = args; + PROPVARIANT value; + struct get_prop_value_params params = + { + .device = ULongToPtr(params32->device), + .flow = params32->flow, + .guid = ULongToPtr(params32->guid), + .prop = ULongToPtr(params32->prop), + .value = &value, + .buffer = ULongToPtr(params32->buffer), + .buffer_size = ULongToPtr(params32->buffer_size) + }; + unix_get_prop_value(&params); + params32->result = params.result; + if (SUCCEEDED(params.result)) + { + value32 = UlongToPtr(params32->value); + value32->vt = value.vt; + switch (value.vt) + { + case VT_UI4: + value32->ulVal = value.ulVal; + break; + case VT_LPWSTR: + value32->ptr = params32->buffer; + break; + default: + FIXME("Unhandled vt %04x\n", value.vt); + } + } + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_wow64_funcs[] = { unix_process_attach, @@ -2213,7 +2278,7 @@ unixlib_entry_t __wine_unix_call_wow64_funcs[] = unix_wow64_set_event_handle, unix_not_implemented, unix_is_started, - unix_not_implemented, + unix_wow64_get_prop_value, unix_wow64_midi_init, unix_midi_release, unix_wow64_midi_out_message,

1 0

Gabriel Ivăncescu : mshtml: Use unlink and destructor in the vtbl for HTMLAttributeCollection.
by Alexandre Julliard Aug. 8, 2023

Aug. 8, 2023

Module: wine Branch: master Commit: 6919d553aa67812537bbb648e5c1b6043bfeb8ec URL: https://gitlab.winehq.org/wine/wine/-/commit/6919d553aa67812537bbb648e5c1b6… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Aug 4 17:30:15 2023 +0300 mshtml: Use unlink and destructor in the vtbl for HTMLAttributeCollection. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlelem.c | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 2e1a26d058a..91316a8f237 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -8594,17 +8594,8 @@ static ULONG WINAPI HTMLAttributeCollection_Release(IHTMLAttributeCollection *if TRACE("(%p) ref=%ld\n", This, ref); - if(!ref) { - while(!list_empty(&This->attrs)) { - HTMLDOMAttribute *attr = LIST_ENTRY(list_head(&This->attrs), HTMLDOMAttribute, entry); - - list_remove(&attr->entry); - attr->elem = NULL; - IHTMLDOMAttribute_Release(&attr->IHTMLDOMAttribute_iface); - } - - free(This); - } + if(!ref) + release_dispex(&This->dispex); return ref; } @@ -8953,6 +8944,24 @@ static inline HTMLAttributeCollection *HTMLAttributeCollection_from_DispatchEx(D return CONTAINING_RECORD(iface, HTMLAttributeCollection, dispex); } +static void HTMLAttributeCollection_unlink(DispatchEx *dispex) +{ + HTMLAttributeCollection *This = HTMLAttributeCollection_from_DispatchEx(dispex); + while(!list_empty(&This->attrs)) { + HTMLDOMAttribute *attr = LIST_ENTRY(list_head(&This->attrs), HTMLDOMAttribute, entry); + + list_remove(&attr->entry); + attr->elem = NULL; + IHTMLDOMAttribute_Release(&attr->IHTMLDOMAttribute_iface); + } +} + +static void HTMLAttributeCollection_destructor(DispatchEx *dispex) +{ + HTMLAttributeCollection *This = HTMLAttributeCollection_from_DispatchEx(dispex); + free(This); +} + static HRESULT HTMLAttributeCollection_get_dispid(DispatchEx *dispex, BSTR name, DWORD flags, DISPID *dispid) { HTMLAttributeCollection *This = HTMLAttributeCollection_from_DispatchEx(dispex); @@ -9019,8 +9028,8 @@ static HRESULT HTMLAttributeCollection_invoke(DispatchEx *dispex, DISPID id, LCI } static const dispex_static_data_vtbl_t HTMLAttributeCollection_dispex_vtbl = { - NULL, - NULL, + HTMLAttributeCollection_destructor, + HTMLAttributeCollection_unlink, NULL, HTMLAttributeCollection_get_dispid, HTMLAttributeCollection_get_name,

1 0

Davide Beatrici : wineoss: Add get_prop_value stub in unixlib.
by Alexandre Julliard Aug. 8, 2023

Aug. 8, 2023

Module: wine Branch: master Commit: c03170a9b7cd1124f72a55aa0837ccce6bfbe1d6 URL: https://gitlab.winehq.org/wine/wine/-/commit/c03170a9b7cd1124f72a55aa0837cc… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Mon Aug 7 13:16:19 2023 +0200 wineoss: Add get_prop_value stub in unixlib. --- dlls/wineoss.drv/oss.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 67 insertions(+), 2 deletions(-) diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 097e048d03b..1e839c57f5f 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -1478,6 +1478,15 @@ static NTSTATUS oss_is_started(void *args) return oss_unlock_result(stream, &params->result, stream->playing ? S_OK : S_FALSE); } +static NTSTATUS oss_get_prop_value(void *args) +{ + struct get_prop_value_params *params = args; + + params->result = E_NOTIMPL; + + return STATUS_SUCCESS; +} + /* Aux driver */ static unsigned int num_aux; @@ -1724,7 +1733,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = oss_set_event_handle, oss_test_connect, oss_is_started, - oss_not_implemented, + oss_get_prop_value, oss_not_implemented, oss_midi_release, oss_midi_out_message, @@ -2109,6 +2118,62 @@ static NTSTATUS oss_wow64_set_event_handle(void *args) return STATUS_SUCCESS; } +static NTSTATUS oss_wow64_get_prop_value(void *args) +{ + struct propvariant32 + { + WORD vt; + WORD pad1, pad2, pad3; + union + { + ULONG ulVal; + PTR32 ptr; + ULARGE_INTEGER uhVal; + }; + } *value32; + struct + { + PTR32 device; + EDataFlow flow; + PTR32 guid; + PTR32 prop; + HRESULT result; + PTR32 value; + PTR32 buffer; /* caller allocated buffer to hold value's strings */ + PTR32 buffer_size; + } *params32 = args; + PROPVARIANT value; + struct get_prop_value_params params = + { + .device = ULongToPtr(params32->device), + .flow = params32->flow, + .guid = ULongToPtr(params32->guid), + .prop = ULongToPtr(params32->prop), + .value = &value, + .buffer = ULongToPtr(params32->buffer), + .buffer_size = ULongToPtr(params32->buffer_size) + }; + oss_get_prop_value(&params); + params32->result = params.result; + if (SUCCEEDED(params.result)) + { + value32 = UlongToPtr(params32->value); + value32->vt = value.vt; + switch (value.vt) + { + case VT_UI4: + value32->ulVal = value.ulVal; + break; + case VT_LPWSTR: + value32->ptr = params32->buffer; + break; + default: + FIXME("Unhandled vt %04x\n", value.vt); + } + } + return STATUS_SUCCESS; +} + static NTSTATUS oss_wow64_aux_message(void *args) { struct @@ -2161,7 +2226,7 @@ unixlib_entry_t __wine_unix_call_wow64_funcs[] = oss_wow64_set_event_handle, oss_wow64_test_connect, oss_is_started, - oss_not_implemented, + oss_wow64_get_prop_value, oss_not_implemented, oss_midi_release, oss_wow64_midi_out_message,

1 0

Gabriel Ivăncescu : mshtml: Use unlink and destructor in the vtbl for HTMLDOMChildrenCollection.
by Alexandre Julliard Aug. 8, 2023

Aug. 8, 2023

Module: wine Branch: master Commit: 20b769dcb9ab751ac0f7a6098eab1f9cdfd6b07a URL: https://gitlab.winehq.org/wine/wine/-/commit/20b769dcb9ab751ac0f7a6098eab1f… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Aug 4 17:30:15 2023 +0300 mshtml: Use unlink and destructor in the vtbl for HTMLDOMChildrenCollection. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlnode.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 0b509eca79a..d412b570aec 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -239,10 +239,8 @@ static ULONG WINAPI HTMLDOMChildrenCollection_Release(IHTMLDOMChildrenCollection TRACE("(%p) ref=%ld\n", This, ref); - if(!ref) { - nsIDOMNodeList_Release(This->nslist); - free(This); - } + if(!ref) + release_dispex(&This->dispex); return ref; } @@ -364,6 +362,18 @@ static inline HTMLDOMChildrenCollection *impl_from_DispatchEx(DispatchEx *iface) return CONTAINING_RECORD(iface, HTMLDOMChildrenCollection, dispex); } +static void HTMLDOMChildrenCollection_unlink(DispatchEx *dispex) +{ + HTMLDOMChildrenCollection *This = impl_from_DispatchEx(dispex); + unlink_ref(&This->nslist); +} + +static void HTMLDOMChildrenCollection_destructor(DispatchEx *dispex) +{ + HTMLDOMChildrenCollection *This = impl_from_DispatchEx(dispex); + free(This); +} + #define DISPID_CHILDCOL_0 MSHTML_DISPID_CUSTOM_MIN static HRESULT HTMLDOMChildrenCollection_get_dispid(DispatchEx *dispex, BSTR name, DWORD flags, DISPID *dispid) @@ -433,8 +443,8 @@ static HRESULT HTMLDOMChildrenCollection_invoke(DispatchEx *dispex, DISPID id, L } static const dispex_static_data_vtbl_t HTMLDOMChildrenCollection_dispex_vtbl = { - NULL, - NULL, + HTMLDOMChildrenCollection_destructor, + HTMLDOMChildrenCollection_unlink, NULL, HTMLDOMChildrenCollection_get_dispid, HTMLDOMChildrenCollection_get_name,

1 0