February 2022 - Wine-commits

Eric Pouech : spoolsv: Enable compilation with long types.
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: bd298b4a02a5d8694aad3687db8993a50f2ae0e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd298b4a02a5d8694aad3687… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 7 08:39:49 2022 +0100 spoolsv: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/spoolsv/Makefile.in | 1 - programs/spoolsv/main.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/spoolsv/Makefile.in b/programs/spoolsv/Makefile.in index 04c8a5cbeee..5046a9c0861 100644 --- a/programs/spoolsv/Makefile.in +++ b/programs/spoolsv/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = spoolsv.exe IMPORTS = advapi32 diff --git a/programs/spoolsv/main.c b/programs/spoolsv/main.c index 2893fa614a1..3640ccee754 100644 --- a/programs/spoolsv/main.c +++ b/programs/spoolsv/main.c @@ -52,7 +52,7 @@ static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_ SetEvent( stop_event ); return NO_ERROR; default: - WINE_FIXME( "got service ctrl %x\n", ctrl ); + WINE_FIXME( "got service ctrl %lx\n", ctrl ); status.dwCurrentState = SERVICE_RUNNING; SetServiceStatus( service_handle, &status ); return NO_ERROR;

1 0

Eric Pouech : start: Enable compilation with long types.
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: e704f0372ed396ddefe6b8c65f71da6d201857b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e704f0372ed396ddefe6b8c6… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 7 08:39:55 2022 +0100 start: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/start/Makefile.in | 1 - programs/start/start.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/programs/start/Makefile.in b/programs/start/Makefile.in index 7dfdd55b794..04bc38808bf 100644 --- a/programs/start/Makefile.in +++ b/programs/start/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = start.exe IMPORTS = shell32 user32 diff --git a/programs/start/start.c b/programs/start/start.c index b5bf8187603..998c439423e 100644 --- a/programs/start/start.c +++ b/programs/start/start.c @@ -98,7 +98,7 @@ static void fatal_string_error(int which, DWORD error_code, const WCHAR *filenam WCHAR msg[2048]; if (!LoadStringW(GetModuleHandleW(NULL), which, msg, ARRAY_SIZE(msg))) - WINE_ERR("LoadString failed, error %d\n", GetLastError()); + WINE_ERR("LoadString failed, error %ld\n", GetLastError()); fatal_error(msg, error_code, filename); } @@ -108,7 +108,7 @@ static void fatal_string(int which) WCHAR msg[2048]; if (!LoadStringW(GetModuleHandleW(NULL), which, msg, ARRAY_SIZE(msg))) - WINE_ERR("LoadString failed, error %d\n", GetLastError()); + WINE_ERR("LoadString failed, error %ld\n", GetLastError()); output(msg); ExitProcess(1);

1 0

Eric Pouech : svchost: Enable compilation with long types.
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: 528c7a5f0cefc02d3c35cfbe0b9d229d9c5c7609 URL: https://source.winehq.org/git/wine.git/?a=commit;h=528c7a5f0cefc02d3c35cfbe… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 7 08:40:01 2022 +0100 svchost: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/svchost/Makefile.in | 1 - programs/svchost/svchost.c | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/programs/svchost/Makefile.in b/programs/svchost/Makefile.in index 969a31da11e..f31e393c8af 100644 --- a/programs/svchost/Makefile.in +++ b/programs/svchost/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = svchost.exe IMPORTS = advapi32 diff --git a/programs/svchost/svchost.c b/programs/svchost/svchost.c index 603deef1abd..618147a55c4 100644 --- a/programs/svchost/svchost.c +++ b/programs/svchost/svchost.c @@ -86,7 +86,7 @@ static LPWSTR ExpandEnv(LPWSTR string) size = ExpandEnvironmentStringsW(string, NULL, size); if (size == 0) { - WINE_ERR("cannot expand env vars in %s: %u\n", + WINE_ERR("cannot expand env vars in %s: %lu\n", wine_dbgstr_w(string), GetLastError()); return NULL; } @@ -94,7 +94,7 @@ static LPWSTR ExpandEnv(LPWSTR string) (size + 1) * sizeof(WCHAR)); if (ExpandEnvironmentStringsW(string, expanded_string, size) == 0) { - WINE_ERR("cannot expand env vars in %s: %u\n", + WINE_ERR("cannot expand env vars in %s: %lu\n", wine_dbgstr_w(string), GetLastError()); HeapFree(GetProcessHeap(), 0, expanded_string); return NULL; @@ -134,7 +134,7 @@ static BOOL AddServiceElem(LPWSTR service_name, KEY_READ, &service_hkey); if (ret != ERROR_SUCCESS) { - WINE_ERR("cannot open key %s, err=%d\n", + WINE_ERR("cannot open key %s, err=%ld\n", wine_dbgstr_w(service_param_key), ret); goto cleanup; } @@ -182,7 +182,7 @@ static BOOL AddServiceElem(LPWSTR service_name, library = LoadLibraryExW(dll_name_long, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); if (!library) { - WINE_ERR("failed to load library %s, err=%u\n", + WINE_ERR("failed to load library %s, err=%lu\n", wine_dbgstr_w(dll_name_long), GetLastError()); goto cleanup; } @@ -240,7 +240,7 @@ static BOOL StartGroupServices(LPWSTR services) service_name = service_name + lstrlenW(service_name); ++service_name; } - WINE_TRACE("Service group contains %d services\n", service_count); + WINE_TRACE("Service group contains %ld services\n", service_count); /* Populate the service table */ service_table = HeapAlloc(GetProcessHeap(), 0, @@ -263,7 +263,7 @@ static BOOL StartGroupServices(LPWSTR services) /* Start the services */ if (!(ret = StartServiceCtrlDispatcherW(service_table))) - WINE_ERR("StartServiceCtrlDispatcherW failed to start %s: %u\n", + WINE_ERR("StartServiceCtrlDispatcherW failed to start %s: %lu\n", wine_dbgstr_w(services), GetLastError()); HeapFree(GetProcessHeap(), 0, service_table); @@ -285,7 +285,7 @@ static BOOL LoadGroup(PWCHAR group_name) KEY_READ, &group_hkey); if (ret != ERROR_SUCCESS) { - WINE_ERR("cannot open key %s, err=%d\n", + WINE_ERR("cannot open key %s, err=%ld\n", wine_dbgstr_w(svchost_path), ret); return FALSE; }

1 0

Eric Pouech : termsv: Enable compilation with long types.
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: 86476f1c3ce1de946cf216b5c39c07f2aeb6b4bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=86476f1c3ce1de946cf216b5… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 7 08:40:07 2022 +0100 termsv: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/termsv/Makefile.in | 1 - programs/termsv/main.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/termsv/Makefile.in b/programs/termsv/Makefile.in index 9876e2faaba..6a83ee3b9b9 100644 --- a/programs/termsv/Makefile.in +++ b/programs/termsv/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = termsv.exe IMPORTS = advapi32 diff --git a/programs/termsv/main.c b/programs/termsv/main.c index 2ca6d0809df..680f57fc711 100644 --- a/programs/termsv/main.c +++ b/programs/termsv/main.c @@ -51,7 +51,7 @@ static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_ SetEvent( stop_event ); return NO_ERROR; default: - WINE_FIXME( "got service ctrl %x\n", ctrl ); + WINE_FIXME( "got service ctrl %lx\n", ctrl ); status.dwCurrentState = SERVICE_RUNNING; SetServiceStatus( service_handle, &status ); return NO_ERROR;

1 0

Alistair Leslie-Hughes : xactengine3_7/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: 111c87f444b167f56633462f778d9f5aa6ef53ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=111c87f444b167f56633462f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Feb 6 13:47:16 2022 +1100 xactengine3_7/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xactengine3_7/tests/Makefile.in | 1 - dlls/xactengine3_7/tests/xact3.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/xactengine3_7/tests/Makefile.in b/dlls/xactengine3_7/tests/Makefile.in index 693c3687728..c32b2562546 100644 --- a/dlls/xactengine3_7/tests/Makefile.in +++ b/dlls/xactengine3_7/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = xactengine3_7.dll IMPORTS = ole32 diff --git a/dlls/xactengine3_7/tests/xact3.c b/dlls/xactengine3_7/tests/xact3.c index 6b04c36a9f0..623a1c97db8 100644 --- a/dlls/xactengine3_7/tests/xact3.c +++ b/dlls/xactengine3_7/tests/xact3.c @@ -84,7 +84,7 @@ static void test_interfaces(void) trace("%d %s not registered. Skipping\n", i, wine_dbgstr_guid(xact_interfaces[i].clsid) ); continue; } - ok(hr == xact_interfaces[i].expected, "%d, Unexpected value 0x%08x\n", i, hr); + ok(hr == xact_interfaces[i].expected, "%d, Unexpected value 0x%08lx\n", i, hr); if (hr == S_OK) IUnknown_Release(unk); }

1 0

Alistair Leslie-Hughes : msdasql: ICommandText Execute use ODBC to fetch results.
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: 50fc9d7ddce7d2abe03549aa28df192b6cd944ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=50fc9d7ddce7d2abe03549aa… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Feb 6 19:07:36 2022 +1100 msdasql: ICommandText Execute use ODBC to fetch results. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/session.c | 59 ++++++++++++++++++++++++++++++++----------- dlls/msdasql/tests/provider.c | 15 ++++++++--- 2 files changed, 56 insertions(+), 18 deletions(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 0f74c126138..199eb0830d6 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -477,6 +477,7 @@ struct msdasql_rowset IColumnsRowset IColumnsRowset_iface; IUnknown *caller; LONG refs; + SQLHSTMT hstmt; }; static inline struct msdasql_rowset *impl_from_IRowset( IRowset *iface ) @@ -575,6 +576,8 @@ static ULONG WINAPI msdasql_rowset_Release(IRowset *iface) { TRACE( "destroying %p\n", rowset ); + SQLFreeHandle(SQL_HANDLE_STMT, rowset->hstmt); + if (rowset->caller) IUnknown_Release(rowset->caller); @@ -845,27 +848,53 @@ static HRESULT WINAPI command_Execute(ICommandText *iface, IUnknown *outer, REFI { struct command *command = impl_from_ICommandText( iface ); struct msdasql_rowset *msrowset; - HRESULT hr; + HRESULT hr = S_OK; + RETCODE ret; + SQLHSTMT hstmt = command->hstmt; + SQLLEN results = -1; - FIXME("%p, %p, %s, %p %p %p Semi Stub\n", command, outer, debugstr_guid(riid), params, affected, rowset); + TRACE("%p, %p, %s, %p %p %p\n", command, outer, debugstr_guid(riid), params, affected, rowset); - msrowset = heap_alloc(sizeof(*msrowset)); - if (!msrowset) - return E_OUTOFMEMORY; + if (!hstmt) + SQLAllocHandle(SQL_HANDLE_STMT, command->hdbc, &hstmt); - msrowset->IRowset_iface.lpVtbl = &msdasql_rowset_vtbl; - msrowset->IRowsetInfo_iface.lpVtbl = &rowset_info_vtbl; - msrowset->IColumnsInfo_iface.lpVtbl = &rowset_columninfo_vtbll; - msrowset->IAccessor_iface.lpVtbl = &accessor_vtbl; - msrowset->IColumnsRowset_iface.lpVtbl = &columnrs_rs_vtbl; - msrowset->refs = 1; - ICommandText_QueryInterface(iface, &IID_IUnknown, (void**)&msrowset->caller); + ret = SQLExecDirectW(hstmt, command->query, SQL_NTS); + if (ret != SQL_SUCCESS) + { + dump_sql_diag_records(SQL_HANDLE_STMT, hstmt); + return E_FAIL; + } + + ret = SQLRowCount(hstmt, &results); + if (ret != SQL_SUCCESS) + ERR("SQLRowCount failed (%d)\n", ret); if (affected) - *affected = 0; /* FIXME */ + *affected = results; + + *rowset = NULL; + if (!wcsnicmp( command->query, L"select ", 7 )) + { + msrowset = heap_alloc(sizeof(*msrowset)); + if (!msrowset) + return E_OUTOFMEMORY; - hr = IRowset_QueryInterface(&msrowset->IRowset_iface, riid, (void**)rowset); - IRowset_Release(&msrowset->IRowset_iface); + command->hstmt = NULL; + + msrowset->IRowset_iface.lpVtbl = &msdasql_rowset_vtbl; + msrowset->IRowsetInfo_iface.lpVtbl = &rowset_info_vtbl; + msrowset->IColumnsInfo_iface.lpVtbl = &rowset_columninfo_vtbll; + msrowset->IAccessor_iface.lpVtbl = &accessor_vtbl; + msrowset->IColumnsRowset_iface.lpVtbl = &columnrs_rs_vtbl; + msrowset->refs = 1; + ICommandText_QueryInterface(iface, &IID_IUnknown, (void**)&msrowset->caller); + msrowset->hstmt = hstmt; + + hr = IRowset_QueryInterface(&msrowset->IRowset_iface, riid, (void**)rowset); + IRowset_Release(&msrowset->IRowset_iface); + } + else + SQLFreeStmt(hstmt, SQL_CLOSE); return hr; } diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 7a5175fa050..d261e34e987 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -382,11 +382,20 @@ static void test_command_rowset(IUnknown *cmd) affected = 9999; hr = ICommandText_Execute(command_text, NULL, &IID_IRowset, NULL, &affected, &unk); ok(hr == S_OK, "got 0x%08lx\n", hr); - todo_wine ok(unk == NULL, "Unexpected value\n"); - todo_wine ok(affected == -1, "got %Id\n", affected); + ok(unk == NULL, "Unexpected value\n"); + ok(affected == -1, "got %Id\n", affected); if (unk) IUnknown_Release(unk); + hr = ICommandText_SetCommandText(command_text, &DBGUID_DEFAULT, L"insert into testing values(1, 0)"); + ok(hr == S_OK, "got 0x%08lx\n", hr); + + affected = 9999; + hr = ICommandText_Execute(command_text, NULL, &IID_IRowset, NULL, &affected, &unk); + ok(hr == S_OK, "got 0x%08lx\n", hr); + ok(affected == 1, "got %Id\n", affected); + ok(unk == NULL, "Unexpected value\n"); + hr = ICommandText_SetCommandText(command_text, &DBGUID_DEFAULT, L"select * from testing"); ok(hr == S_OK, "got 0x%08lx\n", hr); @@ -396,7 +405,7 @@ static void test_command_rowset(IUnknown *cmd) ok(unk != NULL, "Unexpected value\n"); if (hr == S_OK) { - ok(affected == -1, "wrong affected value\n"); + ok(affected == -1, "got %Id\n", affected); hr = IUnknown_QueryInterface(unk, &IID_IRowset, (void**)&rowset); ok(hr == S_OK, "got 0x%08lx\n", hr);

1 0

Zebediah Figura : quartz: Use IMemAllocator::GetBuffer() directly.
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: 9d5d8df6f0503a46b15deadb2bd856b405ec0db9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d5d8df6f0503a46b15deadb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Feb 6 20:59:38 2022 -0600 quartz: Use IMemAllocator::GetBuffer() directly. BaseOutputPinImpl_GetDeliveryBuffer() is doing nothing helpful here. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/acmwrapper.c | 3 +-- dlls/quartz/avidec.c | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index 12d96f69376..cf8e7cd125d 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -140,8 +140,7 @@ static HRESULT WINAPI acm_wrapper_sink_Receive(struct strmbase_sink *iface, IMed while(hr == S_OK && ash.cbSrcLength) { - hr = BaseOutputPinImpl_GetDeliveryBuffer(&This->source, &pOutSample, NULL, NULL, 0); - if (FAILED(hr)) + if (FAILED(hr = IMemAllocator_GetBuffer(This->source.pAllocator, &pOutSample, NULL, NULL, 0))) { ERR("Failed to get sample, hr %#lx.\n", hr); return hr; diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index 30b6c741eed..f8660890273 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -139,8 +139,8 @@ static HRESULT WINAPI avi_decompressor_sink_Receive(struct strmbase_sink *iface, /* Update input size to match sample size */ This->pBihIn->biSizeImage = cbSrcStream; - hr = BaseOutputPinImpl_GetDeliveryBuffer(&This->source, &pOutSample, NULL, NULL, 0); - if (FAILED(hr)) { + if (FAILED(hr = IMemAllocator_GetBuffer(This->source.pAllocator, &pOutSample, NULL, NULL, 0))) + { ERR("Failed to get sample, hr %#lx.\n", hr); return hr; }

1 0

Zebediah Figura : winegstreamer: Use IMemAllocator::GetBuffer() directly.
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: 8c7ad5fc397e4814c33fa4b85be505db94d70016 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c7ad5fc397e4814c33fa4b8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Feb 6 20:59:39 2022 -0600 winegstreamer: Use IMemAllocator::GetBuffer() directly. BaseOutputPinImpl_GetDeliveryBuffer() is doing nothing helpful here. Note that we cannot be unconnected at this point, or stream_thread() would not even be running. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/quartz_parser.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index 331bc9a888a..45313ebda27 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -753,12 +753,9 @@ static void send_buffer(struct parser_source *pin, const struct wg_parser_event { uint32_t advance; - hr = BaseOutputPinImpl_GetDeliveryBuffer(&pin->pin, &sample, NULL, NULL, 0); - - if (FAILED(hr)) + if (FAILED(hr = IMemAllocator_GetBuffer(pin->pin.pAllocator, &sample, NULL, NULL, 0))) { - if (hr != VFW_E_NOT_CONNECTED) - ERR("Failed to get a sample, hr %#lx.\n", hr); + ERR("Failed to get a sample, hr %#lx.\n", hr); break; } @@ -776,12 +773,9 @@ static void send_buffer(struct parser_source *pin, const struct wg_parser_event } else { - hr = BaseOutputPinImpl_GetDeliveryBuffer(&pin->pin, &sample, NULL, NULL, 0); - - if (FAILED(hr)) + if (FAILED(hr = IMemAllocator_GetBuffer(pin->pin.pAllocator, &sample, NULL, NULL, 0))) { - if (hr != VFW_E_NOT_CONNECTED) - ERR("Failed to get a sample, hr %#lx.\n", hr); + ERR("Failed to get a sample, hr %#lx.\n", hr); } else {

1 0

Zebediah Figura : amstream/tests: Use IMemAllocator::GetBuffer() directly.
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: 2552a4843646e8a842bbbf728389862a6b2027c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2552a4843646e8a842bbbf72… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Feb 6 20:59:40 2022 -0600 amstream/tests: Use IMemAllocator::GetBuffer() directly. BaseOutputPinImpl_GetDeliveryBuffer() is doing nothing helpful here. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/tests/amstream.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index d27bf801482..5b3e78e0583 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -4256,7 +4256,7 @@ static void test_audiostream_begin_flush_end_flush(void) hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = BaseOutputPinImpl_GetDeliveryBuffer(&source.source, &media_sample, NULL, NULL, 0); + hr = IMemAllocator_GetBuffer(source.source.pAllocator, &media_sample, NULL, NULL, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMemInputPin_Receive(source.source.pMemInputPin, media_sample); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -4272,7 +4272,7 @@ static void test_audiostream_begin_flush_end_flush(void) ref = IMediaSample_Release(media_sample); ok(!ref, "Got outstanding refcount %d.\n", ref); - hr = BaseOutputPinImpl_GetDeliveryBuffer(&source.source, &media_sample, NULL, NULL, 0); + hr = IMemAllocator_GetBuffer(source.source.pAllocator, &media_sample, NULL, NULL, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMemInputPin_Receive(source.source.pMemInputPin, media_sample); ok(hr == S_FALSE, "Got hr %#x.\n", hr); @@ -4289,7 +4289,7 @@ static void test_audiostream_begin_flush_end_flush(void) hr = IPin_EndFlush(pin); ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = BaseOutputPinImpl_GetDeliveryBuffer(&source.source, &media_sample, NULL, NULL, 0); + hr = IMemAllocator_GetBuffer(source.source.pAllocator, &media_sample, NULL, NULL, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMemInputPin_Receive(source.source.pMemInputPin, media_sample); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -4408,7 +4408,7 @@ static IMediaSample *ammediastream_allocate_sample(struct testfilter *source, co BYTE *sample_data; HRESULT hr; - hr = BaseOutputPinImpl_GetDeliveryBuffer(&source->source, &sample, NULL, NULL, 0); + hr = IMemAllocator_GetBuffer(source->source.pAllocator, &sample, NULL, NULL, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaSample_GetPointer(sample, &sample_data); @@ -5848,7 +5848,7 @@ static void test_ddrawstream_begin_flush_end_flush(void) hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = BaseOutputPinImpl_GetDeliveryBuffer(&source.source, &media_sample, NULL, NULL, 0); + hr = IMemAllocator_GetBuffer(source.source.pAllocator, &media_sample, NULL, NULL, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); ammediastream_mem_input_pin = source.source.pMemInputPin; @@ -5866,7 +5866,7 @@ static void test_ddrawstream_begin_flush_end_flush(void) ref = IMediaSample_Release(media_sample); ok(!ref, "Got outstanding refcount %d.\n", ref); - hr = BaseOutputPinImpl_GetDeliveryBuffer(&source.source, &media_sample, NULL, NULL, 0); + hr = IMemAllocator_GetBuffer(source.source.pAllocator, &media_sample, NULL, NULL, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMemInputPin_Receive(source.source.pMemInputPin, media_sample); ok(hr == S_FALSE, "Got hr %#x.\n", hr); @@ -5883,7 +5883,7 @@ static void test_ddrawstream_begin_flush_end_flush(void) hr = IPin_EndFlush(pin); ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = BaseOutputPinImpl_GetDeliveryBuffer(&source.source, &media_sample, NULL, NULL, 0); + hr = IMemAllocator_GetBuffer(source.source.pAllocator, &media_sample, NULL, NULL, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMemInputPin_Receive(source.source.pMemInputPin, media_sample); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

Zebediah Figura : qcap/vfwcapture: Allow changing state while unconnected.
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: 859809be485247d15ef63b4fcc97d5868020ebc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=859809be485247d15ef63b4f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Feb 6 20:59:41 2022 -0600 qcap/vfwcapture: Allow changing state while unconnected. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/videocapture.c | 53 ++++++++++++++++++++++++++++++++++++++++++ dlls/qcap/vfwcapture.c | 18 +++++++++++++- 2 files changed, 70 insertions(+), 1 deletion(-) diff --git a/dlls/qcap/tests/videocapture.c b/dlls/qcap/tests/videocapture.c index c44070b0bd5..4e9dca7d837 100644 --- a/dlls/qcap/tests/videocapture.c +++ b/dlls/qcap/tests/videocapture.c @@ -296,6 +296,58 @@ static void test_misc_flags(IBaseFilter *filter) IAMFilterMiscFlags_Release(misc_flags); } +static void test_unconnected_filter_state(IBaseFilter *filter) +{ + FILTER_STATE state; + HRESULT hr; + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Stopped, "Got state %u.\n", state); + + hr = IBaseFilter_Pause(filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Paused, "Got state %u.\n", state); + + hr = IBaseFilter_Run(filter, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Running, "Got state %u.\n", state); + + hr = IBaseFilter_Pause(filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Paused, "Got state %u.\n", state); + + hr = IBaseFilter_Stop(filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Stopped, "Got state %u.\n", state); + + hr = IBaseFilter_Run(filter, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Running, "Got state %u.\n", state); + + hr = IBaseFilter_Stop(filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Stopped, "Got state %u.\n", state); +} + struct testfilter { struct strmbase_filter filter; @@ -615,6 +667,7 @@ START_TEST(videocapture) test_filter_interfaces(filter); test_pins(filter); test_misc_flags(filter); + test_unconnected_filter_state(filter); ref = IBaseFilter_Release(filter); ok(!ref, "Got outstanding refcount %d.\n", ref); diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 6b82af9d155..7e6b0ee5afe 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -199,6 +199,9 @@ static HRESULT vfw_capture_init_stream(struct strmbase_filter *iface) struct vfw_capture *filter = impl_from_strmbase_filter(iface); HRESULT hr; + if (!filter->source.pin.peer) + return S_OK; + if (FAILED(hr = IMemAllocator_Commit(filter->source.pAllocator))) ERR("Failed to commit allocator, hr %#x.\n", hr); @@ -215,6 +218,9 @@ static HRESULT vfw_capture_start_stream(struct strmbase_filter *iface, REFERENCE { struct vfw_capture *filter = impl_from_strmbase_filter(iface); + if (!filter->source.pin.peer) + return S_OK; + EnterCriticalSection(&filter->state_cs); filter->state = State_Running; LeaveCriticalSection(&filter->state_cs); @@ -226,6 +232,9 @@ static HRESULT vfw_capture_stop_stream(struct strmbase_filter *iface) { struct vfw_capture *filter = impl_from_strmbase_filter(iface); + if (!filter->source.pin.peer) + return S_OK; + EnterCriticalSection(&filter->state_cs); filter->state = State_Paused; LeaveCriticalSection(&filter->state_cs); @@ -237,6 +246,9 @@ static HRESULT vfw_capture_cleanup_stream(struct strmbase_filter *iface) struct vfw_capture *filter = impl_from_strmbase_filter(iface); HRESULT hr; + if (!filter->source.pin.peer) + return S_OK; + EnterCriticalSection(&filter->state_cs); filter->state = State_Stopped; LeaveCriticalSection(&filter->state_cs); @@ -255,7 +267,11 @@ static HRESULT vfw_capture_cleanup_stream(struct strmbase_filter *iface) static HRESULT vfw_capture_wait_state(struct strmbase_filter *iface, DWORD timeout) { - return iface->state == State_Paused ? VFW_S_CANT_CUE : S_OK; + struct vfw_capture *filter = impl_from_strmbase_filter(iface); + + if (filter->source.pin.peer && filter->filter.state == State_Paused) + return VFW_S_CANT_CUE; + return S_OK; } static const struct strmbase_filter_ops filter_ops =

1 0