June 2020 - Wine-Commits - list.winehq.org

Zebediah Figura : winegstreamer: Avoid performing color matrix conversions in videoconvert.
by Alexandre Julliard June 23, 2020

June 23, 2020

Module: wine Branch: master Commit: fd25ba65e0eb9fedfb2cdfa2b7a4b16e0401dfdf URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd25ba65e0eb9fedfb2cdfa2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 22 17:56:04 2020 -0500 winegstreamer: Avoid performing color matrix conversions in videoconvert. This reduces the time videoconvert takes to process I420 -> YV12 from 15 ms to 0.8 ms on my system. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 11ca8f90bb..8f89935b82 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1022,6 +1022,9 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct gstdemux * goto out; } + /* Avoid expensive color matrix conversions. */ + gst_util_set_object_arg(G_OBJECT(vconv), "matrix-mode", "none"); + /* GStreamer outputs RGB video top-down, but DirectShow expects bottom-up. */ if (!(flip = gst_element_factory_make("videoflip", NULL))) {

1 0

Gijs Vermeulen : amstream/tests: Add IDirectDrawMediaStream::SetDirectDraw() tests.
by Alexandre Julliard June 23, 2020

June 23, 2020

Module: wine Branch: master Commit: 3328f7f7ca121f35b6da7a4d5624d8d50be1abba URL: https://source.winehq.org/git/wine.git/?a=commit;h=3328f7f7ca121f35b6da7a4d… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Jun 22 17:53:33 2020 -0500 amstream/tests: Add IDirectDrawMediaStream::SetDirectDraw() tests. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/tests/amstream.c | 150 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 133 insertions(+), 17 deletions(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index eb9b852ba4..1259de927d 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -2013,8 +2013,6 @@ static void test_IDirectDrawStreamSample(void) DDSURFACEDESC desc = { sizeof(desc) }; IAMMultiMediaStream *mmstream; IDirectDrawSurface7 *surface7; - IDirectDraw *ddraw, *ddraw2; - IDirectDraw7 *ddraw7; HRESULT hr; RECT rect; @@ -2040,21 +2038,6 @@ static void test_IDirectDrawStreamSample(void) ok(hr == S_OK, "got 0x%08x\n", hr); if (FAILED(hr)) goto error; - hr = IDirectDrawMediaStream_GetDirectDraw(ddraw_stream, &ddraw); - ok(hr == S_OK, "got 0x%08x\n", hr); - - hr = IDirectDrawMediaStream_GetDirectDraw(ddraw_stream, &ddraw2); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(ddraw == ddraw2, "got %p, %p\n", ddraw, ddraw2); - - hr = IDirectDraw_QueryInterface(ddraw, &IID_IDirectDraw7, (void **)&ddraw7); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(ddraw7 == pdd7, "Got IDirectDraw instance %p, expected %p.\n", ddraw7, pdd7); - IDirectDraw7_Release(ddraw7); - - IDirectDraw_Release(ddraw2); - IDirectDraw_Release(ddraw); - hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, NULL, NULL, 0, &sample); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -4768,6 +4751,138 @@ static void test_mediastreamfilter_get_current_stream_time(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_ddrawstream_getsetdirectdraw(void) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + IDirectDraw *ddraw, *ddraw2, *ddraw3, *ddraw4; + IDirectDrawMediaStream *ddraw_stream; + IDirectDrawStreamSample *sample; + IDirectDraw7 *ddraw7; + IMediaStream *stream; + HRESULT hr; + ULONG ref; + + hr = DirectDrawCreate(NULL, &ddraw, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IDirectDraw_QueryInterface(ddraw, &IID_IDirectDraw7, (void **)&ddraw7); + ok(hr == DD_OK, "Got hr %#x.\n", hr); + hr = IDirectDraw7_SetCooperativeLevel(ddraw7, GetDesktopWindow(), DDSCL_NORMAL); + ok(hr == DD_OK, "Got hr %#x.\n", hr); + EXPECT_REF(ddraw, 1); + EXPECT_REF(ddraw7, 1); + + hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)ddraw7, &MSPID_PrimaryVideo, 0, &stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine EXPECT_REF(ddraw, 2); + + hr = IMediaStream_QueryInterface(stream, &IID_IDirectDrawMediaStream, (void **)&ddraw_stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectDrawMediaStream_GetDirectDraw(ddraw_stream, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IDirectDrawMediaStream_GetDirectDraw(ddraw_stream, &ddraw2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(ddraw2 == ddraw, "Expected ddraw %p, got %p.\n", ddraw, ddraw2); + todo_wine EXPECT_REF(ddraw, 3); + + hr = IDirectDrawMediaStream_GetDirectDraw(ddraw_stream, &ddraw3); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(ddraw3 == ddraw2, "Expected ddraw %p, got %p.\n", ddraw2, ddraw3); + todo_wine EXPECT_REF(ddraw, 4); + IDirectDraw_Release(ddraw3); + todo_wine EXPECT_REF(ddraw, 3); + + /* The current ddraw is released when SetDirectDraw() is called. */ + hr = IDirectDrawMediaStream_SetDirectDraw(ddraw_stream, NULL); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + EXPECT_REF(ddraw, 2); + + hr = IDirectDrawMediaStream_GetDirectDraw(ddraw_stream, &ddraw3); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(ddraw3 == NULL, "Expected NULL, got %p.\n", ddraw3); + if (ddraw3) IDirectDraw_Release(ddraw3); + + hr = IDirectDrawMediaStream_SetDirectDraw(ddraw_stream, ddraw2); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine EXPECT_REF(ddraw, 3); + + if (hr == S_OK) + { + hr = IDirectDrawMediaStream_GetDirectDraw(ddraw_stream, &ddraw3); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(ddraw3 == ddraw2, "Expected ddraw %p, got %p.\n", ddraw2, ddraw3); + EXPECT_REF(ddraw, 4); + IDirectDraw_Release(ddraw3); + EXPECT_REF(ddraw, 3); + + hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, NULL, NULL, 0, &sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* SetDirectDraw() doesn't take an extra reference to the ddraw object + * if there are samples extant. */ + hr = IDirectDrawMediaStream_SetDirectDraw(ddraw_stream, ddraw2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + EXPECT_REF(ddraw, 3); + + hr = DirectDrawCreate(NULL, &ddraw3, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IDirectDraw_SetCooperativeLevel(ddraw3, GetDesktopWindow(), DDSCL_NORMAL); + ok(hr == DD_OK, "Got hr %#x.\n", hr); + EXPECT_REF(ddraw3, 1); + + hr = IDirectDrawMediaStream_SetDirectDraw(ddraw_stream, ddraw3); + ok(hr == MS_E_SAMPLEALLOC, "Got hr %#x.\n", hr); + + hr = IDirectDrawMediaStream_GetDirectDraw(ddraw_stream, &ddraw4); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(ddraw4 == ddraw2, "Expected ddraw %p, got %p.\n", ddraw2, ddraw4); + EXPECT_REF(ddraw, 4); + IDirectDraw_Release(ddraw4); + EXPECT_REF(ddraw, 3); + + ref = IDirectDrawStreamSample_Release(sample); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + hr = IDirectDrawMediaStream_SetDirectDraw(ddraw_stream, ddraw3); + ok(hr == S_OK, "Got hr %#x.\n", hr); + EXPECT_REF(ddraw, 2); + EXPECT_REF(ddraw3, 2); + + hr = IDirectDrawMediaStream_GetDirectDraw(ddraw_stream, &ddraw4); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(ddraw4 == ddraw3, "Expected ddraw %p, got %p.\n", ddraw3, ddraw4); + EXPECT_REF(ddraw3, 3); + IDirectDraw_Release(ddraw4); + EXPECT_REF(ddraw3, 2); + + hr = IDirectDrawMediaStream_SetDirectDraw(ddraw_stream, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + EXPECT_REF(ddraw3, 1); + + ref = IDirectDraw_Release(ddraw3); + ok(!ref, "Got outstanding refcount %d.\n", ref); + } + + EXPECT_REF(stream, 3); + IDirectDrawMediaStream_Release(ddraw_stream); + EXPECT_REF(stream, 2); + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + EXPECT_REF(stream, 1); + ref = IMediaStream_Release(stream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IDirectDraw7_Release(ddraw7); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IDirectDraw_Release(ddraw2); + EXPECT_REF(ddraw, 1); + ref = IDirectDraw_Release(ddraw); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(amstream) { HANDLE file; @@ -4816,6 +4931,7 @@ START_TEST(amstream) test_audiostreamsample_get_sample_times(); test_ddrawstream_initialize(); + test_ddrawstream_getsetdirectdraw(); test_ammediastream_join_am_multi_media_stream();

1 0

Zebediah Figura : winegstreamer: Prefer YUV formats to RGB ones.
by Alexandre Julliard June 23, 2020

June 23, 2020

Module: wine Branch: master Commit: 930dc23c7c9a9221aad19ebf468c3838f86427b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=930dc23c7c9a9221aad19ebf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 22 17:56:03 2020 -0500 winegstreamer: Prefer YUV formats to RGB ones. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 75ddb3082e..11ca8f90bb 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1677,17 +1677,19 @@ static HRESULT gstdecoder_source_get_media_type(struct gstdemux_source *pin, { static const GstVideoFormat video_formats[] = { - /* Roughly ordered by preference from videoflip. */ + /* Try to prefer YUV formats over RGB ones. Most decoders output in the + * YUV color space, and it's generally much less expensive for + * videoconvert to do YUV -> YUV transformations. */ GST_VIDEO_FORMAT_AYUV, - GST_VIDEO_FORMAT_BGRA, - GST_VIDEO_FORMAT_BGRx, - GST_VIDEO_FORMAT_BGR, GST_VIDEO_FORMAT_I420, GST_VIDEO_FORMAT_YV12, GST_VIDEO_FORMAT_YUY2, GST_VIDEO_FORMAT_UYVY, GST_VIDEO_FORMAT_YVYU, GST_VIDEO_FORMAT_NV12, + GST_VIDEO_FORMAT_BGRA, + GST_VIDEO_FORMAT_BGRx, + GST_VIDEO_FORMAT_BGR, }; if (!index)

1 0

Zebediah Figura : quartz/vmr9: Remove support for 8-bit RGB from the VMR7.
by Alexandre Julliard June 23, 2020

June 23, 2020

Module: wine Branch: master Commit: ceceba2ec28b8d4a8e4a1db72ce53869cdbf7b67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ceceba2ec28b8d4a8e4a1db7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 22 17:56:05 2020 -0500 quartz/vmr9: Remove support for 8-bit RGB from the VMR7. This was never correct; 8-bit RGB is always palettized. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index b49b2b67db..318d825ac9 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -419,7 +419,6 @@ static HRESULT allocate_surfaces(struct quartz_vmr *filter, const AM_MEDIA_TYPE { switch (filter->bmiheader.biBitCount) { - case 8: info.Format = D3DFMT_R3G3B2; break; case 15: info.Format = D3DFMT_X1R5G5B5; break; case 16: info.Format = D3DFMT_R5G6B5; break; case 24: info.Format = D3DFMT_R8G8B8; break;

1 0

Zebediah Figura : quartz/vmr9: Remove support for 16-bit RGB from the VMR7.
by Alexandre Julliard June 23, 2020

June 23, 2020

Module: wine Branch: master Commit: 6e8b2dcc260f349a9d563806eb72681748f947be URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e8b2dcc260f349a9d563806… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 22 17:56:07 2020 -0500 quartz/vmr9: Remove support for 16-bit RGB from the VMR7. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index d290d02ce7..09d63b6a71 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -419,7 +419,6 @@ static HRESULT allocate_surfaces(struct quartz_vmr *filter, const AM_MEDIA_TYPE { switch (filter->bmiheader.biBitCount) { - case 16: info.Format = D3DFMT_R5G6B5; break; case 24: info.Format = D3DFMT_R8G8B8; break; case 32: info.Format = D3DFMT_X8R8G8B8; break; default:

1 0

Hans Leidekker : winhttp: Set socket notification mask and callback from the parent request.
by Alexandre Julliard June 23, 2020

June 23, 2020

Module: wine Branch: master Commit: c8c0bc6d2e428129886bbecf9881645f3666b16f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8c0bc6d2e428129886bbecf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 22 21:39:24 2020 +0200 winhttp: Set socket notification mask and callback from the parent request. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 3129d4154e..d44baa26c2 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3106,6 +3106,8 @@ HINTERNET WINAPI WinHttpWebSocketCompleteUpgrade( HINTERNET hrequest, DWORD_PTR socket->hdr.type = WINHTTP_HANDLE_TYPE_SOCKET; socket->hdr.vtbl = &socket_vtbl; socket->hdr.refs = 1; + socket->hdr.callback = request->hdr.callback; + socket->hdr.notify_mask = request->hdr.notify_mask; socket->hdr.context = context; addref_object( &request->hdr );

1 0

Hans Leidekker : winhttp: Get rid of some redundant assignments.
by Alexandre Julliard June 23, 2020

June 23, 2020

Module: wine Branch: master Commit: 5c4f1e4c82ace138fa411cf06421440916d347c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c4f1e4c82ace138fa411cf0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 22 21:39:21 2020 +0200 winhttp: Get rid of some redundant assignments. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 2 +- dlls/winhttp/session.c | 19 +++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 08e9d7584e..1324005f1d 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3106,7 +3106,7 @@ HINTERNET WINAPI WinHttpWebSocketCompleteUpgrade( HINTERNET hrequest, DWORD_PTR addref_object( &request->hdr ); socket->request = request; - if ((hsocket = alloc_handle( &socket->hdr ))) socket->hdr.handle = hsocket; + hsocket = alloc_handle( &socket->hdr ); release_object( &socket->hdr ); release_object( &request->hdr ); diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 13d228d851..a5ec8b22f3 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -282,8 +282,7 @@ HINTERNET WINAPI WinHttpOpen( LPCWSTR agent, DWORD access, LPCWSTR proxy, LPCWST if (bypass && !(session->proxy_bypass = strdupW( bypass ))) goto end; } - if (!(handle = alloc_handle( &session->hdr ))) goto end; - session->hdr.handle = handle; + handle = alloc_handle( &session->hdr ); end: release_object( &session->hdr ); @@ -559,10 +558,10 @@ HINTERNET WINAPI WinHttpConnect( HINTERNET hsession, LPCWSTR server, INTERNET_PO connect->hostport = port; if (!set_server_for_hostname( connect, server, port )) goto end; - if (!(hconnect = alloc_handle( &connect->hdr ))) goto end; - connect->hdr.handle = hconnect; - - send_callback( &session->hdr, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED, &hconnect, sizeof(hconnect) ); + if ((hconnect = alloc_handle( &connect->hdr ))) + { + send_callback( &session->hdr, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED, &hconnect, sizeof(hconnect) ); + } end: release_object( &connect->hdr ); @@ -1137,10 +1136,10 @@ HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, LPCWSTR verb, LPCWSTR o if (!(request->version = strdupW( version ))) goto end; if (!(add_accept_types_header( request, types ))) goto end; - if (!(hrequest = alloc_handle( &request->hdr ))) goto end; - request->hdr.handle = hrequest; - - send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED, &hrequest, sizeof(hrequest) ); + if ((hrequest = alloc_handle( &request->hdr ))) + { + send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED, &hrequest, sizeof(hrequest) ); + } end: release_object( &request->hdr );

1 0

Hans Leidekker : winhttp: Don't close child handles on release.
by Alexandre Julliard June 23, 2020

June 23, 2020

Module: wine Branch: master Commit: 933665147704ab07e702bf4366f1a9a8aa6a62d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=933665147704ab07e702bf43… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 22 21:39:20 2020 +0200 winhttp: Don't close child handles on release. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/handle.c | 14 ++------------ dlls/winhttp/request.c | 2 -- dlls/winhttp/session.c | 5 ----- dlls/winhttp/tests/winhttp.c | 27 +++++++++++++++++++++++---- dlls/winhttp/winhttp_private.h | 1 - 5 files changed, 25 insertions(+), 24 deletions(-) diff --git a/dlls/winhttp/handle.c b/dlls/winhttp/handle.c index 9c77d5166a..08052b91ee 100644 --- a/dlls/winhttp/handle.c +++ b/dlls/winhttp/handle.c @@ -79,7 +79,6 @@ void release_object( struct object_header *hdr ) send_callback( hdr, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, &hdr->handle, sizeof(HINTERNET) ); TRACE("destroying object %p\n", hdr); - if (hdr->type != WINHTTP_HANDLE_TYPE_SESSION) list_remove( &hdr->entry ); hdr->vtbl->destroy( hdr ); } } @@ -89,7 +88,6 @@ HINTERNET alloc_handle( struct object_header *hdr ) struct object_header **p; ULONG_PTR handle, num; - list_init( &hdr->children ); hdr->handle = NULL; EnterCriticalSection( &handle_cs ); @@ -123,7 +121,7 @@ BOOL free_handle( HINTERNET hinternet ) { BOOL ret = FALSE; ULONG_PTR handle = (ULONG_PTR)hinternet; - struct object_header *hdr = NULL, *child, *next; + struct object_header *hdr = NULL; EnterCriticalSection( &handle_cs ); @@ -141,15 +139,7 @@ BOOL free_handle( HINTERNET hinternet ) LeaveCriticalSection( &handle_cs ); - if (hdr) - { - LIST_FOR_EACH_ENTRY_SAFE( child, next, &hdr->children, struct object_header, entry ) - { - TRACE("freeing child handle %p for parent handle 0x%lx\n", child->handle, handle + 1); - free_handle( child->handle ); - } - release_object( hdr ); - } + if (hdr) release_object( hdr ); EnterCriticalSection( &handle_cs ); if (next_handle > handle && !handles[handle]) next_handle = handle; diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 0511dd44ee..08e9d7584e 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3102,11 +3102,9 @@ HINTERNET WINAPI WinHttpWebSocketCompleteUpgrade( HINTERNET hrequest, DWORD_PTR socket->hdr.vtbl = &socket_vtbl; socket->hdr.refs = 1; socket->hdr.context = context; - list_init( &socket->hdr.children ); addref_object( &request->hdr ); socket->request = request; - list_add_head( &request->hdr.children, &socket->hdr.entry ); if ((hsocket = alloc_handle( &socket->hdr ))) socket->hdr.handle = hsocket; diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 87974ffbd8..13d228d851 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -246,7 +246,6 @@ HINTERNET WINAPI WinHttpOpen( LPCWSTR agent, DWORD access, LPCWSTR proxy, LPCWST session->hdr.flags = flags; session->hdr.refs = 1; session->hdr.redirect_policy = WINHTTP_OPTION_REDIRECT_POLICY_DISALLOW_HTTPS_TO_HTTP; - list_init( &session->hdr.children ); session->resolve_timeout = DEFAULT_RESOLVE_TIMEOUT; session->connect_timeout = DEFAULT_CONNECT_TIMEOUT; session->send_timeout = DEFAULT_SEND_TIMEOUT; @@ -552,11 +551,9 @@ HINTERNET WINAPI WinHttpConnect( HINTERNET hsession, LPCWSTR server, INTERNET_PO connect->hdr.notify_mask = session->hdr.notify_mask; connect->hdr.context = session->hdr.context; connect->hdr.redirect_policy = session->hdr.redirect_policy; - list_init( &connect->hdr.children ); addref_object( &session->hdr ); connect->session = session; - list_add_head( &session->hdr.children, &connect->hdr.entry ); if (!(connect->hostname = strdupW( server ))) goto end; connect->hostport = port; @@ -1121,12 +1118,10 @@ HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, LPCWSTR verb, LPCWSTR o request->hdr.notify_mask = connect->hdr.notify_mask; request->hdr.context = connect->hdr.context; request->hdr.redirect_policy = connect->hdr.redirect_policy; - list_init( &request->hdr.children ); list_init( &request->task_queue ); addref_object( &connect->hdr ); request->connect = connect; - list_add_head( &connect->hdr.children, &request->hdr.entry ); request->resolve_timeout = connect->session->resolve_timeout; request->connect_timeout = connect->session->connect_timeout; diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 8083c4825b..be02bbe250 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -3099,6 +3099,7 @@ static void test_websocket(int port) { HINTERNET session, connection, request, socket; DWORD size, len, count, status, index, error; + DWORD_PTR ctx; WCHAR header[32]; char buf[128]; BOOL ret; @@ -3244,10 +3245,28 @@ static void test_websocket(int port) /* Send/Receive on websock */ - WinHttpCloseHandle(request); - WinHttpCloseHandle(socket); - WinHttpCloseHandle(connection); - WinHttpCloseHandle(session); + ret = WinHttpCloseHandle(connection); + ok(ret, "got %u\n", GetLastError()); + + /* request handle is still valid */ + size = sizeof(ctx); + ret = WinHttpQueryOption(request, WINHTTP_OPTION_CONTEXT_VALUE, &ctx, &size); + ok(ret, "got %u\n", GetLastError()); + + ret = WinHttpCloseHandle(socket); + ok(ret, "got %u\n", GetLastError()); + + ret = WinHttpQueryOption(request, WINHTTP_OPTION_CONTEXT_VALUE, &ctx, &size); + ok(ret, "got %u\n", GetLastError()); + + ret = WinHttpCloseHandle(session); + ok(ret, "got %u\n", GetLastError()); + + ret = WinHttpQueryOption(request, WINHTTP_OPTION_CONTEXT_VALUE, &ctx, &size); + ok(ret, "got %u\n", GetLastError()); + + ret = WinHttpCloseHandle(request); + ok(ret, "got %u\n", GetLastError()); } static void test_not_modified(int port) diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index af695f86c3..9b07b64b09 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -51,7 +51,6 @@ struct object_header WINHTTP_STATUS_CALLBACK callback; DWORD notify_mask; struct list entry; - struct list children; }; struct hostdata

1 0

Zebediah Figura : d3dcompiler: Pass an instruction list to the load creation functions.
by Alexandre Julliard June 23, 2020

June 23, 2020

Module: wine Branch: master Commit: 548f763f995eefcd56a0ec6f03cf2fb8db837201 URL: https://source.winehq.org/git/wine.git/?a=commit;h=548f763f995eefcd56a0ec6f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 18 10:46:24 2020 -0500 d3dcompiler: Pass an instruction list to the load creation functions. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/hlsl.y | 61 +++++++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index c9dbdeb8c1..f6285e6658 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -620,7 +620,7 @@ static struct hlsl_ir_load *new_var_load(struct hlsl_ir_var *var, const struct s return load; } -static struct hlsl_ir_load *new_load(struct hlsl_ir_node *var_node, struct hlsl_ir_node *offset, +static struct hlsl_ir_load *add_load(struct list *instrs, struct hlsl_ir_node *var_node, struct hlsl_ir_node *offset, struct hlsl_type *data_type, const struct source_location loc) { struct hlsl_ir_node *add = NULL; @@ -636,7 +636,7 @@ static struct hlsl_ir_load *new_load(struct hlsl_ir_node *var_node, struct hlsl_ { if (!(add = new_binary_expr(HLSL_IR_BINOP_ADD, src->offset, offset, loc))) return NULL; - list_add_after(&offset->entry, &add->entry); + list_add_tail(instrs, &add->entry); offset = add; } } @@ -654,7 +654,7 @@ static struct hlsl_ir_load *new_load(struct hlsl_ir_node *var_node, struct hlsl_ if (!(assign = make_simple_assignment(var, var_node))) return NULL; - list_add_after(&var_node->entry, &assign->node.entry); + list_add_tail(instrs, &assign->node.entry); } if (!(load = d3dcompiler_alloc(sizeof(*load)))) @@ -662,23 +662,23 @@ static struct hlsl_ir_load *new_load(struct hlsl_ir_node *var_node, struct hlsl_ init_node(&load->node, HLSL_IR_LOAD, data_type, loc); load->src.var = var; load->src.offset = offset; - list_add_after(&offset->entry, &load->node.entry); + list_add_tail(instrs, &load->node.entry); return load; } -static struct hlsl_ir_load *new_record_load(struct hlsl_ir_node *record, +static struct hlsl_ir_load *add_record_load(struct list *instrs, struct hlsl_ir_node *record, const struct hlsl_struct_field *field, const struct source_location loc) { struct hlsl_ir_constant *c; if (!(c = new_uint_constant(field->reg_offset * 4, loc))) return NULL; - list_add_after(&record->entry, &c->node.entry); + list_add_tail(instrs, &c->node.entry); - return new_load(record, &c->node, field->type, loc); + return add_load(instrs, record, &c->node, field->type, loc); } -static struct hlsl_ir_load *new_array_load(struct hlsl_ir_node *array, +static struct hlsl_ir_load *add_array_load(struct list *instrs, struct hlsl_ir_node *array, struct hlsl_ir_node *index, const struct source_location loc) { const struct hlsl_type *expr_type = array->data_type; @@ -709,13 +709,13 @@ static struct hlsl_ir_load *new_array_load(struct hlsl_ir_node *array, if (!(c = new_uint_constant(data_type->reg_size * 4, loc))) return NULL; - list_add_after(&index->entry, &c->node.entry); + list_add_tail(instrs, &c->node.entry); if (!(mul = new_binary_expr(HLSL_IR_BINOP_MUL, index, &c->node, loc))) return NULL; - list_add_after(&c->node.entry, &mul->entry); + list_add_tail(instrs, &mul->entry); index = mul; - return new_load(array, index, data_type, loc); + return add_load(instrs, array, index, data_type, loc); } static void struct_var_initializer(struct list *list, struct hlsl_ir_var *var, @@ -2365,7 +2365,7 @@ postfix_expr: primary_expr { if (!strcmp($3, field->name)) { - if (!new_record_load(node, field, loc)) + if (!add_record_load($1, node, field, loc)) YYABORT; $$ = $1; break; @@ -2398,26 +2398,27 @@ postfix_expr: primary_expr YYABORT; } } - | postfix_expr '[' expr ']' - { - struct hlsl_ir_load *load; + | postfix_expr '[' expr ']' + { + struct hlsl_ir_node *array = node_from_list($1), *index = node_from_list($3); - if (node_from_list($3)->data_type->type != HLSL_CLASS_SCALAR) - { - hlsl_report_message(get_location(&@3), HLSL_LEVEL_ERROR, "array index is not scalar"); - free_instr_list($1); - free_instr_list($3); - YYABORT; - } + list_move_tail($1, $3); + d3dcompiler_free($3); - if (!(load = new_array_load(node_from_list($1), node_from_list($3), get_location(&@2)))) - { - free_instr_list($1); - free_instr_list($3); - YYABORT; - } - $$ = append_binop($1, $3, &load->node); - } + if (index->data_type->type != HLSL_CLASS_SCALAR) + { + hlsl_report_message(get_location(&@3), HLSL_LEVEL_ERROR, "array index is not scalar"); + free_instr_list($1); + YYABORT; + } + + if (!add_array_load($1, array, index, get_location(&@2))) + { + free_instr_list($1); + YYABORT; + } + $$ = $1; + } /* "var_modifiers" doesn't make sense in this case, but it's needed in the grammar to avoid shift/reduce conflicts. */

1 0

Henri Verbeet : vkd3d-shader: Allow the name of the SPIR-V entry point to be specified.
by Alexandre Julliard June 23, 2020

June 23, 2020

Module: vkd3d Branch: master Commit: 25ef0550623dced01a37b2f9b5cf75cbd3ae9acc URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=25ef0550623dced01a37b2f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 23 14:08:15 2020 +0430 vkd3d-shader: Allow the name of the SPIR-V entry point to be specified. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 2 ++ libs/vkd3d-shader/spirv.c | 19 +++++++++++++------ libs/vkd3d/state.c | 1 + 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index d49fecd..1cfc0fa 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -279,6 +279,8 @@ struct vkd3d_shader_spirv_target_info enum vkd3d_shader_structure_type type; const void *next; + const char *entry_point; /* "main" if NULL. */ + enum vkd3d_shader_spirv_environment environment; const enum vkd3d_shader_spirv_extension *extensions; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 7636316..49994a3 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1666,7 +1666,7 @@ static uint32_t vkd3d_spirv_get_type_id(struct vkd3d_spirv_builder *builder, } } -static void vkd3d_spirv_builder_init(struct vkd3d_spirv_builder *builder) +static void vkd3d_spirv_builder_init(struct vkd3d_spirv_builder *builder, const char *entry_point) { vkd3d_spirv_stream_init(&builder->debug_stream); vkd3d_spirv_stream_init(&builder->annotation_stream); @@ -1682,7 +1682,7 @@ static void vkd3d_spirv_builder_init(struct vkd3d_spirv_builder *builder) rb_init(&builder->declarations, vkd3d_spirv_declaration_compare); builder->main_function_id = vkd3d_spirv_alloc_id(builder); - vkd3d_spirv_build_op_name(builder, builder->main_function_id, "main"); + vkd3d_spirv_build_op_name(builder, builder->main_function_id, entry_point); } static void vkd3d_spirv_builder_begin_main_function(struct vkd3d_spirv_builder *builder) @@ -1714,7 +1714,7 @@ static void vkd3d_spirv_builder_free(struct vkd3d_spirv_builder *builder) } static bool vkd3d_spirv_compile_module(struct vkd3d_spirv_builder *builder, - struct vkd3d_shader_code *spirv) + struct vkd3d_shader_code *spirv, const char *entry_point) { uint64_t capability_mask = builder->capability_mask; struct vkd3d_spirv_stream stream; @@ -1754,7 +1754,7 @@ static bool vkd3d_spirv_compile_module(struct vkd3d_spirv_builder *builder, /* entry point declarations */ vkd3d_spirv_build_op_memory_model(&stream, SpvAddressingModelLogical, SpvMemoryModelGLSL450); vkd3d_spirv_build_op_entry_point(&stream, builder->execution_model, builder->main_function_id, - "main", builder->iface, builder->iface_element_count); + entry_point, builder->iface, builder->iface_element_count); /* execution mode declarations */ if (builder->invocation_count) @@ -2122,6 +2122,13 @@ static bool is_control_point_phase(const struct vkd3d_shader_phase *phase) static void vkd3d_dxbc_compiler_emit_initial_declarations(struct vkd3d_dxbc_compiler *compiler); +static const char *vkd3d_dxbc_compiler_get_entry_point_name(const struct vkd3d_dxbc_compiler *compiler) +{ + const struct vkd3d_shader_spirv_target_info *info = compiler->spirv_target_info; + + return info && info->entry_point ? info->entry_point : "main"; +} + struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader_version *shader_version, const struct vkd3d_shader_desc *shader_desc, const struct vkd3d_shader_compile_info *compile_info, const struct vkd3d_shader_scan_info *scan_info) @@ -2162,7 +2169,7 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader return NULL; } - vkd3d_spirv_builder_init(&compiler->spirv_builder); + vkd3d_spirv_builder_init(&compiler->spirv_builder, vkd3d_dxbc_compiler_get_entry_point_name(compiler)); for (i = 0; i < compile_info->option_count; ++i) { @@ -8740,7 +8747,7 @@ int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler, if (compiler->strip_debug) vkd3d_spirv_stream_clear(&builder->debug_stream); - if (!vkd3d_spirv_compile_module(builder, spirv)) + if (!vkd3d_spirv_compile_module(builder, spirv, vkd3d_dxbc_compiler_get_entry_point_name(compiler))) return VKD3D_ERROR; if (TRACE_ON()) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 55953ac..db342df 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2174,6 +2174,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s ps_target_info.type = VKD3D_SHADER_STRUCTURE_TYPE_SPIRV_TARGET_INFO; ps_target_info.next = NULL; + ps_target_info.entry_point = "main"; ps_target_info.environment = VKD3D_SHADER_SPIRV_ENVIRONMENT_VULKAN_1_0; ps_target_info.extensions = vk_info->shader_extensions; ps_target_info.extension_count = vk_info->shader_extension_count;

1 0