wine-commits February 2022

wine-commits@winehq.org

2 participants
1495 discussions

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 : services: Enable compilation with long types.
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: 8edc86c1b341bf5389875473f6caf2eba5b24032 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8edc86c1b341bf5389875473… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 7 08:39:43 2022 +0100 services: 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/services/Makefile.in | 1 - programs/services/rpc.c | 48 +++++++++++++++++++++---------------------- programs/services/services.c | 24 +++++++++++----------- programs/services/utils.c | 6 +++--- 4 files changed, 39 insertions(+), 40 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8edc86c1b341bf538987…

1 0

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

07 Feb '22

Module: wine Branch: master Commit: 70d4f9b0c65fb7787b7952bc78bc26383e6e3319 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70d4f9b0c65fb7787b7952bc… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 7 08:39:37 2022 +0100 sc: 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/sc/Makefile.in | 1 - programs/sc/sc.c | 22 +++++++++++----------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/programs/sc/Makefile.in b/programs/sc/Makefile.in index 8d6c4ca4e1b..4ee6b86bdc7 100644 --- a/programs/sc/Makefile.in +++ b/programs/sc/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = sc.exe IMPORTS = advapi32 diff --git a/programs/sc/sc.c b/programs/sc/sc.c index 02b476957d6..6cf27d93ac2 100644 --- a/programs/sc/sc.c +++ b/programs/sc/sc.c @@ -220,7 +220,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) CloseServiceHandle( service ); ret = TRUE; } - else WINE_TRACE("failed to create service %u\n", GetLastError()); + else WINE_TRACE("failed to create service %lu\n", GetLastError()); } else if (!wcsicmp( argv[1], L"description" )) { @@ -230,10 +230,10 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) SERVICE_DESCRIPTIONW sd; sd.lpDescription = argc > 3 ? (WCHAR *)argv[3] : NULL; ret = ChangeServiceConfig2W( service, SERVICE_CONFIG_DESCRIPTION, &sd ); - if (!ret) WINE_TRACE("failed to set service description %u\n", GetLastError()); + if (!ret) WINE_TRACE("failed to set service description %lu\n", GetLastError()); CloseServiceHandle( service ); } - else WINE_TRACE("failed to open service %u\n", GetLastError()); + else WINE_TRACE("failed to open service %lu\n", GetLastError()); } else if (!wcsicmp( argv[1], L"failure" )) { @@ -244,14 +244,14 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) if (parse_failure_params( argc - 3, argv + 3, &sfa )) { ret = ChangeServiceConfig2W( service, SERVICE_CONFIG_FAILURE_ACTIONS, &sfa ); - if (!ret) WINE_TRACE("failed to set service failure actions %u\n", GetLastError()); + if (!ret) WINE_TRACE("failed to set service failure actions %lu\n", GetLastError()); HeapFree( GetProcessHeap(), 0, sfa.lpsaActions ); } else WINE_WARN("failed to parse failure parameters\n"); CloseServiceHandle( service ); } - else WINE_TRACE("failed to open service %u\n", GetLastError()); + else WINE_TRACE("failed to open service %lu\n", GetLastError()); } else if (!wcsicmp( argv[1], L"delete" )) { @@ -259,10 +259,10 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) if (service) { ret = DeleteService( service ); - if (!ret) WINE_TRACE("failed to delete service %u\n", GetLastError()); + if (!ret) WINE_TRACE("failed to delete service %lu\n", GetLastError()); CloseServiceHandle( service ); } - else WINE_TRACE("failed to open service %u\n", GetLastError()); + else WINE_TRACE("failed to open service %lu\n", GetLastError()); } else if (!wcsicmp( argv[1], L"start" )) { @@ -270,10 +270,10 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) if (service) { ret = StartServiceW( service, argc - 3, argv + 3 ); - if (!ret) WINE_TRACE("failed to start service %u\n", GetLastError()); + if (!ret) WINE_TRACE("failed to start service %lu\n", GetLastError()); CloseServiceHandle( service ); } - else WINE_TRACE("failed to open service %u\n", GetLastError()); + else WINE_TRACE("failed to open service %lu\n", GetLastError()); } else if (!wcsicmp( argv[1], L"stop" )) { @@ -281,10 +281,10 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) if (service) { ret = ControlService( service, SERVICE_CONTROL_STOP, &status ); - if (!ret) WINE_TRACE("failed to stop service %u\n", GetLastError()); + if (!ret) WINE_TRACE("failed to stop service %lu\n", GetLastError()); CloseServiceHandle( service ); } - else WINE_TRACE("failed to open service %u\n", GetLastError()); + else WINE_TRACE("failed to open service %lu\n", GetLastError()); } else if (!wcsicmp( argv[1], L"sdset" )) {

1 0

Nikolay Sivov : comctl32: Fix long types warnings in traces.
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: 8806159bcd37d30754d975906ac5af28ede5aee9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8806159bcd37d30754d97590… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 7 09:07:55 2022 +0300 comctl32: Fix long types warnings in traces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/Makefile.in | 2 +- dlls/comctl32/animate.c | 80 ++++++++++++------------ dlls/comctl32/combo.c | 6 +- dlls/comctl32/comboex.c | 74 +++++++++++----------- dlls/comctl32/commctrl.c | 53 ++++++++-------- dlls/comctl32/datetime.c | 19 +++--- dlls/comctl32/dpa.c | 16 +++-- dlls/comctl32/draglist.c | 3 +- dlls/comctl32/edit.c | 16 ++--- dlls/comctl32/flatsb.c | 7 +-- dlls/comctl32/header.c | 9 ++- dlls/comctl32/hotkey.c | 11 ++-- dlls/comctl32/imagelist.c | 33 +++++----- dlls/comctl32/ipaddress.c | 6 +- dlls/comctl32/listbox.c | 5 +- dlls/comctl32/listview.c | 70 ++++++++++----------- dlls/comctl32/monthcal.c | 27 ++++---- dlls/comctl32/nativefont.c | 6 +- dlls/comctl32/pager.c | 13 ++-- dlls/comctl32/progress.c | 6 +- dlls/comctl32/propsheet.c | 30 ++++----- dlls/comctl32/rebar.c | 70 ++++++++++----------- dlls/comctl32/smoothscroll.c | 4 +- dlls/comctl32/static.c | 4 +- dlls/comctl32/status.c | 12 ++-- dlls/comctl32/syslink.c | 4 +- dlls/comctl32/tab.c | 38 +++++------- dlls/comctl32/taskdialog.c | 2 +- dlls/comctl32/toolbar.c | 143 +++++++++++++++++++------------------------ dlls/comctl32/tooltips.c | 26 ++++---- dlls/comctl32/trackbar.c | 11 ++-- dlls/comctl32/treeview.c | 40 ++++++------ dlls/comctl32/updown.c | 9 ++- 33 files changed, 401 insertions(+), 454 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8806159bcd37d30754d9…

1 0

Nikolay Sivov : dbgeng: Fix long types warnings in traces.
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: 010dd60f84f8c346b5244e804cc5ec403f7192ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=010dd60f84f8c346b5244e80… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 7 09:07:08 2022 +0300 dbgeng: Fix long types warnings in traces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/Makefile.in | 1 - dlls/dbgeng/dbgeng.c | 468 ++++++++++++++++++++++++------------------------ 2 files changed, 234 insertions(+), 235 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=010dd60f84f8c346b524…

1 0

Zebediah Figura : ws2_32: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: 4a56c41462a7b094050e5b012031a143b5edcc84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a56c41462a7b094050e5b01… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Feb 4 19:35:37 2022 -0600 ws2_32: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/Makefile.in | 1 - dlls/ws2_32/async.c | 3 +- dlls/ws2_32/protocol.c | 52 ++++++++++++------------ dlls/ws2_32/socket.c | 104 ++++++++++++++++++++++++------------------------ 4 files changed, 79 insertions(+), 81 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4a56c41462a7b094050e…

1 0

Zebediah Figura : ws2_32: Avoid an unnecessary goto.
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: 2895f0fd22ce95d1157efc316de661f770a29d07 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2895f0fd22ce95d1157efc31… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Feb 4 19:35:36 2022 -0600 ws2_32: Avoid an unnecessary goto. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 4b3ca3c2507..b06fb341991 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3305,8 +3305,9 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, if (!num_startup) { - err = WSANOTINITIALISED; - goto done; + WARN( "not initialised\n" ); + SetLastError( WSANOTINITIALISED ); + return -1; } /* hack for WSADuplicateSocket */ @@ -3406,11 +3407,6 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, } WSASetLastError(0); return ret; - -done: - WARN("\t\tfailed, error %d!\n", err); - SetLastError(err); - return INVALID_SOCKET; } /***********************************************************************

1 0

Zebediah Figura : strmbase: Remove the no longer used BaseOutputPinImpl_GetDeliveryBuffer() helper.
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: 186b99c2acbcd6c172e73db6f40aa8da6e7d07dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=186b99c2acbcd6c172e73db6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Feb 6 20:59:43 2022 -0600 strmbase: Remove the no longer used BaseOutputPinImpl_GetDeliveryBuffer() helper. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/strmbase.h | 2 -- libs/strmbase/pin.c | 20 -------------------- 2 files changed, 22 deletions(-) diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 1c8696ed620..868ea4c580a 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -105,8 +105,6 @@ struct strmbase_sink_ops }; /* Base Pin */ -HRESULT WINAPI BaseOutputPinImpl_GetDeliveryBuffer(struct strmbase_source *pin, - IMediaSample **sample, REFERENCE_TIME *start, REFERENCE_TIME *stop, DWORD flags); HRESULT WINAPI BaseOutputPinImpl_InitAllocator(struct strmbase_source *pin, IMemAllocator **allocator); HRESULT WINAPI BaseOutputPinImpl_DecideAllocator(struct strmbase_source *pin, IMemInputPin *peer, IMemAllocator **allocator); HRESULT WINAPI BaseOutputPinImpl_AttemptConnection(struct strmbase_source *pin, IPin *peer, const AM_MEDIA_TYPE *mt); diff --git a/libs/strmbase/pin.c b/libs/strmbase/pin.c index 36b3fdf1425..f6e4ef1c139 100644 --- a/libs/strmbase/pin.c +++ b/libs/strmbase/pin.c @@ -677,26 +677,6 @@ static const IPinVtbl source_vtbl = source_NewSegment, }; -HRESULT WINAPI BaseOutputPinImpl_GetDeliveryBuffer(struct strmbase_source *This, - IMediaSample **ppSample, REFERENCE_TIME *tStart, REFERENCE_TIME *tStop, DWORD dwFlags) -{ - HRESULT hr; - - TRACE("(%p)->(%p, %p, %p, %x)\n", This, ppSample, tStart, tStop, dwFlags); - - if (!This->pin.peer) - hr = VFW_E_NOT_CONNECTED; - else - { - hr = IMemAllocator_GetBuffer(This->pAllocator, ppSample, tStart, tStop, dwFlags); - - if (SUCCEEDED(hr)) - hr = IMediaSample_SetTime(*ppSample, tStart, tStop); - } - - return hr; -} - HRESULT WINAPI BaseOutputPinImpl_InitAllocator(struct strmbase_source *This, IMemAllocator **pMemAlloc) { return CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER, &IID_IMemAllocator, (LPVOID*)pMemAlloc);

1 0

Zebediah Figura : qcap: Use IMemAllocator::GetBuffer() and IMediaSample::SetTime() directly.
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: ed4df6964cb9517c9d962ea16f3033e0a08e0365 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed4df6964cb9517c9d962ea1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Feb 6 20:59:42 2022 -0600 qcap: Use IMemAllocator::GetBuffer() and IMediaSample::SetTime() directly. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avico.c | 9 +++++++-- dlls/qcap/vfwcapture.c | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index e8a452fc7f5..b56a051d67b 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -350,9 +350,14 @@ static HRESULT WINAPI AVICompressorIn_Receive(struct strmbase_sink *base, IMedia return hres; } - hres = BaseOutputPinImpl_GetDeliveryBuffer(&This->source, &out_sample, &start, &stop, 0); - if(FAILED(hres)) + if (FAILED(hres = IMemAllocator_GetBuffer(This->source.pAllocator, &out_sample, &start, &stop, 0))) + { + ERR("Failed to get sample, hr %#x.\n", hres); return hres; + } + + if (FAILED(hres = IMediaSample_SetTime(out_sample, &start, &stop))) + ERR("Failed to set time, hr %#x.\n", hres); hres = IMediaSample_GetPointer(out_sample, &buf); if(FAILED(hres)) diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 7e6b0ee5afe..84d6c093cc6 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -165,7 +165,7 @@ static DWORD WINAPI stream_thread(void *arg) LeaveCriticalSection(&filter->state_cs); - if (FAILED(hr = BaseOutputPinImpl_GetDeliveryBuffer(&filter->source, &sample, NULL, NULL, 0))) + if (FAILED(hr = IMemAllocator_GetBuffer(filter->source.pAllocator, &sample, NULL, NULL, 0))) { ERR("Failed to get sample, hr %#x.\n", hr); break;

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2022