September 2019 - Wine-devel

[PATCH] dwrite: A couple of spelling fixes in comments.
by Francois Gouget 13 Sep '19

13 Sep '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/dwrite/bidi.c | 2 +- dlls/dwrite/font.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/bidi.c b/dlls/dwrite/bidi.c index f614f4ad8fd..03c655ef689 100644 --- a/dlls/dwrite/bidi.c +++ b/dlls/dwrite/bidi.c @@ -67,7 +67,7 @@ extern const unsigned short bidi_direction_table[] DECLSPEC_HIDDEN; Note: The list of bidirectional character types here is not grouped the - same way as the table 3-7, since the numberic values for the types + same way as the table 3-7, since the numeric values for the types are chosen to keep the state and action tables compact. ------------------------------------------------------------------------*/ enum directions diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 3f11b1d3ada..8dad94d25df 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -5402,7 +5402,7 @@ HRESULT create_glyphrunanalysis(const struct glyphrunanalysis_desc *desc, IDWrit *ret = NULL; - /* Check rendering, antialising, measuring, and grid fitting modes. */ + /* Check rendering, antialiasing, measuring, and grid fitting modes. */ if ((UINT32)desc->rendering_mode >= DWRITE_RENDERING_MODE1_NATURAL_SYMMETRIC_DOWNSAMPLED || desc->rendering_mode == DWRITE_RENDERING_MODE1_OUTLINE || desc->rendering_mode == DWRITE_RENDERING_MODE1_DEFAULT) -- 2.20.1

2 1

[PATCH] ntdll: On Mac, use the Mach API as preferred approach to get a thread's GS.base.
by Ken Thomases 12 Sep '19

12 Sep '19

The previous technique was a gross hack peeking at the internals of the pthreads implementation. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> --- dlls/ntdll/signal_x86_64.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 5eca0432a06..e76e5be6aad 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -3204,9 +3204,18 @@ void signal_free_thread( TEB *teb ) */ static void *mac_thread_gsbase(void) { + struct thread_identifier_info tiinfo; + unsigned int info_count = THREAD_IDENTIFIER_INFO_COUNT; static int gsbase_offset = -1; void *ret; + kern_return_t kr = thread_info(mach_thread_self(), THREAD_IDENTIFIER_INFO, (thread_identifier_info_t) &tiinfo, &info_count); + if (kr == KERN_SUCCESS) + { + TRACE("pthread_self() %p thread ID %lx gsbase %lx\n", pthread_self(), tiinfo.thread_id, tiinfo.thread_handle); + return (void*)tiinfo.thread_handle; + } + if (gsbase_offset < 0) { /* Search for the array of TLS slots within the pthread data structure. -- 2.21.0

1 0

[PATCH] wininet: Updated Session username/password when cached credentials are used.
by Alistair Leslie-Hughes 12 Sep '19

12 Sep '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wininet/http.c | 20 +++++++++++++++++--- dlls/wininet/tests/http.c | 8 ++++---- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index ad01420d45..16f7e3f2c7 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -853,7 +853,7 @@ static void destroy_authinfo( struct HttpAuthInfo *authinfo ) heap_free(authinfo); } -static UINT retrieve_cached_basic_authorization(const WCHAR *host, const WCHAR *realm, char **auth_data) +static UINT retrieve_cached_basic_authorization(http_request_t *req, const WCHAR *host, const WCHAR *realm, char **auth_data) { basicAuthorizationData *ad; UINT rc = 0; @@ -865,10 +865,24 @@ static UINT retrieve_cached_basic_authorization(const WCHAR *host, const WCHAR * { if (!strcmpiW(host, ad->host) && (!realm || !strcmpW(realm, ad->realm))) { + char *colon; + DWORD length; + TRACE("Authorization found in cache\n"); *auth_data = heap_alloc(ad->authorizationLen); memcpy(*auth_data,ad->authorization,ad->authorizationLen); rc = ad->authorizationLen; + + /* Updated Session username and password to reflect current credentials */ + colon = strstr(ad->authorization, ":"); + length = colon - ad->authorization; + + heap_free(req->session->userName); + heap_free(req->session->password); + + req->session->userName = heap_strndupAtoW(ad->authorization, length, &length); + length++; + req->session->password = heap_strndupAtoW(&ad->authorization[length], ad->authorizationLen - length, &length); break; } } @@ -1144,7 +1158,7 @@ static BOOL HTTP_DoAuthorization( http_request_t *request, LPCWSTR pszAuthValue, if (!domain_and_username) { if (host && szRealm) - auth_data_len = retrieve_cached_basic_authorization(host, szRealm,&auth_data); + auth_data_len = retrieve_cached_basic_authorization(request, host, szRealm,&auth_data); if (auth_data_len == 0) { heap_free(szRealm); @@ -1660,7 +1674,7 @@ static BOOL HTTP_InsertAuthorization( http_request_t *request, struct HttpAuthIn UINT data_len; char *data; - if ((data_len = retrieve_cached_basic_authorization(host, NULL, &data))) + if ((data_len = retrieve_cached_basic_authorization(request, host, NULL, &data))) { TRACE("Found cached basic authorization for %s\n", debugstr_w(host)); diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 80d2aad9f4..b61d5c7030 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -4481,15 +4481,15 @@ static void test_basic_auth_credentials_reuse(int port) SetLastError(0xdeadbeef); ret = InternetQueryOptionA(req, INTERNET_OPTION_USERNAME, buffer, &size); ok(ret, "unexpected failure %u\n", GetLastError()); - todo_wine ok(!strcmp(buffer, "user"), "got %s\n", buffer); - todo_wine ok(size == 4, "got %u\n", size); + ok(!strcmp(buffer, "user"), "got %s\n", buffer); + ok(size == 4, "got %u\n", size); size = sizeof(buffer); SetLastError(0xdeadbeef); ret = InternetQueryOptionA(req, INTERNET_OPTION_PASSWORD, buffer, &size); ok(ret, "unexpected failure %u\n", GetLastError()); - todo_wine ok(!strcmp(buffer, "pwd"), "got %s\n", buffer); - todo_wine ok(size == 3, "got %u\n", size); + ok(!strcmp(buffer, "pwd"), "got %s\n", buffer); + ok(size == 3, "got %u\n", size); status = 0xdeadbeef; size = sizeof(status); -- 2.17.1

2 1

[PATCH] testbot/LibvirtTool: No need to wait for other TestBot processes.
by Francois Gouget 12 Sep '19

12 Sep '19

The pid of any process started by the Engine is recorded in the VM's ChildPid field. Also the Engine kills any tool that would still be running before clearing the ChildPid field. So the Engine would not have started LibvirtTool if another process was using that VM. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/LibvirtTool.pl | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index e348834a2..c27e603f4 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -297,18 +297,7 @@ sub Monitor() if ($IsPoweredOn) { $ErrMessage = $VM->GetDomain()->PowerOff(); - if (defined $ErrMessage) - { - Error "$ErrMessage\n"; - } - else - { - # Another process might have been trying to connect to the VM's - # TestAgent server. Wait for it to time out so it does not set the - # VM offline right after we have put it back online. - LogMsg "Powered off $VMKey. Sleep until all other processes accessing it are gone.\n"; - sleep(3 * $WaitForToolsInVM); - } + Error "$ErrMessage\n" if (defined $ErrMessage); $IsPoweredOn = undef; } } -- 2.20.1

1 0

[PATCH] testbot: Document where parameters get untainted.
by Francois Gouget 12 Sep '19

12 Sep '19

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/LibvirtTool.pl | 4 ++-- testbot/bin/build/WineTest.pl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index c27e603f4..f031c78c8 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -104,7 +104,7 @@ while (@ARGV) } } -# Check parameters +# Check and untaint parameters my $VM; if (!defined $Usage) { @@ -120,7 +120,7 @@ if (!defined $Usage) } elsif ($VMKey =~ /^([a-zA-Z0-9_]+)$/) { - $VMKey = $1; + $VMKey = $1; # untaint $VM = CreateVMs()->GetItem($VMKey); if (!defined $VM) { diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index 9d113276d..1fa6aa892 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -329,7 +329,7 @@ if (!defined $Usage) } elsif ($BaseTag =~ m/^([\w_.\-]+)$/) { - $BaseTag = $1; + $BaseTag = $1; # untaint } else { -- 2.20.1

1 0

[PATCH] testbot/Engine: Clean up left-over VM child deadlines.
by Francois Gouget 12 Sep '19

12 Sep '19

Normally the ChildDeadline gets unset whenever ChildPid is unset. But if it does remain set the scheduler will eventually see a deadline in the past, causing it to reschedule every second, until a new child process gets created for that VM. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Engine/Scheduler.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Engine/Scheduler.pm b/testbot/lib/WineTestBot/Engine/Scheduler.pm index 466cd2c82..b03617c35 100644 --- a/testbot/lib/WineTestBot/Engine/Scheduler.pm +++ b/testbot/lib/WineTestBot/Engine/Scheduler.pm @@ -353,7 +353,7 @@ sub _CheckAndClassifyVMs() } else { - if (defined $VM->ChildPid or + if (defined $VM->ChildPid or defined $VM->ChildDeadline or $VM->Status =~ /^(?:running|reverting|sleeping)$/) { # The VM is missing its child process or it died unexpectedly. Mark -- 2.20.1

1 0

[PATCH v3 0/8] Updated based on feedback
by Micah N Gorrell 12 Sep '19

12 Sep '19

v3 has the following changes since v2 based on the feedback from Alistair Leslie-Hughes: - Make functions in advapi32 that are no longer in the header static - Remove SERV_dup() entirely, and add strdupAW() in service.c when it is moved into sechost Micah N Gorrell (8): advapi32: Replace usage of internal SERV_ functions with exported functions advapi32: Replace SERV_dup() with strdupAW() advapi32: Move RPC interfaces from advapi32 into sechost sechost: Implement I_ScRegisterDeviceNotification() ntoskrnl.exe: Implement sending of device notifications user32: Implement RegisterDeviceNotification() user32/tests: Add test for RegisterDeviceNotification() sechost/tests: Add test for I_ScRegisterDeviceNotification() configure.ac | 2 + dlls/advapi32/Makefile.in | 5 +- dlls/advapi32/advapi32.spec | 92 +++--- dlls/advapi32/advapi32_misc.h | 4 - dlls/advapi32/eventlog.c | 12 +- dlls/advapi32/security.c | 54 ++-- dlls/ntoskrnl.exe/Makefile.in | 4 +- dlls/ntoskrnl.exe/ntoskrnl_private.h | 5 + dlls/ntoskrnl.exe/pnp.c | 1 + dlls/ntoskrnl.exe/rpc.c | 182 ++++++++++++ dlls/{advapi32 => ntoskrnl.exe}/svcctl.idl | 0 dlls/sechost/Makefile.in | 8 + dlls/sechost/sechost.spec | 48 ++++ dlls/{advapi32 => sechost}/service.c | 310 +++++++++++++++------ dlls/sechost/svcctl.idl | 3 + dlls/sechost/tests/Makefile.in | 5 + dlls/sechost/tests/devnotify.c | 102 +++++++ dlls/user32/Makefile.in | 2 +- dlls/user32/misc.c | 73 ++++- dlls/user32/tests/input.c | 70 ++++- include/wine/svcctl.idl | 20 ++ include/winsvc.h | 14 + include/winuser.h | 4 +- programs/services/rpc.c | 169 ++++++++++- 24 files changed, 1008 insertions(+), 181 deletions(-) create mode 100644 dlls/ntoskrnl.exe/rpc.c rename dlls/{advapi32 => ntoskrnl.exe}/svcctl.idl (100%) create mode 100644 dlls/sechost/Makefile.in create mode 100644 dlls/sechost/sechost.spec rename dlls/{advapi32 => sechost}/service.c (91%) create mode 100644 dlls/sechost/svcctl.idl create mode 100644 dlls/sechost/tests/Makefile.in create mode 100644 dlls/sechost/tests/devnotify.c -- 2.23.0

2 15

[PATCH 1/5] strmbase: Get rid of the BaseOutputPin typedef.
by Zebediah Figura 12 Sep '19

12 Sep '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/qcap/audiorecord.c | 1 - dlls/qcap/avico.c | 7 ++++--- dlls/qcap/avimux.c | 6 +++--- dlls/qcap/capture.h | 2 +- dlls/qcap/smartteefilter.c | 8 ++++--- dlls/qcap/v4l.c | 6 +++--- dlls/qcap/vfwcapture.c | 5 +++-- dlls/quartz/filesource.c | 11 +++++----- dlls/quartz/parser.c | 12 +++++++---- dlls/quartz/parser.h | 2 +- dlls/strmbase/outputqueue.c | 12 +++-------- dlls/strmbase/pin.c | 31 ++++++++++++++------------- dlls/strmbase/transform.c | 3 ++- dlls/winegstreamer/gstdemux.c | 8 ++++--- dlls/wineqtdecoder/qtsplitter.c | 10 +++++---- include/wine/strmbase.h | 37 +++++++++++++++++---------------- 16 files changed, 86 insertions(+), 75 deletions(-) diff --git a/dlls/qcap/audiorecord.c b/dlls/qcap/audiorecord.c index 6d487dbe2d9..5d636937f81 100644 --- a/dlls/qcap/audiorecord.c +++ b/dlls/qcap/audiorecord.c @@ -37,7 +37,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(qcap); typedef struct { struct strmbase_filter filter; IPersistPropertyBag IPersistPropertyBag_iface; - BaseOutputPin *output; } AudioRecord; static inline AudioRecord *impl_from_strmbase_filter(struct strmbase_filter *filter) diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index 918cabd8191..c052bda5995 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -38,7 +38,7 @@ typedef struct { IPersistPropertyBag IPersistPropertyBag_iface; BaseInputPin sink; - BaseOutputPin source; + struct strmbase_source source; DWORD fcc_handler; HIC hic; @@ -554,7 +554,8 @@ static HRESULT WINAPI AVICompressorOut_GetMediaType(BasePin *base, int iPosition return S_OK; } -static HRESULT WINAPI AVICompressorOut_DecideBufferSize(BaseOutputPin *base, IMemAllocator *alloc, ALLOCATOR_PROPERTIES *ppropInputRequest) +static HRESULT WINAPI AVICompressorOut_DecideBufferSize(struct strmbase_source *base, + IMemAllocator *alloc, ALLOCATOR_PROPERTIES *ppropInputRequest) { AVICompressor *This = impl_from_BasePin(&base->pin); ALLOCATOR_PROPERTIES actual; @@ -571,7 +572,7 @@ static HRESULT WINAPI AVICompressorOut_DecideBufferSize(BaseOutputPin *base, IMe return IMemAllocator_SetProperties(alloc, ppropInputRequest, &actual); } -static HRESULT WINAPI AVICompressorOut_DecideAllocator(BaseOutputPin *base, +static HRESULT WINAPI AVICompressorOut_DecideAllocator(struct strmbase_source *base, IMemInputPin *pPin, IMemAllocator **pAlloc) { TRACE("(%p)->(%p %p)\n", base, pPin, pAlloc); diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index adc848f6dda..fbc74ae4880 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -81,7 +81,7 @@ typedef struct { REFERENCE_TIME interleave; REFERENCE_TIME preroll; - BaseOutputPin source; + struct strmbase_source source; IQualityControl IQualityControl_iface; int input_pin_no; @@ -1158,7 +1158,7 @@ static HRESULT WINAPI AviMuxOut_CheckMediaType(BasePin *base, const AM_MEDIA_TYP return S_OK; } -static HRESULT WINAPI AviMuxOut_AttemptConnection(BaseOutputPin *base, +static HRESULT WINAPI AviMuxOut_AttemptConnection(struct strmbase_source *base, IPin *pReceivePin, const AM_MEDIA_TYPE *pmt) { PIN_DIRECTION dir; @@ -1195,7 +1195,7 @@ static HRESULT WINAPI AviMuxOut_GetMediaType(BasePin *base, int iPosition, AM_ME return S_OK; } -static HRESULT WINAPI AviMuxOut_DecideAllocator(BaseOutputPin *base, +static HRESULT WINAPI AviMuxOut_DecideAllocator(struct strmbase_source *base, IMemInputPin *pPin, IMemAllocator **pAlloc) { ALLOCATOR_PROPERTIES req, actual; diff --git a/dlls/qcap/capture.h b/dlls/qcap/capture.h index 82f5eb2461c..131487ad5fb 100644 --- a/dlls/qcap/capture.h +++ b/dlls/qcap/capture.h @@ -23,7 +23,7 @@ struct _Capture; typedef struct _Capture Capture; -Capture *qcap_driver_init(BaseOutputPin*,USHORT) DECLSPEC_HIDDEN; +Capture *qcap_driver_init(struct strmbase_source *,USHORT) DECLSPEC_HIDDEN; HRESULT qcap_driver_destroy(Capture*) DECLSPEC_HIDDEN; HRESULT qcap_driver_check_format(Capture*,const AM_MEDIA_TYPE*) DECLSPEC_HIDDEN; HRESULT qcap_driver_set_format(Capture*,AM_MEDIA_TYPE*) DECLSPEC_HIDDEN; diff --git a/dlls/qcap/smartteefilter.c b/dlls/qcap/smartteefilter.c index c53c7af9bbd..353409dcfc1 100644 --- a/dlls/qcap/smartteefilter.c +++ b/dlls/qcap/smartteefilter.c @@ -38,7 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(qcap); typedef struct { struct strmbase_filter filter; BaseInputPin sink; - BaseOutputPin capture, preview; + struct strmbase_source capture, preview; } SmartTeeFilter; static inline SmartTeeFilter *impl_from_strmbase_filter(struct strmbase_filter *filter) @@ -379,7 +379,8 @@ static HRESULT WINAPI SmartTeeFilterCapture_GetMediaType(BasePin *base, int iPos return S_FALSE; } -static HRESULT WINAPI SmartTeeFilterCapture_DecideAllocator(BaseOutputPin *base, IMemInputPin *pPin, IMemAllocator **pAlloc) +static HRESULT WINAPI SmartTeeFilterCapture_DecideAllocator(struct strmbase_source *base, + IMemInputPin *pPin, IMemAllocator **pAlloc) { SmartTeeFilter *This = impl_from_BasePin(&base->pin); TRACE("(%p, %p, %p)\n", This, pPin, pAlloc); @@ -450,7 +451,8 @@ static HRESULT WINAPI SmartTeeFilterPreview_GetMediaType(BasePin *base, int iPos return S_FALSE; } -static HRESULT WINAPI SmartTeeFilterPreview_DecideAllocator(BaseOutputPin *base, IMemInputPin *pPin, IMemAllocator **pAlloc) +static HRESULT WINAPI SmartTeeFilterPreview_DecideAllocator(struct strmbase_source *base, + IMemInputPin *pPin, IMemAllocator **pAlloc) { SmartTeeFilter *This = impl_from_BasePin(&base->pin); TRACE("(%p, %p, %p)\n", This, pPin, pAlloc); diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index b308f14786e..c9102accb80 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -101,7 +101,7 @@ struct _Capture CRITICAL_SECTION CritSect; - BaseOutputPin *pin; + struct strmbase_source *pin; int fd, mmap; BOOL iscommitted, stopped; @@ -562,7 +562,7 @@ HRESULT qcap_driver_stop(Capture *capBox, FILTER_STATE *state) return S_OK; } -Capture * qcap_driver_init(BaseOutputPin *pin, USHORT card) +Capture *qcap_driver_init(struct strmbase_source *pin, USHORT card) { struct v4l2_capability caps = {{0}}; struct v4l2_format format = {0}; @@ -659,7 +659,7 @@ error: #else -Capture * qcap_driver_init(BaseOutputPin *pin, USHORT card) +Capture *qcap_driver_init(struct strmbase_source *pin, USHORT card) { static const char msg[] = "The v4l headers were not available at compile time,\n" diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index c4605ce10cc..ed8c050828a 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -53,7 +53,7 @@ typedef struct VfwCapture BOOL init; Capture *driver_info; - BaseOutputPin source; + struct strmbase_source source; IKsPropertySet IKsPropertySet_iface; } VfwCapture; @@ -537,7 +537,8 @@ static HRESULT WINAPI VfwPin_GetMediaType(BasePin *pin, int iPosition, AM_MEDIA_ return hr; } -static HRESULT WINAPI VfwPin_DecideBufferSize(BaseOutputPin *iface, IMemAllocator *pAlloc, ALLOCATOR_PROPERTIES *ppropInputRequest) +static HRESULT WINAPI VfwPin_DecideBufferSize(struct strmbase_source *iface, + IMemAllocator *pAlloc, ALLOCATOR_PROPERTIES *ppropInputRequest) { ALLOCATOR_PROPERTIES actual; diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 77385009f24..006c6592b56 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -61,7 +61,7 @@ typedef struct AsyncReader struct strmbase_filter filter; IFileSourceFilter IFileSourceFilter_iface; - BaseOutputPin source; + struct strmbase_source source; IAsyncReader IAsyncReader_iface; LPOLESTR pszFileName; @@ -571,7 +571,7 @@ static inline AsyncReader *impl_from_BasePin(BasePin *iface) return CONTAINING_RECORD(iface, AsyncReader, source.pin); } -static inline AsyncReader *impl_from_BaseOutputPin(BaseOutputPin *iface) +static inline AsyncReader *impl_from_strmbase_source(struct strmbase_source *iface) { return CONTAINING_RECORD(iface, AsyncReader, source); } @@ -657,7 +657,7 @@ static const IPinVtbl FileAsyncReaderPin_Vtbl = /* specific AM_MEDIA_TYPE - it cannot be NULL */ /* this differs from standard OutputPin_AttemptConnection only in that it * doesn't need the IMemInputPin interface on the receiving pin */ -static HRESULT WINAPI FileAsyncReaderPin_AttemptConnection(BaseOutputPin *This, +static HRESULT WINAPI FileAsyncReaderPin_AttemptConnection(struct strmbase_source *This, IPin *pReceivePin, const AM_MEDIA_TYPE *pmt) { HRESULT hr; @@ -684,9 +684,10 @@ static HRESULT WINAPI FileAsyncReaderPin_AttemptConnection(BaseOutputPin *This, return hr; } -static HRESULT WINAPI FileAsyncReaderPin_DecideBufferSize(BaseOutputPin *iface, IMemAllocator *pAlloc, ALLOCATOR_PROPERTIES *ppropInputRequest) +static HRESULT WINAPI FileAsyncReaderPin_DecideBufferSize(struct strmbase_source *iface, + IMemAllocator *pAlloc, ALLOCATOR_PROPERTIES *ppropInputRequest) { - AsyncReader *This = impl_from_BaseOutputPin(iface); + AsyncReader *This = impl_from_strmbase_source(iface); ALLOCATOR_PROPERTIES actual; if (ppropInputRequest->cbAlign && ppropInputRequest->cbAlign != This->allocProps.cbAlign) diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index 5b09f70758c..2768d013573 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -41,10 +41,12 @@ static const IPinVtbl Parser_InputPin_Vtbl; static HRESULT WINAPI Parser_ChangeStart(IMediaSeeking *iface); static HRESULT WINAPI Parser_ChangeStop(IMediaSeeking *iface); static HRESULT WINAPI Parser_ChangeRate(IMediaSeeking *iface); -static HRESULT WINAPI Parser_OutputPin_DecideBufferSize(BaseOutputPin *iface, IMemAllocator *pAlloc, ALLOCATOR_PROPERTIES *ppropInputRequest); +static HRESULT WINAPI Parser_OutputPin_DecideBufferSize(struct strmbase_source *iface, + IMemAllocator *allocator, ALLOCATOR_PROPERTIES *props); static HRESULT WINAPI Parser_OutputPin_CheckMediaType(BasePin *pin, const AM_MEDIA_TYPE *pmt); static HRESULT WINAPI Parser_OutputPin_GetMediaType(BasePin *iface, int iPosition, AM_MEDIA_TYPE *pmt); -static HRESULT WINAPI Parser_OutputPin_DecideAllocator(BaseOutputPin *This, IMemInputPin *pPin, IMemAllocator **pAlloc); +static HRESULT WINAPI Parser_OutputPin_DecideAllocator(struct strmbase_source *iface, + IMemInputPin *peer, IMemAllocator **allocator); static inline ParserImpl *impl_from_IMediaSeeking( IMediaSeeking *iface ) { @@ -469,7 +471,8 @@ static const IMediaSeekingVtbl Parser_Seeking_Vtbl = SourceSeekingImpl_GetPreroll }; -static HRESULT WINAPI Parser_OutputPin_DecideBufferSize(BaseOutputPin *iface, IMemAllocator *pAlloc, ALLOCATOR_PROPERTIES *ppropInputRequest) +static HRESULT WINAPI Parser_OutputPin_DecideBufferSize(struct strmbase_source *iface, + IMemAllocator *pAlloc, ALLOCATOR_PROPERTIES *ppropInputRequest) { Parser_OutputPin *This = (Parser_OutputPin*)iface; ALLOCATOR_PROPERTIES actual; @@ -497,7 +500,8 @@ static HRESULT WINAPI Parser_OutputPin_GetMediaType(BasePin *iface, int iPositio return S_OK; } -static HRESULT WINAPI Parser_OutputPin_DecideAllocator(BaseOutputPin *iface, IMemInputPin *pPin, IMemAllocator **pAlloc) +static HRESULT WINAPI Parser_OutputPin_DecideAllocator(struct strmbase_source *iface, + IMemInputPin *pPin, IMemAllocator **pAlloc) { Parser_OutputPin *This = (Parser_OutputPin*)iface; HRESULT hr; diff --git a/dlls/quartz/parser.h b/dlls/quartz/parser.h index e0ea780e11f..748b7131926 100644 --- a/dlls/quartz/parser.h +++ b/dlls/quartz/parser.h @@ -28,7 +28,7 @@ typedef HRESULT (*PFN_DISCONNECT) (LPVOID iface); typedef struct Parser_OutputPin { - BaseOutputPin pin; + struct strmbase_source pin; AM_MEDIA_TYPE * pmt; LONGLONG dwSamplesProcessed; diff --git a/dlls/strmbase/outputqueue.c b/dlls/strmbase/outputqueue.c index e3515c0e317..6cb74f3e26c 100644 --- a/dlls/strmbase/outputqueue.c +++ b/dlls/strmbase/outputqueue.c @@ -48,15 +48,9 @@ static void OutputQueue_FreeSamples(OutputQueue *pOutputQueue) } } -HRESULT WINAPI OutputQueue_Construct( - BaseOutputPin *pInputPin, - BOOL bAuto, - BOOL bQueue, - LONG lBatchSize, - BOOL bBatchExact, - DWORD dwPriority, - const OutputQueueFuncTable* pFuncsTable, - OutputQueue **ppOutputQueue ) +HRESULT WINAPI OutputQueue_Construct(struct strmbase_source *pInputPin, BOOL bAuto, + BOOL bQueue, LONG lBatchSize, BOOL bBatchExact, DWORD dwPriority, + const OutputQueueFuncTable *pFuncsTable, OutputQueue **ppOutputQueue) { BOOL threaded = FALSE; diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 6f1f96c9d53..cbf4db9fd05 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -334,14 +334,14 @@ HRESULT WINAPI BasePinImpl_NewSegment(IPin * iface, REFERENCE_TIME tStart, REFER /*** OutputPin implementation ***/ -static inline BaseOutputPin *impl_BaseOutputPin_from_IPin( IPin *iface ) +static inline struct strmbase_source *impl_source_from_IPin( IPin *iface ) { - return CONTAINING_RECORD(iface, BaseOutputPin, pin.IPin_iface); + return CONTAINING_RECORD(iface, struct strmbase_source, pin.IPin_iface); } HRESULT WINAPI BaseOutputPinImpl_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv) { - BaseOutputPin *This = impl_BaseOutputPin_from_IPin(iface); + struct strmbase_source *This = impl_source_from_IPin(iface); TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv); @@ -371,7 +371,7 @@ HRESULT WINAPI BaseOutputPinImpl_QueryInterface(IPin * iface, REFIID riid, LPVOI HRESULT WINAPI BaseOutputPinImpl_Connect(IPin * iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt) { HRESULT hr; - BaseOutputPin *This = impl_BaseOutputPin_from_IPin(iface); + struct strmbase_source *This = impl_source_from_IPin(iface); TRACE("(%p)->(%p, %p)\n", This, pReceivePin, pmt); dump_AM_MEDIA_TYPE(pmt); @@ -462,7 +462,7 @@ HRESULT WINAPI BaseOutputPinImpl_ReceiveConnection(IPin *iface, IPin *pin, const HRESULT WINAPI BaseOutputPinImpl_Disconnect(IPin * iface) { HRESULT hr; - BaseOutputPin *This = impl_BaseOutputPin_from_IPin(iface); + struct strmbase_source *This = impl_source_from_IPin(iface); TRACE("(%p)->()\n", This); @@ -516,7 +516,8 @@ HRESULT WINAPI BaseOutputPinImpl_EndFlush(IPin * iface) return E_UNEXPECTED; } -HRESULT WINAPI BaseOutputPinImpl_GetDeliveryBuffer(BaseOutputPin *This, IMediaSample ** ppSample, REFERENCE_TIME * tStart, REFERENCE_TIME * tStop, DWORD dwFlags) +HRESULT WINAPI BaseOutputPinImpl_GetDeliveryBuffer(struct strmbase_source *This, + IMediaSample **ppSample, REFERENCE_TIME *tStart, REFERENCE_TIME *tStop, DWORD dwFlags) { HRESULT hr; @@ -536,7 +537,7 @@ HRESULT WINAPI BaseOutputPinImpl_GetDeliveryBuffer(BaseOutputPin *This, IMediaSa } /* replaces OutputPin_SendSample */ -HRESULT WINAPI BaseOutputPinImpl_Deliver(BaseOutputPin *This, IMediaSample * pSample) +HRESULT WINAPI BaseOutputPinImpl_Deliver(struct strmbase_source *This, IMediaSample *pSample) { IMemInputPin * pMemConnected = NULL; PIN_INFO pinInfo; @@ -576,7 +577,7 @@ HRESULT WINAPI BaseOutputPinImpl_Deliver(BaseOutputPin *This, IMediaSample * pSa } /* replaces OutputPin_CommitAllocator */ -HRESULT WINAPI BaseOutputPinImpl_Active(BaseOutputPin *This) +HRESULT WINAPI BaseOutputPinImpl_Active(struct strmbase_source *This) { HRESULT hr; @@ -596,7 +597,7 @@ HRESULT WINAPI BaseOutputPinImpl_Active(BaseOutputPin *This) } /* replaces OutputPin_DecommitAllocator */ -HRESULT WINAPI BaseOutputPinImpl_Inactive(BaseOutputPin *This) +HRESULT WINAPI BaseOutputPinImpl_Inactive(struct strmbase_source *This) { HRESULT hr; @@ -615,12 +616,13 @@ HRESULT WINAPI BaseOutputPinImpl_Inactive(BaseOutputPin *This) return hr; } -HRESULT WINAPI BaseOutputPinImpl_InitAllocator(BaseOutputPin *This, IMemAllocator **pMemAlloc) +HRESULT WINAPI BaseOutputPinImpl_InitAllocator(struct strmbase_source *This, IMemAllocator **pMemAlloc) { return CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER, &IID_IMemAllocator, (LPVOID*)pMemAlloc); } -HRESULT WINAPI BaseOutputPinImpl_DecideAllocator(BaseOutputPin *This, IMemInputPin *pPin, IMemAllocator **pAlloc) +HRESULT WINAPI BaseOutputPinImpl_DecideAllocator(struct strmbase_source *This, + IMemInputPin *pPin, IMemAllocator **pAlloc) { HRESULT hr; @@ -649,7 +651,8 @@ HRESULT WINAPI BaseOutputPinImpl_DecideAllocator(BaseOutputPin *This, IMemInputP /* Function called as a helper to IPin_Connect */ /* specific AM_MEDIA_TYPE - it cannot be NULL */ -HRESULT WINAPI BaseOutputPinImpl_AttemptConnection(BaseOutputPin *This, IPin *pReceivePin, const AM_MEDIA_TYPE *pmt) +HRESULT WINAPI BaseOutputPinImpl_AttemptConnection(struct strmbase_source *This, + IPin *pReceivePin, const AM_MEDIA_TYPE *pmt) { HRESULT hr; IMemAllocator * pMemAlloc = NULL; @@ -704,7 +707,7 @@ HRESULT WINAPI BaseOutputPinImpl_AttemptConnection(BaseOutputPin *This, IPin *pR return hr; } -void strmbase_source_init(BaseOutputPin *pin, const IPinVtbl *vtbl, struct strmbase_filter *filter, +void strmbase_source_init(struct strmbase_source *pin, const IPinVtbl *vtbl, struct strmbase_filter *filter, const WCHAR *name, const BaseOutputPinFuncTable *func_table) { memset(pin, 0, sizeof(*pin)); @@ -717,7 +720,7 @@ void strmbase_source_init(BaseOutputPin *pin, const IPinVtbl *vtbl, struct strmb pin->pFuncsTable = func_table; } -void strmbase_source_cleanup(BaseOutputPin *pin) +void strmbase_source_cleanup(struct strmbase_source *pin) { FreeMediaType(&pin->pin.mtCurrent); if (pin->pAllocator) diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 83a7ee1129e..fe4260edcaf 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -103,7 +103,8 @@ static HRESULT WINAPI TransformFilter_Output_CheckMediaType(BasePin *This, const return S_FALSE; } -static HRESULT WINAPI TransformFilter_Output_DecideBufferSize(BaseOutputPin *This, IMemAllocator *pAlloc, ALLOCATOR_PROPERTIES *ppropInputRequest) +static HRESULT WINAPI TransformFilter_Output_DecideBufferSize(struct strmbase_source *This, + IMemAllocator *pAlloc, ALLOCATOR_PROPERTIES *ppropInputRequest) { TransformFilter *pTransformFilter = impl_from_source_IPin(&This->pin.IPin_iface); return pTransformFilter->pFuncsTable->pfnDecideBufferSize(pTransformFilter, pAlloc, ppropInputRequest); diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 22eedfd4267..1b02373e11d 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -72,7 +72,7 @@ typedef struct GSTImpl { } GSTImpl; struct GSTOutPin { - BaseOutputPin pin; + struct strmbase_source pin; IQualityControl IQualityControl_iface; GstElement *flipfilter; @@ -1657,7 +1657,8 @@ static HRESULT WINAPI GSTOutPin_GetMediaType(BasePin *iface, int iPosition, AM_M return S_OK; } -static HRESULT WINAPI GSTOutPin_DecideBufferSize(BaseOutputPin *iface, IMemAllocator *pAlloc, ALLOCATOR_PROPERTIES *ppropInputRequest) +static HRESULT WINAPI GSTOutPin_DecideBufferSize(struct strmbase_source *iface, + IMemAllocator *pAlloc, ALLOCATOR_PROPERTIES *ppropInputRequest) { GSTOutPin *This = impl_source_from_IPin(&iface->pin.IPin_iface); TRACE("(%p)->(%p, %p)\n", This, pAlloc, ppropInputRequest); @@ -1665,7 +1666,8 @@ static HRESULT WINAPI GSTOutPin_DecideBufferSize(BaseOutputPin *iface, IMemAlloc return S_OK; } -static HRESULT WINAPI GSTOutPin_DecideAllocator(BaseOutputPin *base, IMemInputPin *pPin, IMemAllocator **pAlloc) +static HRESULT WINAPI GSTOutPin_DecideAllocator(struct strmbase_source *base, + IMemInputPin *pPin, IMemAllocator **pAlloc) { GSTOutPin *pin = impl_source_from_IPin(&base->pin.IPin_iface); GSTImpl *filter = impl_from_strmbase_filter(pin->pin.pin.filter); diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 5fe58cd7598..7333e705b76 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -129,7 +129,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(qtsplitter); extern CLSID CLSID_QTSplitter; typedef struct QTOutPin { - BaseOutputPin pin; + struct strmbase_source pin; IQualityControl IQualityControl_iface; AM_MEDIA_TYPE * pmt; @@ -1262,7 +1262,7 @@ static inline QTOutPin *impl_QTOutPin_from_BasePin( BasePin *iface ) return CONTAINING_RECORD(iface, QTOutPin, pin.pin); } -static inline QTOutPin *impl_QTOutPin_from_BaseOutputPin( BaseOutputPin *iface ) +static inline QTOutPin *impl_QTOutPin_from_BaseOutputPin(struct strmbase_source *iface) { return CONTAINING_RECORD(iface, QTOutPin, pin); } @@ -1311,13 +1311,15 @@ static HRESULT WINAPI QTOutPin_GetMediaType(BasePin *iface, int iPosition, AM_ME return S_OK; } -static HRESULT WINAPI QTOutPin_DecideBufferSize(BaseOutputPin *iface, IMemAllocator *pAlloc, ALLOCATOR_PROPERTIES *ppropInputRequest) +static HRESULT WINAPI QTOutPin_DecideBufferSize(struct strmbase_source *iface, + IMemAllocator *pAlloc, ALLOCATOR_PROPERTIES *ppropInputRequest) { /* Unused */ return S_OK; } -static HRESULT WINAPI QTOutPin_DecideAllocator(BaseOutputPin *iface, IMemInputPin *pPin, IMemAllocator **pAlloc) +static HRESULT WINAPI QTOutPin_DecideAllocator(struct strmbase_source *iface, + IMemInputPin *pPin, IMemAllocator **pAlloc) { HRESULT hr; QTOutPin *This = impl_QTOutPin_from_BaseOutputPin(iface); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index b2903999155..e5bed6c547b 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -53,7 +53,7 @@ typedef struct BasePinFuncTable { BasePin_GetMediaType pfnGetMediaType; } BasePinFuncTable; -typedef struct BaseOutputPin +struct strmbase_source { /* inheritance C style! */ BasePin pin; @@ -61,11 +61,11 @@ typedef struct BaseOutputPin IMemAllocator * pAllocator; const struct BaseOutputPinFuncTable* pFuncsTable; -} BaseOutputPin; +}; -typedef HRESULT (WINAPI *BaseOutputPin_AttemptConnection)(BaseOutputPin *pin, IPin *peer, const AM_MEDIA_TYPE *mt); -typedef HRESULT (WINAPI *BaseOutputPin_DecideBufferSize)(BaseOutputPin *This, IMemAllocator *pAlloc, ALLOCATOR_PROPERTIES *ppropInputRequest); -typedef HRESULT (WINAPI *BaseOutputPin_DecideAllocator)(BaseOutputPin *This, IMemInputPin *pPin, IMemAllocator **pAlloc); +typedef HRESULT (WINAPI *BaseOutputPin_AttemptConnection)(struct strmbase_source *pin, IPin *peer, const AM_MEDIA_TYPE *mt); +typedef HRESULT (WINAPI *BaseOutputPin_DecideBufferSize)(struct strmbase_source *pin, IMemAllocator *allocator, ALLOCATOR_PROPERTIES *props); +typedef HRESULT (WINAPI *BaseOutputPin_DecideAllocator)(struct strmbase_source *pin, IMemInputPin *peer, IMemAllocator **allocator); typedef struct BaseOutputPinFuncTable { BasePinFuncTable base; @@ -124,16 +124,17 @@ HRESULT WINAPI BaseOutputPinImpl_EndOfStream(IPin * iface); HRESULT WINAPI BaseOutputPinImpl_BeginFlush(IPin * iface); HRESULT WINAPI BaseOutputPinImpl_EndFlush(IPin * iface); -HRESULT WINAPI BaseOutputPinImpl_GetDeliveryBuffer(BaseOutputPin * This, IMediaSample ** ppSample, REFERENCE_TIME * tStart, REFERENCE_TIME * tStop, DWORD dwFlags); -HRESULT WINAPI BaseOutputPinImpl_Deliver(BaseOutputPin * This, IMediaSample * pSample); -HRESULT WINAPI BaseOutputPinImpl_Active(BaseOutputPin * This); -HRESULT WINAPI BaseOutputPinImpl_Inactive(BaseOutputPin * This); -HRESULT WINAPI BaseOutputPinImpl_InitAllocator(BaseOutputPin *This, IMemAllocator **pMemAlloc); -HRESULT WINAPI BaseOutputPinImpl_DecideAllocator(BaseOutputPin *This, IMemInputPin *pPin, IMemAllocator **pAlloc); -HRESULT WINAPI BaseOutputPinImpl_AttemptConnection(BaseOutputPin *pin, IPin *peer, const AM_MEDIA_TYPE *mt); - -void strmbase_source_cleanup(BaseOutputPin *pin); -void strmbase_source_init(BaseOutputPin *pin, const IPinVtbl *vtbl, struct strmbase_filter *filter, +HRESULT WINAPI BaseOutputPinImpl_GetDeliveryBuffer(struct strmbase_source *pin, + IMediaSample **sample, REFERENCE_TIME *start, REFERENCE_TIME *stop, DWORD flags); +HRESULT WINAPI BaseOutputPinImpl_Deliver(struct strmbase_source *pin, IMediaSample *sample); +HRESULT WINAPI BaseOutputPinImpl_Active(struct strmbase_source *pin); +HRESULT WINAPI BaseOutputPinImpl_Inactive(struct strmbase_source *pin); +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); + +void strmbase_source_cleanup(struct strmbase_source *pin); +void strmbase_source_init(struct strmbase_source *pin, const IPinVtbl *vtbl, struct strmbase_filter *filter, const WCHAR *name, const BaseOutputPinFuncTable *func_table); /* Base Input Pin */ @@ -204,7 +205,7 @@ HRESULT WINAPI EnumMediaTypes_Construct(BasePin *iface, BasePin_GetMediaType enu typedef struct TransformFilter { struct strmbase_filter filter; - BaseOutputPin source; + struct strmbase_source source; BaseInputPin sink; AM_MEDIA_TYPE pmt; @@ -328,7 +329,7 @@ HRESULT WINAPI AMovieSetupRegisterFilter2(const AMOVIESETUP_FILTER *pFilter, IFi typedef struct tagOutputQueue { CRITICAL_SECTION csQueue; - BaseOutputPin * pInputPin; + struct strmbase_source *pInputPin; HANDLE hThread; HANDLE hProcessQueue; @@ -350,7 +351,7 @@ typedef struct OutputQueueFuncTable OutputQueue_ThreadProc pfnThreadProc; } OutputQueueFuncTable; -HRESULT WINAPI OutputQueue_Construct( BaseOutputPin *pInputPin, BOOL bAuto, +HRESULT WINAPI OutputQueue_Construct( struct strmbase_source *pin, BOOL bAuto, BOOL bQueue, LONG lBatchSize, BOOL bBatchExact, DWORD dwPriority, const OutputQueueFuncTable* pFuncsTable, OutputQueue **ppOutputQueue ); HRESULT WINAPI OutputQueue_Destroy(OutputQueue *pOutputQueue); -- 2.23.0

1 4

[PATCH] user32: Don't report mirrored slave monitors in EnumDisplayMonitors.
by Zhiyi Zhang 12 Sep '19

12 Sep '19

Mirrored slave monitors don't get enumerated by EnumDisplayMonitors. For example, if two monitors are in mirrored mode, only one of them is reported by EnumDisplayMonitors. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/sysparams.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 09cebc2f62..b407b51811 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3750,7 +3750,8 @@ static BOOL update_monitor_cache(void) HANDLE mutex = NULL; DWORD state_flags; BOOL ret = FALSE; - DWORD i = 0; + BOOL mirrored_slave; + DWORD i = 0, j; DWORD type; /* Update monitor cache from SetupAPI if it's outdated */ @@ -3794,6 +3795,20 @@ static BOOL update_monitor_cache(void) if (!SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, &type, (BYTE *)&monitors[monitor_count].rcMonitor, sizeof(RECT), NULL, 0 )) goto fail; + + /* Mirrored slave monitors also don't get enumerated */ + mirrored_slave = FALSE; + for (j = 0; j < monitor_count; j++) + { + if (EqualRect(&monitors[j].rcMonitor, &monitors[monitor_count].rcMonitor)) + { + mirrored_slave = TRUE; + break; + } + } + if (mirrored_slave) + continue; + if (!SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCWORK, &type, (BYTE *)&monitors[monitor_count].rcWork, sizeof(RECT), NULL, 0 )) goto fail; -- 2.23.0

2 1

[PATCH] vkd3d: Don't allow concurrent writes to descriptors.
by Derek Lesho 12 Sep '19

12 Sep '19

In D3D12 it is legal to concurrently overwrite descriptors, we can't handle that. This patch locks descriptors from being overwritten by two threads at the same time. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- libs/vkd3d/resource.c | 91 ++++++++++++++++++++++++++++++++------ libs/vkd3d/vkd3d_private.h | 3 ++ 2 files changed, 80 insertions(+), 14 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 463f373..603434d 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1947,8 +1947,13 @@ static void d3d12_desc_destroy(struct d3d12_desc *descriptor, void d3d12_desc_copy(struct d3d12_desc *dst, const struct d3d12_desc *src, struct d3d12_device *device) { + pthread_spinlock_t *resource_lock; + assert(dst != src); + pthread_spin_lock(dst->lock); + resource_lock = dst->lock; + d3d12_desc_destroy(dst, device); *dst = *src; @@ -1959,6 +1964,8 @@ void d3d12_desc_copy(struct d3d12_desc *dst, const struct d3d12_desc *src, { vkd3d_view_incref(src->u.view); } + + pthread_spin_unlock(resource_lock); } static VkDeviceSize vkd3d_get_required_texel_buffer_alignment(const struct d3d12_device *device, @@ -2322,19 +2329,23 @@ void d3d12_desc_create_cbv(struct d3d12_desc *descriptor, { struct VkDescriptorBufferInfo *buffer_info; struct d3d12_resource *resource; + pthread_spinlock_t *resource_lock; + + pthread_spin_lock(descriptor->lock); + resource_lock = descriptor->lock; d3d12_desc_destroy(descriptor, device); if (!desc) { WARN("Constant buffer desc is NULL.\n"); - return; + goto done; } if (desc->SizeInBytes & (D3D12_CONSTANT_BUFFER_DATA_PLACEMENT_ALIGNMENT - 1)) { WARN("Size is not %u bytes aligned.\n", D3D12_CONSTANT_BUFFER_DATA_PLACEMENT_ALIGNMENT); - return; + goto done; } buffer_info = &descriptor->u.vk_cbv_info; @@ -2355,6 +2366,10 @@ void d3d12_desc_create_cbv(struct d3d12_desc *descriptor, descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_CBV; descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER; + + done: + descriptor->lock = resource_lock; + pthread_spin_unlock(resource_lock); } static unsigned int vkd3d_view_flags_from_d3d12_buffer_srv_flags(D3D12_BUFFER_SRV_FLAGS flags) @@ -2466,23 +2481,27 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, { struct vkd3d_texture_view_desc vkd3d_desc; struct vkd3d_view *view; + pthread_spinlock_t *resource_lock; + + pthread_spin_lock(descriptor->lock); + resource_lock = descriptor->lock; d3d12_desc_destroy(descriptor, device); if (!resource) { vkd3d_create_null_srv(descriptor, device, desc); - return; + goto done; } if (d3d12_resource_is_buffer(resource)) { vkd3d_create_buffer_srv(descriptor, device, resource, desc); - return; + goto done; } if (!init_default_texture_view_desc(&vkd3d_desc, resource, desc ? desc->Format : 0)) - return; + goto done; vkd3d_desc.miplevel_count = VK_REMAINING_MIP_LEVELS; vkd3d_desc.allowed_swizzle = true; @@ -2559,11 +2578,15 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, } if (!vkd3d_create_texture_view(device, resource->u.vk_image, &vkd3d_desc, &view)) - return; + goto done; descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_SRV; descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE; descriptor->u.view = view; + + done: + descriptor->lock = resource_lock; + pthread_spin_unlock(resource_lock); } static unsigned int vkd3d_view_flags_from_d3d12_buffer_uav_flags(D3D12_BUFFER_UAV_FLAGS flags) @@ -2761,6 +2784,11 @@ void d3d12_desc_create_uav(struct d3d12_desc *descriptor, struct d3d12_device *d struct d3d12_resource *resource, struct d3d12_resource *counter_resource, const D3D12_UNORDERED_ACCESS_VIEW_DESC *desc) { + pthread_spinlock_t *resource_lock; + + pthread_spin_lock(descriptor->lock); + resource_lock = descriptor->lock; + d3d12_desc_destroy(descriptor, device); if (!resource) @@ -2768,7 +2796,7 @@ void d3d12_desc_create_uav(struct d3d12_desc *descriptor, struct d3d12_device *d if (counter_resource) FIXME("Ignoring counter resource %p.\n", counter_resource); vkd3d_create_null_uav(descriptor, device, desc); - return; + goto done; } if (d3d12_resource_is_buffer(resource)) @@ -2781,6 +2809,10 @@ void d3d12_desc_create_uav(struct d3d12_desc *descriptor, struct d3d12_device *d FIXME("Unexpected counter resource for texture view.\n"); vkd3d_create_texture_uav(descriptor, device, resource, desc); } + + done: + descriptor->lock = resource_lock; + pthread_spin_unlock(resource_lock); } bool vkd3d_create_raw_buffer_view(struct d3d12_device *device, @@ -2888,13 +2920,17 @@ void d3d12_desc_create_sampler(struct d3d12_desc *sampler, struct d3d12_device *device, const D3D12_SAMPLER_DESC *desc) { struct vkd3d_view *view; + pthread_spinlock_t *resource_lock; + + pthread_spin_lock(sampler->lock); + resource_lock = sampler->lock; d3d12_desc_destroy(sampler, device); if (!desc) { WARN("NULL sampler desc.\n"); - return; + goto done; } if (desc->AddressU == D3D12_TEXTURE_ADDRESS_MODE_BORDER @@ -2904,19 +2940,23 @@ void d3d12_desc_create_sampler(struct d3d12_desc *sampler, desc->BorderColor[0], desc->BorderColor[1], desc->BorderColor[2], desc->BorderColor[3]); if (!(view = vkd3d_view_create())) - return; + goto done; if (d3d12_create_sampler(device, desc->Filter, desc->AddressU, desc->AddressV, desc->AddressW, desc->MipLODBias, desc->MaxAnisotropy, desc->ComparisonFunc, desc->MinLOD, desc->MaxLOD, &view->u.vk_sampler) < 0) { vkd3d_free(view); - return; + goto done; } sampler->magic = VKD3D_DESCRIPTOR_MAGIC_SAMPLER; sampler->vk_descriptor_type = VK_DESCRIPTOR_TYPE_SAMPLER; sampler->u.view = view; + + done: + sampler->lock = resource_lock; + pthread_spin_unlock(resource_lock); } HRESULT vkd3d_create_static_sampler(struct d3d12_device *device, @@ -2950,22 +2990,26 @@ void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_dev { struct vkd3d_texture_view_desc vkd3d_desc; struct vkd3d_view *view; + pthread_spinlock_t *resource_lock; + + pthread_spin_lock(rtv_desc->lock); + resource_lock = rtv_desc->lock; d3d12_rtv_desc_destroy(rtv_desc, device); if (!resource) { FIXME("NULL resource RTV not implemented.\n"); - return; + goto done; } if (!init_default_texture_view_desc(&vkd3d_desc, resource, desc ? desc->Format : 0)) - return; + goto done; if (vkd3d_desc.format->vk_aspect_mask != VK_IMAGE_ASPECT_COLOR_BIT) { WARN("Trying to create RTV for depth/stencil format %#x.\n", vkd3d_desc.format->dxgi_format); - return; + goto done; } if (desc) @@ -3013,7 +3057,7 @@ void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_dev assert(d3d12_resource_is_texture(resource)); if (!vkd3d_create_texture_view(device, resource->u.vk_image, &vkd3d_desc, &view)) - return; + goto done; rtv_desc->magic = VKD3D_DESCRIPTOR_MAGIC_RTV; rtv_desc->sample_count = vk_samples_from_dxgi_sample_desc(&resource->desc.SampleDesc); @@ -3023,6 +3067,10 @@ void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_dev rtv_desc->layer_count = vkd3d_desc.layer_count; rtv_desc->view = view; rtv_desc->resource = resource; + + done: + rtv_desc->lock = resource_lock; + pthread_spin_unlock(resource_lock); } /* DSVs */ @@ -3170,6 +3218,8 @@ static ULONG STDMETHODCALLTYPE d3d12_descriptor_heap_Release(ID3D12DescriptorHea for (i = 0; i < heap->desc.NumDescriptors; ++i) { d3d12_desc_destroy(&descriptors[i], device); + pthread_spin_destroy(descriptors[i].lock); + vkd3d_free((void*)descriptors[i].lock); } break; } @@ -3181,6 +3231,8 @@ static ULONG STDMETHODCALLTYPE d3d12_descriptor_heap_Release(ID3D12DescriptorHea for (i = 0; i < heap->desc.NumDescriptors; ++i) { d3d12_rtv_desc_destroy(&rtvs[i], device); + pthread_spin_destroy(rtvs[i].lock); + vkd3d_free((void*)rtvs[i].lock); } break; } @@ -3192,6 +3244,8 @@ static ULONG STDMETHODCALLTYPE d3d12_descriptor_heap_Release(ID3D12DescriptorHea for (i = 0; i < heap->desc.NumDescriptors; ++i) { d3d12_dsv_desc_destroy(&dsvs[i], device); + pthread_spin_destroy(dsvs[i].lock); + vkd3d_free((void*)dsvs[i].lock); } break; } @@ -3367,6 +3421,15 @@ HRESULT d3d12_descriptor_heap_create(struct d3d12_device *device, memset(object->descriptors, 0, descriptor_size * desc->NumDescriptors); + for (unsigned int i = 0; i < desc->NumDescriptors; i++) + { + struct d3d12_desc *cur_desc = (struct d3d12_desc *) (object->descriptors + (i * descriptor_size)); + pthread_spinlock_t *lock = vkd3d_malloc(sizeof(pthread_spinlock_t)); + + pthread_spin_init(lock, PTHREAD_PROCESS_PRIVATE); + cur_desc->lock = lock; + } + TRACE("Created descriptor heap %p.\n", object); *descriptor_heap = object; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index bd9670e..6f1a957 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -466,6 +466,7 @@ void vkd3d_view_incref(struct vkd3d_view *view) DECLSPEC_HIDDEN; struct d3d12_desc { uint32_t magic; + pthread_spinlock_t *lock; VkDescriptorType vk_descriptor_type; union { @@ -521,6 +522,7 @@ HRESULT vkd3d_create_static_sampler(struct d3d12_device *device, struct d3d12_rtv_desc { uint32_t magic; + pthread_spinlock_t *lock; VkSampleCountFlagBits sample_count; const struct vkd3d_format *format; uint64_t width; @@ -541,6 +543,7 @@ void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_dev struct d3d12_dsv_desc { uint32_t magic; + pthread_spinlock_t *lock; VkSampleCountFlagBits sample_count; const struct vkd3d_format *format; uint64_t width; -- 2.23.0

4 5