March 2021 - Wine-commits - list.winehq.org

Jacek Caban : qedit: Use nameless unions.
by Alexandre Julliard 26 Mar '21

26 Mar '21

Module: wine Branch: master Commit: b9393340f77508a0b45cd46e903aeb3850bf006e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9393340f77508a0b45cd46e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 25 21:40:05 2021 +0100 qedit: Use nameless unions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/Makefile.in | 1 - dlls/qedit/main.c | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/qedit/Makefile.in b/dlls/qedit/Makefile.in index 6576db84de6..4eb57322f5e 100644 --- a/dlls/qedit/Makefile.in +++ b/dlls/qedit/Makefile.in @@ -1,6 +1,5 @@ MODULE = qedit.dll IMPORTS = strmiids strmbase uuid oleaut32 ole32 advapi32 -EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/qedit/main.c b/dlls/qedit/main.c index a4a4f5ec38c..158fb4bc0b8 100644 --- a/dlls/qedit/main.c +++ b/dlls/qedit/main.c @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WINE_NO_NAMELESS_EXTENSION + #include "qedit_private.h" #include "rpcproxy.h" #include "wine/debug.h"

1 0

Jacek Caban : qcap: Use nameless unions.
by Alexandre Julliard 26 Mar '21

26 Mar '21

Module: wine Branch: master Commit: d5ab8f3dc9d40bdcfe1aa4b0e12f5ee0ef178308 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5ab8f3dc9d40bdcfe1aa4b0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 25 21:40:13 2021 +0100 qcap: Use nameless unions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/Makefile.in | 1 - dlls/qcap/qcap_main.c | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/qcap/Makefile.in b/dlls/qcap/Makefile.in index ff90788ff14..417e7f332c0 100644 --- a/dlls/qcap/Makefile.in +++ b/dlls/qcap/Makefile.in @@ -1,6 +1,5 @@ MODULE = qcap.dll IMPORTS = strmbase strmiids uuid ole32 oleaut32 -EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION DELAYIMPORTS = msvfw32 EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/qcap/qcap_main.c b/dlls/qcap/qcap_main.c index 2c7c1216996..5f608c16310 100644 --- a/dlls/qcap/qcap_main.c +++ b/dlls/qcap/qcap_main.c @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WINE_NO_NAMELESS_EXTENSION + #include "qcap_private.h" #include "rpcproxy.h"

1 0

Jacek Caban : mmdevapi: Use nameless unions.
by Alexandre Julliard 26 Mar '21

26 Mar '21

Module: wine Branch: master Commit: e636c2a22aee33c19dbe5d5cb3426f5abf7dab5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e636c2a22aee33c19dbe5d5c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 25 21:39:53 2021 +0100 mmdevapi: Use nameless unions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/Makefile.in | 1 - dlls/mmdevapi/devenum.c | 52 ++++++++++++++++++++++---------------------- dlls/mmdevapi/spatialaudio.c | 4 ++-- 3 files changed, 28 insertions(+), 29 deletions(-) diff --git a/dlls/mmdevapi/Makefile.in b/dlls/mmdevapi/Makefile.in index 6ac491f980d..903b14335a9 100644 --- a/dlls/mmdevapi/Makefile.in +++ b/dlls/mmdevapi/Makefile.in @@ -1,6 +1,5 @@ MODULE = mmdevapi.dll IMPORTS = uuid ole32 oleaut32 user32 advapi32 -EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 07b4dca028b..fc33cac17ec 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -160,28 +160,28 @@ static HRESULT MMDevice_GetPropValue(const GUID *devguid, DWORD flow, REFPROPERT case REG_SZ: { pv->vt = VT_LPWSTR; - pv->u.pwszVal = CoTaskMemAlloc(size); - if (!pv->u.pwszVal) + pv->pwszVal = CoTaskMemAlloc(size); + if (!pv->pwszVal) hr = E_OUTOFMEMORY; else - RegGetValueW(regkey, NULL, buffer, RRF_RT_REG_SZ, NULL, (BYTE*)pv->u.pwszVal, &size); + RegGetValueW(regkey, NULL, buffer, RRF_RT_REG_SZ, NULL, (BYTE*)pv->pwszVal, &size); break; } case REG_DWORD: { pv->vt = VT_UI4; - RegGetValueW(regkey, NULL, buffer, RRF_RT_REG_DWORD, NULL, (BYTE*)&pv->u.ulVal, &size); + RegGetValueW(regkey, NULL, buffer, RRF_RT_REG_DWORD, NULL, (BYTE*)&pv->ulVal, &size); break; } case REG_BINARY: { pv->vt = VT_BLOB; - pv->u.blob.cbSize = size; - pv->u.blob.pBlobData = CoTaskMemAlloc(size); - if (!pv->u.blob.pBlobData) + pv->blob.cbSize = size; + pv->blob.pBlobData = CoTaskMemAlloc(size); + if (!pv->blob.pBlobData) hr = E_OUTOFMEMORY; else - RegGetValueW(regkey, NULL, buffer, RRF_RT_REG_BINARY, NULL, (BYTE*)pv->u.blob.pBlobData, &size); + RegGetValueW(regkey, NULL, buffer, RRF_RT_REG_BINARY, NULL, (BYTE*)pv->blob.pBlobData, &size); break; } default: @@ -211,19 +211,19 @@ static HRESULT MMDevice_SetPropValue(const GUID *devguid, DWORD flow, REFPROPERT { case VT_UI4: { - ret = RegSetValueExW(regkey, buffer, 0, REG_DWORD, (const BYTE*)&pv->u.ulVal, sizeof(DWORD)); + ret = RegSetValueExW(regkey, buffer, 0, REG_DWORD, (const BYTE*)&pv->ulVal, sizeof(DWORD)); break; } case VT_BLOB: { - ret = RegSetValueExW(regkey, buffer, 0, REG_BINARY, pv->u.blob.pBlobData, pv->u.blob.cbSize); - TRACE("Blob %p %u\n", pv->u.blob.pBlobData, pv->u.blob.cbSize); + ret = RegSetValueExW(regkey, buffer, 0, REG_BINARY, pv->blob.pBlobData, pv->blob.cbSize); + TRACE("Blob %p %u\n", pv->blob.pBlobData, pv->blob.cbSize); break; } case VT_LPWSTR: { - ret = RegSetValueExW(regkey, buffer, 0, REG_SZ, (const BYTE*)pv->u.pwszVal, sizeof(WCHAR)*(1+lstrlenW(pv->u.pwszVal))); + ret = RegSetValueExW(regkey, buffer, 0, REG_SZ, (const BYTE*)pv->pwszVal, sizeof(WCHAR)*(1+lstrlenW(pv->pwszVal))); break; } default: @@ -327,12 +327,12 @@ static MMDevice *MMDevice_Create(WCHAR *name, GUID *id, EDataFlow flow, DWORD st PROPVARIANT pv; pv.vt = VT_LPWSTR; - pv.u.pwszVal = name; + pv.pwszVal = name; MMDevice_SetPropValue(id, flow, (const PROPERTYKEY*)&DEVPKEY_Device_FriendlyName, &pv); MMDevice_SetPropValue(id, flow, (const PROPERTYKEY*)&DEVPKEY_DeviceInterface_FriendlyName, &pv); MMDevice_SetPropValue(id, flow, (const PROPERTYKEY*)&DEVPKEY_Device_DeviceDesc, &pv); - pv.u.pwszVal = guidstr; + pv.pwszVal = guidstr; MMDevice_SetPropValue(id, flow, &deviceinterface_key, &pv); set_driver_prop_value(id, flow, &devicepath_key); @@ -340,7 +340,7 @@ static MMDevice *MMDevice_Create(WCHAR *name, GUID *id, EDataFlow flow, DWORD st if (FAILED(set_driver_prop_value(id, flow, &PKEY_AudioEndpoint_FormFactor))) { pv.vt = VT_UI4; - pv.u.ulVal = (flow == eCapture) ? Microphone : Speakers; + pv.ulVal = (flow == eCapture) ? Microphone : Speakers; MMDevice_SetPropValue(id, flow, &PKEY_AudioEndpoint_FormFactor, &pv); } @@ -423,12 +423,12 @@ static HRESULT load_devices_from_reg(void) && SUCCEEDED(MMDevice_GetPropValue(&guid, curflow, (const PROPERTYKEY*)&DEVPKEY_Device_FriendlyName, &pv)) && pv.vt == VT_LPWSTR) { - DWORD size_bytes = (lstrlenW(pv.u.pwszVal) + 1) * sizeof(WCHAR); + DWORD size_bytes = (lstrlenW(pv.pwszVal) + 1) * sizeof(WCHAR); WCHAR *name = HeapAlloc(GetProcessHeap(), 0, size_bytes); - memcpy(name, pv.u.pwszVal, size_bytes); + memcpy(name, pv.pwszVal, size_bytes); MMDevice_Create(name, &guid, curflow, DEVICE_STATE_NOTPRESENT, FALSE); - CoTaskMemFree(pv.u.pwszVal); + CoTaskMemFree(pv.pwszVal); } } while (1); @@ -455,8 +455,8 @@ static HRESULT set_format(MMDevice *dev) IAudioClient_Release(client); pv.vt = VT_BLOB; - pv.u.blob.cbSize = sizeof(WAVEFORMATEX) + fmt->cbSize; - pv.u.blob.pBlobData = (BYTE*)fmt; + pv.blob.cbSize = sizeof(WAVEFORMATEX) + fmt->cbSize; + pv.blob.pBlobData = (BYTE*)fmt; MMDevice_SetPropValue(&dev->devguid, dev->flow, &PKEY_AudioEngine_DeviceFormat, &pv); MMDevice_SetPropValue(&dev->devguid, dev->flow, @@ -1420,10 +1420,10 @@ static HRESULT WINAPI MMDevPropStore_GetValue(IPropertyStore *iface, REFPROPERTY if (IsEqualPropertyKey(*key, PKEY_AudioEndpoint_GUID)) { pv->vt = VT_LPWSTR; - pv->u.pwszVal = CoTaskMemAlloc(39 * sizeof(WCHAR)); - if (!pv->u.pwszVal) + pv->pwszVal = CoTaskMemAlloc(39 * sizeof(WCHAR)); + if (!pv->pwszVal) return E_OUTOFMEMORY; - StringFromGUID2(&This->parent->devguid, pv->u.pwszVal, 39); + StringFromGUID2(&This->parent->devguid, pv->pwszVal, 39); return S_OK; } @@ -1545,10 +1545,10 @@ static HRESULT WINAPI info_device_ps_GetValue(IPropertyStore *iface, { INT size = (lstrlenW(drvs.module_name) + 1) * sizeof(WCHAR); pv->vt = VT_LPWSTR; - pv->u.pwszVal = CoTaskMemAlloc(size); - if (!pv->u.pwszVal) + pv->pwszVal = CoTaskMemAlloc(size); + if (!pv->pwszVal) return E_OUTOFMEMORY; - memcpy(pv->u.pwszVal, drvs.module_name, size); + memcpy(pv->pwszVal, drvs.module_name, size); return S_OK; } diff --git a/dlls/mmdevapi/spatialaudio.c b/dlls/mmdevapi/spatialaudio.c index 7ec09b663aa..597c2d29933 100644 --- a/dlls/mmdevapi/spatialaudio.c +++ b/dlls/mmdevapi/spatialaudio.c @@ -757,13 +757,13 @@ static HRESULT WINAPI SAC_ActivateSpatialAudioStream(ISpatialAudioClient *iface, if(prop && (prop->vt != VT_BLOB || - prop->u.blob.cbSize != sizeof(SpatialAudioObjectRenderStreamActivationParams))){ + prop->blob.cbSize != sizeof(SpatialAudioObjectRenderStreamActivationParams))){ WARN("Got invalid params\n"); *stream = NULL; return E_INVALIDARG; } - params = (SpatialAudioObjectRenderStreamActivationParams*) prop->u.blob.pBlobData; + params = (SpatialAudioObjectRenderStreamActivationParams*) prop->blob.pBlobData; if(params->StaticObjectTypeMask & AudioObjectType_Dynamic){ *stream = NULL;

1 0

Jacek Caban : mmdevapi/tests: Use nameless unions.
by Alexandre Julliard 26 Mar '21

26 Mar '21

Module: wine Branch: master Commit: 25f5734ead98dbf646e1b7a4a1ebe6c916891009 URL: https://source.winehq.org/git/wine.git/?a=commit;h=25f5734ead98dbf646e1b7a4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 25 21:39:59 2021 +0100 mmdevapi/tests: Use nameless unions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/tests/Makefile.in | 1 - dlls/mmdevapi/tests/propstore.c | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/mmdevapi/tests/Makefile.in b/dlls/mmdevapi/tests/Makefile.in index 4b43b900b31..dd180a253b9 100644 --- a/dlls/mmdevapi/tests/Makefile.in +++ b/dlls/mmdevapi/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = mmdevapi.dll IMPORTS = ole32 version user32 advapi32 winmm -EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION C_SRCS = \ capture.c \ diff --git a/dlls/mmdevapi/tests/propstore.c b/dlls/mmdevapi/tests/propstore.c index e5071e67e52..8999699fe6b 100644 --- a/dlls/mmdevapi/tests/propstore.c +++ b/dlls/mmdevapi/tests/propstore.c @@ -49,7 +49,7 @@ static void test_propertystore(IPropertyStore *store) ok(pv.vt == VT_LPWSTR, "Value should be %i, is %i\n", VT_LPWSTR, pv.vt); if (hr == S_OK && pv.vt == VT_LPWSTR) { - WideCharToMultiByte(CP_ACP, 0, pv.u.pwszVal, -1, temp, sizeof(temp)-1, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, pv.pwszVal, -1, temp, sizeof(temp)-1, NULL, NULL); trace("guid: %s\n", temp); PropVariantClear(&pv); } @@ -57,7 +57,7 @@ static void test_propertystore(IPropertyStore *store) pv.vt = VT_EMPTY; hr = IPropertyStore_GetValue(store, (const PROPERTYKEY*)&DEVPKEY_DeviceInterface_FriendlyName, &pv); ok(hr == S_OK, "Failed with %08x\n", hr); - ok(pv.vt == VT_LPWSTR && pv.u.pwszVal, "FriendlyName value had wrong type: 0x%x or was NULL\n", pv.vt); + ok(pv.vt == VT_LPWSTR && pv.pwszVal, "FriendlyName value had wrong type: 0x%x or was NULL\n", pv.vt); PropVariantClear(&pv); pv.vt = VT_EMPTY; @@ -86,7 +86,7 @@ static void test_deviceinterface(IPropertyStore *store) hr = IPropertyStore_GetValue(store, &deviceinterface_key, &pv); ok(hr == S_OK, "GetValue failed: %08x\n", hr); ok(pv.vt == VT_LPWSTR, "Got wrong variant type: 0x%x\n", pv.vt); - trace("device interface: %s\n", wine_dbgstr_w(pv.u.pwszVal)); + trace("device interface: %s\n", wine_dbgstr_w(pv.pwszVal)); PropVariantClear(&pv); } @@ -139,10 +139,10 @@ static void test_setvalue_on_wow64(IPropertyStore *store) hr = IPropertyStore_GetValue(store, &PKEY_AudioEndpoint_GUID, &pv); ok(hr == S_OK, "Failed to get Endpoint GUID: %08x\n", hr); - guidW = pv.u.pwszVal; + guidW = pv.pwszVal; pv.vt = VT_UI4; - pv.u.ulVal = 0xAB; + pv.ulVal = 0xAB; hr = IPropertyStore_SetValue(store, &PKEY_Bogus, &pv); ok(hr == S_OK || hr == E_ACCESSDENIED, "SetValue failed: %08x\n", hr); @@ -152,11 +152,11 @@ static void test_setvalue_on_wow64(IPropertyStore *store) return; } - pv.u.ulVal = 0x00; + pv.ulVal = 0x00; hr = IPropertyStore_GetValue(store, &PKEY_Bogus, &pv); ok(hr == S_OK, "GetValue failed: %08x\n", hr); - ok(pv.u.ulVal == 0xAB, "Got wrong value: 0x%x\n", pv.u.ulVal); + ok(pv.ulVal == 0xAB, "Got wrong value: 0x%x\n", pv.ulVal); /* should find the key in 64-bit view */ ret = RegOpenKeyExW(HKEY_LOCAL_MACHINE, software_renderW, 0, KEY_READ|KEY_WOW64_64KEY, &root);

1 0

Alistair Leslie-Hughes : msado15: Implement _Recordset get/put Bookmark.
by Alexandre Julliard 26 Mar '21

26 Mar '21

Module: wine Branch: master Commit: db509cf4fe862ed13beccd0d281b854aa905a45e URL: https://source.winehq.org/git/wine.git/?a=commit;h=db509cf4fe862ed13beccd0d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Mar 26 08:09:17 2021 +1100 msado15: Implement _Recordset get/put Bookmark. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/recordset.c | 22 ++++++++++++++++++---- dlls/msado15/tests/msado15.c | 17 +++++++++++++++++ 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index a86936eb037..68d4c22d802 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -1029,14 +1029,28 @@ static HRESULT WINAPI recordset_get_BOF( _Recordset *iface, VARIANT_BOOL *bof ) static HRESULT WINAPI recordset_get_Bookmark( _Recordset *iface, VARIANT *bookmark ) { - FIXME( "%p, %p\n", iface, bookmark ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + TRACE( "%p, %p\n", iface, bookmark ); + + if (recordset->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); + if (recordset->index < 0) return MAKE_ADO_HRESULT( adErrNoCurrentRecord ); + + V_VT(bookmark) = VT_I4; + V_I4(bookmark) = recordset->index; + return S_OK; } static HRESULT WINAPI recordset_put_Bookmark( _Recordset *iface, VARIANT bookmark ) { - FIXME( "%p, %s\n", iface, debugstr_variant(&bookmark) ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + TRACE( "%p, %s\n", iface, debugstr_variant(&bookmark) ); + + if (recordset->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); + + if (V_VT(&bookmark) != VT_I4) return MAKE_ADO_HRESULT( adErrInvalidArgument ); + + recordset->index = V_I4(&bookmark); + return S_OK; } static HRESULT WINAPI recordset_get_CacheSize( _Recordset *iface, LONG *size ) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index bc9b4a24761..db606f21fab 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -74,6 +74,7 @@ static void test_Recordset(void) CursorTypeEnum cursor; BSTR name; HRESULT hr; + VARIANT bookmark; hr = CoCreateInstance( &CLSID_Recordset, NULL, CLSCTX_INPROC_SERVER, &IID__Recordset, (void **)&recordset ); ok( hr == S_OK, "got %08x\n", hr ); @@ -153,6 +154,14 @@ static void test_Recordset(void) ok( hr == S_OK, "got %08x\n", hr ); ok( cursor == adOpenForwardOnly, "got %d\n", cursor ); + VariantInit( &bookmark ); + hr = _Recordset_get_Bookmark( recordset, &bookmark ); + ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr ); + + VariantInit( &bookmark ); + hr = _Recordset_put_Bookmark( recordset, bookmark ); + ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr ); + VariantInit( &missing ); hr = _Recordset_AddNew( recordset, missing, missing ); ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr ); @@ -188,6 +197,14 @@ static void test_Recordset(void) ok( hr == S_OK, "got %08x\n", hr ); ok( state == adStateOpen, "got %d\n", state ); + VariantInit( &bookmark ); + hr = _Recordset_get_Bookmark( recordset, &bookmark ); + ok( hr == MAKE_ADO_HRESULT( adErrNoCurrentRecord ), "got %08x\n", hr ); + + VariantInit( &bookmark ); + hr = _Recordset_put_Bookmark( recordset, bookmark ); + ok( hr == MAKE_ADO_HRESULT( adErrInvalidArgument ), "got %08x\n", hr ); + count = -1; hr = _Recordset_get_RecordCount( recordset, &count ); ok( hr == S_OK, "got %08x\n", hr );

1 0

Giovanni Mascellani : mfreadwrite: Simplify iteration through streams.
by Alexandre Julliard 26 Mar '21

26 Mar '21

Module: wine Branch: master Commit: 06366bd16b82b79b21a698808c6cb3744fbba151 URL: https://source.winehq.org/git/wine.git/?a=commit;h=06366bd16b82b79b21a69880… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Mar 26 09:07:37 2021 +0100 mfreadwrite: Simplify iteration through streams. This also fixes a bug happening when the reader has only one stream, in which case the iteration body was not even executed once. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/reader.c | 14 ++++++------ dlls/mfreadwrite/tests/mfplat.c | 50 +++++++++++++++++++++++++++++++++++------ 2 files changed, 50 insertions(+), 14 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 2819b800eb9..ab9f6c83674 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -1087,13 +1087,10 @@ static BOOL source_reader_get_read_result(struct source_reader *reader, struct m static HRESULT source_reader_get_next_selected_stream(struct source_reader *reader, unsigned int *stream_index) { - unsigned int i, start_idx, stop_idx, first_selected = ~0u, requests = ~0u; + unsigned int i, first_selected = ~0u, requests = ~0u; BOOL selected, stream_drained; - start_idx = (reader->last_read_index + 1) % reader->stream_count; - stop_idx = reader->last_read_index == ~0u ? reader->stream_count : reader->last_read_index; - - for (i = start_idx; i < reader->stream_count && i != stop_idx; i = (i + 1) % (reader->stream_count + 1)) + for (i = (reader->last_read_index + 1) % reader->stream_count; ; i = (i + 1) % reader->stream_count) { stream_drained = reader->streams[i].state == STREAM_STATE_EOS && !reader->streams[i].responses; selected = SUCCEEDED(source_reader_get_stream_selection(reader, i, &selected)) && selected; @@ -1110,6 +1107,9 @@ static HRESULT source_reader_get_next_selected_stream(struct source_reader *read *stream_index = i; } } + + if (i == reader->last_read_index) + break; } /* If all selected streams reached EOS, use first selected. */ @@ -1477,7 +1477,7 @@ static HRESULT WINAPI src_reader_SetStreamSelection(IMFSourceReader *iface, DWOR } if (selection_changed) - reader->last_read_index = ~0u; + reader->last_read_index = reader->stream_count - 1; LeaveCriticalSection(&reader->cs); @@ -2360,7 +2360,7 @@ static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttri /* At least one major type has to be set. */ object->first_audio_stream_index = reader_get_first_stream_index(object->descriptor, &MFMediaType_Audio); object->first_video_stream_index = reader_get_first_stream_index(object->descriptor, &MFMediaType_Video); - object->last_read_index = ~0u; + object->last_read_index = object->stream_count - 1; if (object->first_audio_stream_index == MF_SOURCE_READER_INVALID_STREAM_INDEX && object->first_video_stream_index == MF_SOURCE_READER_INVALID_STREAM_INDEX) diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 25aa29ac272..c27806f699e 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -501,7 +501,7 @@ static struct test_media_stream *create_test_stream(DWORD stream_index, IMFMedia return stream; } -static IMFMediaSource *create_test_source(void) +static IMFMediaSource *create_test_source(int stream_num) { struct test_source *source; int i; @@ -511,7 +511,7 @@ static IMFMediaSource *create_test_source(void) source->refcount = 1; MFCreateEventQueue(&source->event_queue); InitializeCriticalSection(&source->cs); - for (i = 0; i < ARRAY_SIZE(source->streams); ++i) + for (i = 0; i < stream_num; ++i) source->streams[i] = create_test_stream(i, &source->IMFMediaSource_iface); return &source->IMFMediaSource_iface; @@ -904,7 +904,7 @@ static void test_source_reader_from_media_source(void) int i; PROPVARIANT pos; - source = create_test_source(); + source = create_test_source(3); ok(!!source, "Failed to create test source.\n"); hr = MFCreateSourceReaderFromMediaSource(source, NULL, &reader); @@ -970,8 +970,44 @@ static void test_source_reader_from_media_source(void) IMFSourceReader_Release(reader); IMFMediaSource_Release(source); + source = create_test_source(1); + ok(!!source, "Failed to create test source.\n"); + + hr = MFCreateSourceReaderFromMediaSource(source, NULL, &reader); + ok(hr == S_OK, "Failed to create source reader, hr %#x.\n", hr); + + /* MF_SOURCE_READER_ANY_STREAM with a single stream */ + hr = IMFSourceReader_SetStreamSelection(reader, 0, TRUE); + ok(hr == S_OK, "Failed to select a stream, hr %#x.\n", hr); + + pos.vt = VT_I8; + pos.hVal.QuadPart = 0; + hr = IMFSourceReader_SetCurrentPosition(reader, &GUID_NULL, &pos); + ok(hr == S_OK, "Failed to seek to beginning of stream, hr %#x.\n", hr); + + hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_ANY_STREAM, 0, &actual_index, &stream_flags, + &timestamp, &sample); + ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr); + ok(actual_index == 0, "Unexpected stream index %u\n", actual_index); + ok(!stream_flags, "Unexpected stream flags %#x.\n", stream_flags); + ok(timestamp == 123, "Unexpected timestamp.\n"); + ok(!!sample, "Expected sample object.\n"); + IMFSample_Release(sample); + + hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_ANY_STREAM, 0, &actual_index, &stream_flags, + &timestamp, &sample); + ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr); + ok(actual_index == 0, "Unexpected stream index %u\n", actual_index); + ok(!stream_flags, "Unexpected stream flags %#x.\n", stream_flags); + ok(timestamp == 123, "Unexpected timestamp.\n"); + ok(!!sample, "Expected sample object.\n"); + IMFSample_Release(sample); + + IMFSourceReader_Release(reader); + IMFMediaSource_Release(source); + /* Request from stream 0. */ - source = create_test_source(); + source = create_test_source(3); ok(!!source, "Failed to create test source.\n"); hr = MFCreateSourceReaderFromMediaSource(source, NULL, &reader); @@ -1005,7 +1041,7 @@ static void test_source_reader_from_media_source(void) IMFMediaSource_Release(source); /* Async mode. */ - source = create_test_source(); + source = create_test_source(3); ok(!!source, "Failed to create test source.\n"); callback = create_async_callback(); @@ -1050,7 +1086,7 @@ static void test_source_reader_from_media_source(void) IMFMediaSource_Release(source); /* RequestSample failure. */ - source = create_test_source(); + source = create_test_source(3); ok(!!source, "Failed to create test source.\n"); fail_request_sample = TRUE; @@ -1120,7 +1156,7 @@ static void test_reader_d3d9(void) hr = IDirect3DDeviceManager9_ResetDevice(d3d9_manager, d3d9_device, token); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - source = create_test_source(); + source = create_test_source(3); ok(!!source, "Failed to create test source.\n"); hr = MFCreateAttributes(&attributes, 1);

1 0

Nikolay Sivov : mfreadwrite/reader: Use shared multi-threaded queue internally.
by Alexandre Julliard 26 Mar '21

26 Mar '21

Module: wine Branch: master Commit: 657a76ce2337e523c4f3c35e73aaf92c1f0969d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=657a76ce2337e523c4f3c35e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 26 11:23:21 2021 +0300 mfreadwrite/reader: Use shared multi-threaded queue internally. Using dedicated queue prevents potential lockups with event queue, specifically when waiting on event queue for seek to finish blocks events delivery. The issue was diagnosed by Giovanni. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/reader.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index ab9f6c83674..d3df7abd9fc 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -195,6 +195,7 @@ struct source_reader unsigned int last_read_index; unsigned int stream_count; unsigned int flags; + unsigned int queue; enum media_source_state source_state; struct media_stream *streams; struct list responses; @@ -384,8 +385,7 @@ static void source_reader_response_ready(struct source_reader *reader, struct st if (SUCCEEDED(source_reader_create_async_op(SOURCE_READER_ASYNC_SAMPLE_READY, &command))) { command->u.sample.stream_index = stream->index; - if (FAILED(hr = MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_STANDARD, &reader->async_commands_callback, - &command->IUnknown_iface))) + if (FAILED(hr = MFPutWorkItem(reader->queue, &reader->async_commands_callback, &command->IUnknown_iface))) WARN("Failed to submit async result, hr %#x.\n", hr); IUnknown_Release(&command->IUnknown_iface); } @@ -1396,6 +1396,7 @@ static ULONG WINAPI src_reader_Release(IMFSourceReader *iface) } source_reader_release_responses(reader, NULL); heap_free(reader->streams); + MFUnlockWorkQueue(reader->queue); DeleteCriticalSection(&reader->cs); heap_free(reader); } @@ -1873,8 +1874,7 @@ static HRESULT WINAPI src_reader_SetCurrentPosition(IMFSourceReader *iface, REFG command->u.seek.format = *format; PropVariantCopy(&command->u.seek.position, position); - hr = MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_MULTITHREADED, &reader->async_commands_callback, - &command->IUnknown_iface); + hr = MFPutWorkItem(reader->queue, &reader->async_commands_callback, &command->IUnknown_iface); IUnknown_Release(&command->IUnknown_iface); } } @@ -1976,7 +1976,7 @@ static HRESULT source_reader_read_sample_async(struct source_reader *reader, uns command->u.read.stream_index = index; command->u.read.flags = flags; - hr = MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_STANDARD, &reader->async_commands_callback, &command->IUnknown_iface); + hr = MFPutWorkItem(reader->queue, &reader->async_commands_callback, &command->IUnknown_iface); IUnknown_Release(&command->IUnknown_iface); } } @@ -2040,7 +2040,7 @@ static HRESULT source_reader_flush_async(struct source_reader *reader, unsigned command->u.flush.stream_index = stream_index; - hr = MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_STANDARD, &reader->async_commands_callback, &command->IUnknown_iface); + hr = MFPutWorkItem(reader->queue, &reader->async_commands_callback, &command->IUnknown_iface); IUnknown_Release(&command->IUnknown_iface); return hr; @@ -2265,7 +2265,7 @@ static HRESULT WINAPI stream_sample_allocator_cb_NotifyRelease(IMFVideoSampleAll if (SUCCEEDED(source_reader_create_async_op(SOURCE_READER_ASYNC_SA_READY, &command))) { command->u.sa.stream_index = stream->index; - MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_STANDARD, &stream->reader->async_commands_callback, &command->IUnknown_iface); + MFPutWorkItem(stream->reader->queue, &stream->reader->async_commands_callback, &command->IUnknown_iface); IUnknown_Release(&command->IUnknown_iface); } @@ -2406,7 +2406,11 @@ static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttri } } - hr = IMFSourceReader_QueryInterface(&object->IMFSourceReader_iface, riid, out); + if (FAILED(hr = MFLockSharedWorkQueue(L"", 0, NULL, &object->queue))) + WARN("Failed to acquired shared queue, hr %#x.\n", hr); + + if (SUCCEEDED(hr)) + hr = IMFSourceReader_QueryInterface(&object->IMFSourceReader_iface, riid, out); failed: IMFSourceReader_Release(&object->IMFSourceReader_iface);

1 0

Nikolay Sivov : mfplat/tests: Add media source rate service tests.
by Alexandre Julliard 26 Mar '21

26 Mar '21

Module: wine Branch: master Commit: 49886f031257cd8cf685456b89ed91fe77f60c6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=49886f031257cd8cf685456b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 26 09:25:26 2021 +0100 mfplat/tests: Add media source rate service tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 1b24dce2fe0..103441be14c 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -93,6 +93,26 @@ static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOO IUnknown_Release(unk); } +#define check_service_interface(a, b, c, d) check_service_interface_(__LINE__, a, b, c, d) +static void check_service_interface_(unsigned int line, void *iface_ptr, REFGUID service, REFIID iid, BOOL supported) +{ + IUnknown *iface = iface_ptr; + HRESULT hr, expected_hr; + IMFGetService *gs; + IUnknown *unk; + + expected_hr = supported ? S_OK : E_NOINTERFACE; + + if (SUCCEEDED(hr = IUnknown_QueryInterface(iface, &IID_IMFGetService, (void **)&gs))) + { + hr = IMFGetService_GetService(gs, service, iid, (void **)&unk); + IMFGetService_Release(gs); + } + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); +} + struct d3d11_resource_readback { ID3D11Resource *resource; @@ -737,6 +757,11 @@ static void test_source_resolver(void) ok(mediasource != NULL, "got %p\n", mediasource); ok(obj_type == MF_OBJECT_MEDIASOURCE, "got %d\n", obj_type); +todo_wine { + check_interface(mediasource, &IID_IMFGetService, TRUE); + check_service_interface(mediasource, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, TRUE); + check_service_interface(mediasource, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateControl, TRUE); +} hr = IMFMediaSource_CreatePresentationDescriptor(mediasource, &descriptor); ok(hr == S_OK, "Failed to get presentation descriptor, hr %#x.\n", hr); ok(descriptor != NULL, "got %p\n", descriptor);

1 0

Francois Gouget : testbot: Increase the Windows executable build timeout.
by Alexandre Julliard 26 Mar '21

26 Mar '21

Module: tools Branch: master Commit: baf74a52b9a837afa3a6b5262b9311eb7421fd7d URL: https://source.winehq.org/git/tools.git/?a=commit;h=baf74a52b9a837afa3a6b52… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 26 11:53:24 2021 +0100 testbot: Increase the Windows executable build timeout. Even without the configure step a build can take a bit more than 6 minutes. So increase the timeout to 8 minutes to have some margin. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Config.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index fe4a27c..089d792 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -117,7 +117,7 @@ $ReconfigBuildTimeout = 60; # Exe build timeouts (in seconds) # - For a full build -$ExeBuildTimeout = 6 * 60; +$ExeBuildTimeout = 8 * 60; # - For a single module $ExeModuleTimeout = 30;

1 0

Francois Gouget : testbot/WineTest: Pass the full path to winetest.exe.
by Alexandre Julliard 26 Mar '21

26 Mar '21

Module: tools Branch: master Commit: f8d4bd7769365a023c73ca9058be228917b84c1a URL: https://source.winehq.org/git/tools.git/?a=commit;h=f8d4bd7769365a023c73ca9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 26 13:05:38 2021 +0100 testbot/WineTest: Pass the full path to winetest.exe. It is not installed in the wineprefix and thus is not in %PATH%. So Wine needs its full path to find it. Signed-off-by: Francois Gouget <fgouget(a)icodeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/WineTest.pl | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index dd41fcf..498b8af 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -86,7 +86,8 @@ sub WineTestSuite($$$$) # there are test failures. my $BaseName = SetupTest("WineTest", $Mission); my $Tag = SanitizeTag("$BaseTag-$BaseName"); - RunWine($Mission, "winetest.exe", + my $WineDir = GetWineDir($Mission); + RunWine($Mission, "$WineDir/programs/winetest/winetest.exe", "-c -o '$DataDir/$BaseName.report' -t $Tag ". ShArgv2Cmd(@$Args)); if (!-f "$DataDir/$BaseName.report") { @@ -96,7 +97,7 @@ sub WineTestSuite($$$$) # Send the report to the website if ((!$NoSubmit and !$Mission->{nosubmit}) and - RunWine($Mission, "winetest.exe", + RunWine($Mission, "$WineDir/programs/winetest/winetest.exe", "-c -s '$DataDir/$BaseName.report'")) { LogMsg "WineTest failed to send the $BaseName report\n"; @@ -142,7 +143,8 @@ sub TestPatch($$) # Run WineTest. Ignore the exit code since it returns non-zero whenever # there are test failures. my $BaseName = SetupTest("the tests", $Mission); - RunWine($Mission, "winetest.exe", + my $WineDir = GetWineDir($Mission); + RunWine($Mission, "$WineDir/programs/winetest/winetest.exe", "-c -o '$DataDir/$BaseName.report' -t do.not.submit ". join(" ", @TestList)); if (!-f "$DataDir/$BaseName.report")

1 0