September 2019 - Wine-commits

Brendan Shanks : d2d1: Only create shader resource views for drawable bitmaps.
by Alexandre Julliard 25 Sep '19

25 Sep '19

Module: wine Branch: master Commit: 940c3b4896a75b65351d4c7d610f1071d0c9d0be URL: https://source.winehq.org/git/wine.git/?a=commit;h=940c3b4896a75b65351d4c7d… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Sep 25 22:53:57 2019 +0330 d2d1: Only create shader resource views for drawable bitmaps. The underlying resource for bitmaps created with D2D1_BITMAP_OPTIONS_CANNOT_DRAW doesn't necessarily have D3D10_BIND_SHADER_RESOURCE in its bind flags. Original patch by Robin Kertels <robin.kertels(a)gmail.com> Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/bitmap.c | 65 ++++++++++++++++---------------------------- dlls/d2d1/brush.c | 2 +- dlls/d2d1/d2d1_private.h | 3 +- dlls/d2d1/dc_render_target.c | 5 +--- 4 files changed, 27 insertions(+), 48 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index 39e81192f7..dc5ed9e6ad 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -66,11 +66,13 @@ static ULONG STDMETHODCALLTYPE d2d_bitmap_Release(ID2D1Bitmap1 *iface) if (!refcount) { - ID3D10ShaderResourceView_Release(bitmap->view); + if (bitmap->srv) + ID3D10ShaderResourceView_Release(bitmap->srv); if (bitmap->rtv) ID3D10RenderTargetView_Release(bitmap->rtv); if (bitmap->surface) IDXGISurface_Release(bitmap->surface); + ID3D10Resource_Release(bitmap->resource); ID2D1Factory_Release(bitmap->factory); heap_free(bitmap); } @@ -149,7 +151,6 @@ static HRESULT STDMETHODCALLTYPE d2d_bitmap_CopyFromMemory(ID2D1Bitmap1 *iface, { struct d2d_bitmap *bitmap = impl_from_ID2D1Bitmap1(iface); ID3D10Device *device; - ID3D10Resource *dst; D3D10_BOX box; TRACE("iface %p, dst_rect %p, src_data %p, pitch %u.\n", iface, dst_rect, src_data, pitch); @@ -164,11 +165,9 @@ static HRESULT STDMETHODCALLTYPE d2d_bitmap_CopyFromMemory(ID2D1Bitmap1 *iface, box.back = 1; } - ID3D10ShaderResourceView_GetResource(bitmap->view, &dst); - ID3D10ShaderResourceView_GetDevice(bitmap->view, &device); - ID3D10Device_UpdateSubresource(device, dst, 0, dst_rect ? &box : NULL, src_data, pitch, 0); + ID3D10Resource_GetDevice(bitmap->resource, &device); + ID3D10Device_UpdateSubresource(device, bitmap->resource, 0, dst_rect ? &box : NULL, src_data, pitch, 0); ID3D10Device_Release(device); - ID3D10Resource_Release(dst); return S_OK; } @@ -271,36 +270,37 @@ static BOOL format_supported(const D2D1_PIXEL_FORMAT *format) } static void d2d_bitmap_init(struct d2d_bitmap *bitmap, struct d2d_device_context *context, - ID3D10ShaderResourceView *view, D2D1_SIZE_U size, const D2D1_BITMAP_PROPERTIES1 *desc) + ID3D10Resource *resource, D2D1_SIZE_U size, const D2D1_BITMAP_PROPERTIES1 *desc) { - ID3D10Resource *resource; ID3D10Device *d3d_device; HRESULT hr; bitmap->ID2D1Bitmap1_iface.lpVtbl = &d2d_bitmap_vtbl; bitmap->refcount = 1; ID2D1Factory_AddRef(bitmap->factory = context->factory); - ID3D10ShaderResourceView_AddRef(bitmap->view = view); + ID3D10Resource_AddRef(bitmap->resource = resource); bitmap->pixel_size = size; bitmap->format = desc->pixelFormat; bitmap->dpi_x = desc->dpiX; bitmap->dpi_y = desc->dpiY; bitmap->options = desc->bitmapOptions; - ID3D10ShaderResourceView_GetResource(bitmap->view, &resource); - if (d2d_device_context_is_dxgi_target(context)) ID3D10Resource_QueryInterface(resource, &IID_IDXGISurface, (void **)&bitmap->surface); + ID3D10Resource_GetDevice(resource, &d3d_device); if (bitmap->options & D2D1_BITMAP_OPTIONS_TARGET) { - ID3D10Resource_GetDevice(resource, &d3d_device); if (FAILED(hr = ID3D10Device_CreateRenderTargetView(d3d_device, resource, NULL, &bitmap->rtv))) - WARN("Failed to create rtv, hr %#x.\n", hr); - ID3D10Device_Release(d3d_device); + WARN("Failed to create RTV, hr %#x.\n", hr); } - ID3D10Resource_Release(resource); + if (!(bitmap->options & D2D1_BITMAP_OPTIONS_CANNOT_DRAW)) + { + if (FAILED(hr = ID3D10Device_CreateShaderResourceView(d3d_device, resource, NULL, &bitmap->srv))) + WARN("Failed to create SRV, hr %#x.\n", hr); + } + ID3D10Device_Release(d3d_device); if (bitmap->dpi_x == 0.0f && bitmap->dpi_y == 0.0f) { @@ -314,7 +314,6 @@ HRESULT d2d_bitmap_create(struct d2d_device_context *context, D2D1_SIZE_U size, { D3D10_SUBRESOURCE_DATA resource_data; D3D10_TEXTURE2D_DESC texture_desc; - ID3D10ShaderResourceView *view; ID3D10Texture2D *texture; HRESULT hr; @@ -355,21 +354,12 @@ HRESULT d2d_bitmap_create(struct d2d_device_context *context, D2D1_SIZE_U size, return hr; } - hr = ID3D10Device_CreateShaderResourceView(context->d3d_device, (ID3D10Resource *)texture, NULL, &view); - ID3D10Texture2D_Release(texture); - if (FAILED(hr)) - { - ERR("Failed to create view, hr %#x.\n", hr); - return hr; - } - if ((*bitmap = heap_alloc_zero(sizeof(**bitmap)))) { - d2d_bitmap_init(*bitmap, context, view, size, desc); + d2d_bitmap_init(*bitmap, context, (ID3D10Resource *)texture, size, desc); TRACE("Created bitmap %p.\n", *bitmap); } - - ID3D10ShaderResourceView_Release(view); + ID3D10Texture2D_Release(texture); return *bitmap ? S_OK : E_OUTOFMEMORY; } @@ -391,7 +381,7 @@ HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid, goto failed; } - ID3D10ShaderResourceView_GetDevice(src_impl->view, &device); + ID3D10Resource_GetDevice(src_impl->resource, &device); ID3D10Device_Release(device); if (device != context->d3d_device) { @@ -423,7 +413,7 @@ HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid, goto failed; } - d2d_bitmap_init(*bitmap, context, src_impl->view, src_impl->pixel_size, desc); + d2d_bitmap_init(*bitmap, context, src_impl->resource, src_impl->pixel_size, desc); TRACE("Created bitmap %p.\n", *bitmap); failed: @@ -432,7 +422,6 @@ HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid, if (IsEqualGUID(iid, &IID_IDXGISurface) || IsEqualGUID(iid, &IID_IDXGISurface1)) { - ID3D10ShaderResourceView *view; DXGI_SURFACE_DESC surface_desc; IDXGISurface *surface = data; ID3D10Resource *resource; @@ -454,17 +443,9 @@ HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid, return D2DERR_UNSUPPORTED_OPERATION; } - hr = ID3D10Device_CreateShaderResourceView(context->d3d_device, resource, NULL, &view); - ID3D10Resource_Release(resource); - if (FAILED(hr)) - { - WARN("Failed to create shader resource view, hr %#x.\n", hr); - return hr; - } - if (!(*bitmap = heap_alloc_zero(sizeof(**bitmap)))) { - ID3D10ShaderResourceView_Release(view); + ID3D10Resource_Release(resource); return E_OUTOFMEMORY; } @@ -472,7 +453,7 @@ HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid, if (FAILED(hr = IDXGISurface_GetDesc(surface, &surface_desc))) { WARN("Failed to get surface desc, hr %#x.\n", hr); - ID3D10ShaderResourceView_Release(view); + ID3D10Resource_Release(resource); return hr; } @@ -499,8 +480,8 @@ HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid, pixel_size.width = surface_desc.Width; pixel_size.height = surface_desc.Height; - d2d_bitmap_init(*bitmap, context, view, pixel_size, &d); - ID3D10ShaderResourceView_Release(view); + d2d_bitmap_init(*bitmap, context, resource, pixel_size, &d); + ID3D10Resource_Release(resource); TRACE("Created bitmap %p.\n", *bitmap); return S_OK; diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 21abf1456a..80fc0f5331 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -1295,7 +1295,7 @@ static void d2d_brush_bind_bitmap(struct d2d_brush *brush, ID3D10Device *device, { HRESULT hr; - ID3D10Device_PSSetShaderResources(device, brush_idx, 1, &brush->u.bitmap.bitmap->view); + ID3D10Device_PSSetShaderResources(device, brush_idx, 1, &brush->u.bitmap.bitmap->srv); if (!brush->u.bitmap.sampler_state) { D3D10_SAMPLER_DESC sampler_desc; diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index b07893ae18..2e42d6d550 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -346,9 +346,10 @@ struct d2d_bitmap LONG refcount; ID2D1Factory *factory; - ID3D10ShaderResourceView *view; + ID3D10ShaderResourceView *srv; ID3D10RenderTargetView *rtv; IDXGISurface *surface; + ID3D10Resource *resource; D2D1_SIZE_U pixel_size; D2D1_PIXEL_FORMAT format; float dpi_x; diff --git a/dlls/d2d1/dc_render_target.c b/dlls/d2d1/dc_render_target.c index 310c541296..47aa99697d 100644 --- a/dlls/d2d1/dc_render_target.c +++ b/dlls/d2d1/dc_render_target.c @@ -687,7 +687,6 @@ static HRESULT STDMETHODCALLTYPE d2d_dc_render_target_BindDC(ID2D1DCRenderTarget struct d2d_bitmap *bitmap_impl; IDXGISurface1 *dxgi_surface; ID2D1DeviceContext *context; - ID3D10Resource *resource; D2D1_SIZE_U bitmap_size; ID2D1Bitmap *bitmap; HRESULT hr; @@ -716,9 +715,7 @@ static HRESULT STDMETHODCALLTYPE d2d_dc_render_target_BindDC(ID2D1DCRenderTarget } bitmap_impl = unsafe_impl_from_ID2D1Bitmap(bitmap); - ID3D10ShaderResourceView_GetResource(bitmap_impl->view, &resource); - ID3D10Resource_QueryInterface(resource, &IID_IDXGISurface1, (void **)&dxgi_surface); - ID3D10Resource_Release(resource); + ID3D10Resource_QueryInterface(bitmap_impl->resource, &IID_IDXGISurface1, (void **)&dxgi_surface); ID2D1DeviceContext_SetTarget(context, (ID2D1Image *)bitmap); ID2D1Bitmap_Release(bitmap);

1 0

Paul Gofman : wined3d: Allow loading buffers mapped through system memory.
by Alexandre Julliard 25 Sep '19

25 Sep '19

Module: wine Branch: master Commit: df509be8c6d581b2e68ea79c282289dd8840b11a URL: https://source.winehq.org/git/wine.git/?a=commit;h=df509be8c6d581b2e68ea79c… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Sep 23 17:00:30 2019 +0300 wined3d: Allow loading buffers mapped through system memory. Fixes rendering dirt on the wind shield and GL_INVALID_OPERATION errors in "Need For Speed Shift 2". The test succeeds on Windows with retail Direct3D 9, but fails with debug Direct3D 9 if selected in DirectX SDK control panel: error code is returned from _DrawIndexedPrimitive() and the triangle is not rendered. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 140 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/buffer.c | 8 ++- 2 files changed, 146 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 121b50f42a..e7076aeed6 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -26125,6 +26125,145 @@ done: DestroyWindow(window); } +static void test_draw_mapped_buffer(void) +{ + IDirect3DVertexBuffer9 *vb; + IDirect3DIndexBuffer9 *ib; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + unsigned int i; + D3DCOLOR color; + ULONG refcount; + BOOL test_pass; + HWND window; + HRESULT hr; + void *data; + + static const short indices[] = {0, 1, 2}; + static const struct + { + struct vec3 position; + DWORD diffuse; + } + quad[] = + { + {{-1.0f, -1.0f, 0.1f}, 0xffff0000}, + {{-1.0f, 1.0f, 0.1f}, 0xffff0000}, + {{ 1.0f, 1.0f, 0.1f}, 0xffff0000}, + }; + static const struct + { + D3DPOOL pool; + DWORD usage; + BOOL ignore_wine_result; + } + tests[] = + { + {D3DPOOL_DEFAULT, D3DUSAGE_DYNAMIC, TRUE}, + {D3DPOOL_MANAGED, 0}, + {D3DPOOL_SYSTEMMEM, 0}, + }; + + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateIndexBuffer(device, sizeof(indices), 0, + D3DFMT_INDEX16, D3DPOOL_DEFAULT, &ib, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DIndexBuffer9_Lock(ib, 0, sizeof(indices), &data, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + memcpy(data, indices, sizeof(indices)); + + hr = IDirect3DDevice9_SetIndices(device, ib); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DDevice9_CreateVertexBuffer(device, sizeof(quad), tests[i].usage, + D3DFVF_XYZ | D3DFVF_DIFFUSE, tests[i].pool, &vb, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DVertexBuffer9_Lock(vb, 0, sizeof(quad), &data, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + memcpy(data, quad, sizeof(quad)); + + hr = IDirect3DDevice9_SetStreamSource(device, 0, vb, 0, sizeof(quad[0])); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff0000ff, 1.0f, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawIndexedPrimitive(device, D3DPT_TRIANGLELIST, 0, 0, ARRAY_SIZE(quad), 0, 1); + ok(hr == D3D_OK, "Got unexpected hr %#x, test %u.\n", hr, i); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + color = getPixelColor(device, 160, 120); + ok(color_match(color, 0x00ff0000, 1), "Got unexpected color 0x%08x, test %u.\n", color, i); + color = getPixelColor(device, 480, 360); + ok(color_match(color, 0x000000ff, 1), "Got unexpected color 0x%08x, test %u.\n", color, i); + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer9_Unlock(vb); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + /* One more time now when buffer object in wined3d is already created. */ + hr = IDirect3DVertexBuffer9_Lock(vb, 0, sizeof(quad), &data, D3DLOCK_DISCARD); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + memcpy(data, quad, sizeof(quad)); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff0000ff, 1.0f, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawIndexedPrimitive(device, D3DPT_TRIANGLELIST, 0, 0, ARRAY_SIZE(quad), 0, 1); + ok(hr == D3D_OK, "Got unexpected hr %#x, test %u.\n", hr, i); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + color = getPixelColor(device, 160, 120); + + test_pass = color_match(color, 0x00ff0000, 1); + todo_wine_if(tests[i].ignore_wine_result && !test_pass) + ok(test_pass, "Got unexpected color 0x%08x, test %u.\n", color, i); + + color = getPixelColor(device, 480, 360); + ok(color_match(color, 0x000000ff, 1), "Got unexpected color 0x%08x, test %u.\n", color, i); + + hr = IDirect3DVertexBuffer9_Unlock(vb); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + IDirect3DVertexBuffer9_Release(vb); + } + + hr = IDirect3DIndexBuffer9_Unlock(ib); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + IDirect3DIndexBuffer9_Release(ib); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + + START_TEST(visual) { D3DADAPTER_IDENTIFIER9 identifier; @@ -26269,4 +26408,5 @@ START_TEST(visual) test_nrm_instruction(); test_desktop_window(); test_mismatched_sample_types(); + test_draw_mapped_buffer(); } diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 18a0d72117..95fcdff7ef 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -857,11 +857,15 @@ void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context * TRACE("buffer %p.\n", buffer); - if (buffer->resource.map_count) + if (buffer->resource.map_count && buffer->map_ptr) { - WARN("Buffer is mapped, skipping preload.\n"); + FIXME("Buffer is mapped through buffer object, not loading.\n"); return; } + else if (buffer->resource.map_count) + { + WARN("Loading mapped buffer.\n"); + } buffer_mark_used(buffer);

1 0

Zebediah Figura : strmbase: Rename pfnCheckMediaType() to pin_query_accept().
by Alexandre Julliard 25 Sep '19

25 Sep '19

Module: wine Branch: master Commit: 9f1909be894c6a8f980314d1ba96b71f6f2e99d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f1909be894c6a8f980314d1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 24 19:10:10 2019 -0500 strmbase: Rename pfnCheckMediaType() to pin_query_accept(). And remove the unnecessary calling convention. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avico.c | 13 ++++++------- dlls/qcap/avimux.c | 26 +++++++++++--------------- dlls/qcap/smartteefilter.c | 40 +++++++++++++++++----------------------- dlls/qcap/vfwcapture.c | 14 ++++++-------- dlls/quartz/filesource.c | 14 ++++++-------- dlls/strmbase/pin.c | 6 +++--- dlls/strmbase/renderer.c | 13 ++++++------- dlls/strmbase/transform.c | 27 ++++++++++++--------------- dlls/winegstreamer/gstdemux.c | 30 ++++++++++++++---------------- dlls/wineqtdecoder/qtsplitter.c | 18 ++++++++---------- include/wine/strmbase.h | 9 ++++----- 11 files changed, 93 insertions(+), 117 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9f1909be894c6a8f9803…

1 0

Zebediah Figura : strmbase: Rename pfnGetMediaType() to pin_get_media_type().
by Alexandre Julliard 25 Sep '19

25 Sep '19

Module: wine Branch: master Commit: f46fe6d3717f720850f3e2beb12596637bb197a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f46fe6d3717f720850f3e2be… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 24 19:10:11 2019 -0500 strmbase: Rename pfnGetMediaType() to pin_get_media_type(). And remove the unnecessary calling convention. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avico.c | 21 ++++++--------------- dlls/qcap/avimux.c | 11 +++-------- dlls/qcap/smartteefilter.c | 12 ++++++------ dlls/qcap/vfwcapture.c | 4 ++-- dlls/quartz/filesource.c | 4 ++-- dlls/strmbase/mediatype.c | 4 ++-- dlls/strmbase/pin.c | 2 +- dlls/strmbase/renderer.c | 2 +- dlls/strmbase/transform.c | 6 +++--- dlls/winegstreamer/gstdemux.c | 12 ++++++------ dlls/wineqtdecoder/qtsplitter.c | 6 +++--- include/wine/strmbase.h | 7 ++----- 12 files changed, 37 insertions(+), 54 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f46fe6d3717f720850f3…

1 0

Zebediah Figura : strmbase: Pass an unsigned index to pin_get_media_type().
by Alexandre Julliard 25 Sep '19

25 Sep '19

Module: wine Branch: master Commit: b0e47ab9e719981ba2dacb2d2cf6f7c0ed91d05a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0e47ab9e719981ba2dacb2d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 24 19:10:12 2019 -0500 strmbase: Pass an unsigned index to pin_get_media_type(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avico.c | 4 +--- dlls/qcap/avimux.c | 4 +--- dlls/qcap/smartteefilter.c | 9 ++++++--- dlls/qcap/vfwcapture.c | 5 ++--- dlls/quartz/filesource.c | 6 ++---- dlls/strmbase/pin.c | 5 +---- dlls/strmbase/transform.c | 4 +--- dlls/winegstreamer/gstdemux.c | 7 +------ dlls/wineqtdecoder/qtsplitter.c | 4 +--- include/wine/strmbase.h | 4 ++-- 10 files changed, 18 insertions(+), 34 deletions(-) diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index 43cca04a06..33d1c7fab2 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -526,12 +526,10 @@ static const IPinVtbl AVICompressorOutputPinVtbl = { BasePinImpl_NewSegment }; -static HRESULT source_get_media_type(struct strmbase_pin *base, int iPosition, AM_MEDIA_TYPE *amt) +static HRESULT source_get_media_type(struct strmbase_pin *base, unsigned int iPosition, AM_MEDIA_TYPE *amt) { AVICompressor *This = impl_from_strmbase_filter(base->filter); - TRACE("(%p)->(%d %p)\n", base, iPosition, amt); - if(iPosition || !This->videoinfo) return S_FALSE; diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index f969e73a8c..42b198deea 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -1174,12 +1174,10 @@ static HRESULT WINAPI AviMuxOut_AttemptConnection(struct strmbase_source *base, return BaseOutputPinImpl_AttemptConnection(base, pReceivePin, pmt); } -static HRESULT source_get_media_type(struct strmbase_pin *base, int iPosition, AM_MEDIA_TYPE *amt) +static HRESULT source_get_media_type(struct strmbase_pin *base, unsigned int iPosition, AM_MEDIA_TYPE *amt) { TRACE("(%p)->(%d %p)\n", base, iPosition, amt); - if(iPosition < 0) - return E_INVALIDARG; if(iPosition > 0) return VFW_S_NO_MORE_ITEMS; diff --git a/dlls/qcap/smartteefilter.c b/dlls/qcap/smartteefilter.c index 390bfa8e20..7bb053d550 100644 --- a/dlls/qcap/smartteefilter.c +++ b/dlls/qcap/smartteefilter.c @@ -179,7 +179,8 @@ static HRESULT sink_query_accept(struct strmbase_pin *base, const AM_MEDIA_TYPE return S_OK; } -static HRESULT sink_get_media_type(struct strmbase_pin *base, int iPosition, AM_MEDIA_TYPE *amt) +static HRESULT sink_get_media_type(struct strmbase_pin *base, + unsigned int iPosition, AM_MEDIA_TYPE *amt) { SmartTeeFilter *This = impl_from_strmbase_pin(base); HRESULT hr; @@ -367,7 +368,8 @@ static HRESULT capture_query_accept(struct strmbase_pin *base, const AM_MEDIA_TY return S_OK; } -static HRESULT capture_get_media_type(struct strmbase_pin *base, int iPosition, AM_MEDIA_TYPE *amt) +static HRESULT capture_get_media_type(struct strmbase_pin *base, + unsigned int iPosition, AM_MEDIA_TYPE *amt) { SmartTeeFilter *This = impl_from_strmbase_pin(base); TRACE("(%p, %d, %p)\n", This, iPosition, amt); @@ -437,7 +439,8 @@ static HRESULT preview_query_accept(struct strmbase_pin *base, const AM_MEDIA_TY return S_OK; } -static HRESULT preview_get_media_type(struct strmbase_pin *base, int iPosition, AM_MEDIA_TYPE *amt) +static HRESULT preview_get_media_type(struct strmbase_pin *base, + unsigned int iPosition, AM_MEDIA_TYPE *amt) { SmartTeeFilter *This = impl_from_strmbase_pin(base); TRACE("(%p, %d, %p)\n", This, iPosition, amt); diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 551dad61f3..a5664b7c1c 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -518,14 +518,13 @@ static HRESULT source_query_accept(struct strmbase_pin *pin, const AM_MEDIA_TYPE return qcap_driver_check_format(filter->driver_info, mt); } -static HRESULT source_get_media_type(struct strmbase_pin *pin, int iPosition, AM_MEDIA_TYPE *pmt) +static HRESULT source_get_media_type(struct strmbase_pin *pin, + unsigned int iPosition, AM_MEDIA_TYPE *pmt) { VfwCapture *filter = impl_from_strmbase_pin(pin); AM_MEDIA_TYPE *vfw_pmt; HRESULT hr; - if (iPosition < 0) - return E_INVALIDARG; if (iPosition > 0) return VFW_S_NO_MORE_ITEMS; diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 031307e183..160b814738 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -591,13 +591,11 @@ static HRESULT source_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TY return S_FALSE; } -static HRESULT source_get_media_type(struct strmbase_pin *iface, int index, AM_MEDIA_TYPE *mt) +static HRESULT source_get_media_type(struct strmbase_pin *iface, unsigned int index, AM_MEDIA_TYPE *mt) { AsyncReader *filter = impl_from_strmbase_pin(iface); - if (index < 0) - return E_INVALIDARG; - else if (index > 1) + if (index > 1) return VFW_S_NO_MORE_ITEMS; if (index == 0) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 4a7b3b20bf..403e468550 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -152,11 +152,8 @@ static BOOL CompareMediaTypes(const AM_MEDIA_TYPE * pmt1, const AM_MEDIA_TYPE * ((bWildcards && (IsEqualGUID(&pmt1->subtype, &GUID_NULL) || IsEqualGUID(&pmt2->subtype, &GUID_NULL))) || IsEqualGUID(&pmt1->subtype, &pmt2->subtype))); } -/*** Common Base Pin function */ -HRESULT strmbase_pin_get_media_type(struct strmbase_pin *iface, int iPosition, AM_MEDIA_TYPE *pmt) +HRESULT strmbase_pin_get_media_type(struct strmbase_pin *iface, unsigned int index, AM_MEDIA_TYPE *mt) { - if (iPosition < 0) - return E_INVALIDARG; return VFW_S_NO_MORE_ITEMS; } diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index fc2f0b1d2d..fa041b66bd 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -110,12 +110,10 @@ static HRESULT WINAPI TransformFilter_Output_DecideBufferSize(struct strmbase_so return pTransformFilter->pFuncsTable->pfnDecideBufferSize(pTransformFilter, pAlloc, ppropInputRequest); } -static HRESULT source_get_media_type(struct strmbase_pin *This, int iPosition, AM_MEDIA_TYPE *pmt) +static HRESULT source_get_media_type(struct strmbase_pin *This, unsigned int iPosition, AM_MEDIA_TYPE *pmt) { TransformFilter *pTransform = impl_from_source_IPin(&This->IPin_iface); - if (iPosition < 0) - return E_INVALIDARG; if (iPosition > 0) return VFW_S_NO_MORE_ITEMS; CopyMediaType(pmt, &pTransform->pmt); diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index b9ff1fdc03..de3bc99687 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1799,15 +1799,10 @@ static HRESULT source_query_accept(struct strmbase_pin *base, const AM_MEDIA_TYP return S_OK; } -static HRESULT source_get_media_type(struct strmbase_pin *iface, int iPosition, AM_MEDIA_TYPE *pmt) +static HRESULT source_get_media_type(struct strmbase_pin *iface, unsigned int iPosition, AM_MEDIA_TYPE *pmt) { struct gstdemux_source *This = impl_source_from_IPin(&iface->IPin_iface); - TRACE("(%p)->(%i, %p)\n", This, iPosition, pmt); - - if (iPosition < 0) - return E_INVALIDARG; - if (iPosition > 0) return VFW_S_NO_MORE_ITEMS; diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 17d22b4d8d..d3b9596375 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -1295,12 +1295,10 @@ static HRESULT source_query_accept(struct strmbase_pin *base, const AM_MEDIA_TYP return S_OK; } -static HRESULT source_get_media_type(struct strmbase_pin *iface, int iPosition, AM_MEDIA_TYPE *pmt) +static HRESULT source_get_media_type(struct strmbase_pin *iface, unsigned int iPosition, AM_MEDIA_TYPE *pmt) { QTOutPin *This = impl_sink_from_strmbase_pin(iface); - if (iPosition < 0) - return E_INVALIDARG; if (iPosition > 0) return VFW_S_NO_MORE_ITEMS; CopyMediaType(pmt, This->pmt); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index fc18b22d6d..65ba180caa 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -46,7 +46,7 @@ typedef struct BasePinFuncTable { /* Required for QueryAccept(), Connect(), ReceiveConnection(). */ HRESULT (*pin_query_accept)(struct strmbase_pin *pin, const AM_MEDIA_TYPE *mt); /* Required for EnumMediaTypes(). */ - HRESULT (*pin_get_media_type)(struct strmbase_pin *pin, int index, AM_MEDIA_TYPE *mt); + HRESULT (*pin_get_media_type)(struct strmbase_pin *pin, unsigned int index, AM_MEDIA_TYPE *mt); } BasePinFuncTable; struct strmbase_source @@ -95,7 +95,7 @@ typedef struct BaseInputPinFuncTable { } BaseInputPinFuncTable; /* Base Pin */ -HRESULT strmbase_pin_get_media_type(struct strmbase_pin *pin, int index, AM_MEDIA_TYPE *mt); +HRESULT strmbase_pin_get_media_type(struct strmbase_pin *pin, unsigned int index, AM_MEDIA_TYPE *mt); LONG WINAPI BasePinImpl_GetMediaTypeVersion(struct strmbase_pin *pin); ULONG WINAPI BasePinImpl_AddRef(IPin *iface); ULONG WINAPI BasePinImpl_Release(IPin *iface);

1 0

Zebediah Figura : qcap/vfwcapture: Use more strmbase pin methods.
by Alexandre Julliard 25 Sep '19

25 Sep '19

Module: wine Branch: master Commit: b28e37247099f97d34faacf3059de6ea91fa48f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b28e37247099f97d34faacf3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 24 19:10:13 2019 -0500 qcap/vfwcapture: Use more strmbase pin methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/vfwcapture.c | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-) diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index a5664b7c1c..e5278152ed 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -586,28 +586,6 @@ static HRESULT WINAPI VfwPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * return E_NOINTERFACE; } -static HRESULT WINAPI -VfwPin_EnumMediaTypes(IPin * iface, IEnumMediaTypes ** ppEnum) -{ - VfwCapture *filter = impl_from_IPin(iface); - AM_MEDIA_TYPE *pmt; - HRESULT hr; - - hr = qcap_driver_get_format(filter->driver_info, &pmt); - if (SUCCEEDED(hr)) { - hr = BasePinImpl_EnumMediaTypes(iface, ppEnum); - DeleteMediaType(pmt); - } - return hr; -} - -static HRESULT WINAPI -VfwPin_QueryInternalConnections(IPin * iface, IPin ** apPin, ULONG * cPin) -{ - TRACE("(%p)->(%p, %p)\n", iface, apPin, cPin); - return E_NOTIMPL; -} - static const IPinVtbl VfwPin_Vtbl = { VfwPin_QueryInterface, @@ -622,8 +600,8 @@ static const IPinVtbl VfwPin_Vtbl = BasePinImpl_QueryDirection, BasePinImpl_QueryId, BasePinImpl_QueryAccept, - VfwPin_EnumMediaTypes, - VfwPin_QueryInternalConnections, + BasePinImpl_EnumMediaTypes, + BasePinImpl_QueryInternalConnections, BaseOutputPinImpl_EndOfStream, BaseOutputPinImpl_BeginFlush, BaseOutputPinImpl_EndFlush,

1 0

Zebediah Figura : qcap/smartteefilter: Use BasePinImpl_EnumMediaTypes().
by Alexandre Julliard 25 Sep '19

25 Sep '19

Module: wine Branch: master Commit: be5c7ed5910ff6843ee3f5e4faa43927ae32b771 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be5c7ed5910ff6843ee3f5e4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 24 19:10:14 2019 -0500 qcap/smartteefilter: Use BasePinImpl_EnumMediaTypes(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/smartteefilter.c | 78 ++++++++++++---------------------------------- dlls/strmbase/pin.c | 7 +++++ 2 files changed, 27 insertions(+), 58 deletions(-) diff --git a/dlls/qcap/smartteefilter.c b/dlls/qcap/smartteefilter.c index 7bb053d550..e7ff5f9b34 100644 --- a/dlls/qcap/smartteefilter.c +++ b/dlls/qcap/smartteefilter.c @@ -57,11 +57,6 @@ static inline SmartTeeFilter *impl_from_strmbase_pin(struct strmbase_pin *pin) return impl_from_strmbase_filter(pin->filter); } -static inline SmartTeeFilter *impl_from_IPin(IPin *iface) -{ - return impl_from_strmbase_filter(CONTAINING_RECORD(iface, struct strmbase_pin, IPin_iface)->filter); -} - static HRESULT WINAPI SmartTeeFilter_Stop(IBaseFilter *iface) { SmartTeeFilter *This = impl_from_IBaseFilter(iface); @@ -327,20 +322,6 @@ static const BaseInputPinFuncTable SmartTeeFilterInputFuncs = .pfnReceive = SmartTeeFilterInput_Receive, }; -static HRESULT WINAPI SmartTeeFilterCapture_EnumMediaTypes(IPin *iface, IEnumMediaTypes **ppEnum) -{ - SmartTeeFilter *This = impl_from_IPin(iface); - HRESULT hr; - TRACE("(%p)->(%p)\n", This, ppEnum); - EnterCriticalSection(&This->filter.csFilter); - if (This->sink.pin.pConnectedTo) - hr = BasePinImpl_EnumMediaTypes(iface, ppEnum); - else - hr = VFW_E_NOT_CONNECTED; - LeaveCriticalSection(&This->filter.csFilter); - return hr; -} - static const IPinVtbl SmartTeeFilterCaptureVtbl = { BaseOutputPinImpl_QueryInterface, BasePinImpl_AddRef, @@ -354,7 +335,7 @@ static const IPinVtbl SmartTeeFilterCaptureVtbl = { BasePinImpl_QueryDirection, BasePinImpl_QueryId, BasePinImpl_QueryAccept, - SmartTeeFilterCapture_EnumMediaTypes, + BasePinImpl_EnumMediaTypes, BasePinImpl_QueryInternalConnections, BaseOutputPinImpl_EndOfStream, BaseOutputPinImpl_BeginFlush, @@ -368,16 +349,23 @@ static HRESULT capture_query_accept(struct strmbase_pin *base, const AM_MEDIA_TY return S_OK; } -static HRESULT capture_get_media_type(struct strmbase_pin *base, - unsigned int iPosition, AM_MEDIA_TYPE *amt) +static HRESULT source_get_media_type(struct strmbase_pin *iface, + unsigned int index, AM_MEDIA_TYPE *mt) { - SmartTeeFilter *This = impl_from_strmbase_pin(base); - TRACE("(%p, %d, %p)\n", This, iPosition, amt); - if (iPosition == 0) { - CopyMediaType(amt, &This->sink.pin.mtCurrent); - return S_OK; - } else - return S_FALSE; + SmartTeeFilter *filter = impl_from_strmbase_pin(iface); + HRESULT hr = S_OK; + + EnterCriticalSection(&filter->filter.csFilter); + + if (!filter->sink.pin.pConnectedTo) + hr = VFW_E_NOT_CONNECTED; + else if (!index) + CopyMediaType(mt, &filter->sink.pin.mtCurrent); + else + hr = VFW_S_NO_MORE_ITEMS; + + LeaveCriticalSection(&filter->filter.csFilter); + return hr; } static HRESULT WINAPI SmartTeeFilterCapture_DecideAllocator(struct strmbase_source *base, @@ -393,25 +381,11 @@ static HRESULT WINAPI SmartTeeFilterCapture_DecideAllocator(struct strmbase_sour static const struct strmbase_source_ops capture_ops = { .base.pin_query_accept = capture_query_accept, - .base.pin_get_media_type = capture_get_media_type, + .base.pin_get_media_type = source_get_media_type, .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, .pfnDecideAllocator = SmartTeeFilterCapture_DecideAllocator, }; -static HRESULT WINAPI SmartTeeFilterPreview_EnumMediaTypes(IPin *iface, IEnumMediaTypes **ppEnum) -{ - SmartTeeFilter *This = impl_from_IPin(iface); - HRESULT hr; - TRACE("(%p)->(%p)\n", This, ppEnum); - EnterCriticalSection(&This->filter.csFilter); - if (This->sink.pin.pConnectedTo) - hr = BasePinImpl_EnumMediaTypes(iface, ppEnum); - else - hr = VFW_E_NOT_CONNECTED; - LeaveCriticalSection(&This->filter.csFilter); - return hr; -} - static const IPinVtbl SmartTeeFilterPreviewVtbl = { BaseOutputPinImpl_QueryInterface, BasePinImpl_AddRef, @@ -425,7 +399,7 @@ static const IPinVtbl SmartTeeFilterPreviewVtbl = { BasePinImpl_QueryDirection, BasePinImpl_QueryId, BasePinImpl_QueryAccept, - SmartTeeFilterPreview_EnumMediaTypes, + BasePinImpl_EnumMediaTypes, BasePinImpl_QueryInternalConnections, BaseOutputPinImpl_EndOfStream, BaseOutputPinImpl_BeginFlush, @@ -439,18 +413,6 @@ static HRESULT preview_query_accept(struct strmbase_pin *base, const AM_MEDIA_TY return S_OK; } -static HRESULT preview_get_media_type(struct strmbase_pin *base, - unsigned int iPosition, AM_MEDIA_TYPE *amt) -{ - SmartTeeFilter *This = impl_from_strmbase_pin(base); - TRACE("(%p, %d, %p)\n", This, iPosition, amt); - if (iPosition == 0) { - CopyMediaType(amt, &This->sink.pin.mtCurrent); - return S_OK; - } else - return S_FALSE; -} - static HRESULT WINAPI SmartTeeFilterPreview_DecideAllocator(struct strmbase_source *base, IMemInputPin *pPin, IMemAllocator **pAlloc) { @@ -464,7 +426,7 @@ static HRESULT WINAPI SmartTeeFilterPreview_DecideAllocator(struct strmbase_sour static const struct strmbase_source_ops preview_ops = { .base.pin_query_accept = preview_query_accept, - .base.pin_get_media_type = preview_get_media_type, + .base.pin_get_media_type = source_get_media_type, .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, .pfnDecideAllocator = SmartTeeFilterPreview_DecideAllocator, }; diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 403e468550..2cc6ef5259 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -295,9 +295,16 @@ HRESULT WINAPI BasePinImpl_QueryAccept(IPin * iface, const AM_MEDIA_TYPE * pmt) HRESULT WINAPI BasePinImpl_EnumMediaTypes(IPin *iface, IEnumMediaTypes **enum_media_types) { struct strmbase_pin *pin = impl_from_IPin(iface); + AM_MEDIA_TYPE mt; + HRESULT hr; TRACE("iface %p, enum_media_types %p.\n", iface, enum_media_types); + if (FAILED(hr = pin->pFuncsTable->pin_get_media_type(pin, 0, &mt))) + return hr; + if (hr == S_OK) + FreeMediaType(&mt); + return enum_media_types_create(pin, enum_media_types); }

1 0

Zhiyi Zhang : winemac.drv: Trace display device counts.
by Alexandre Julliard 25 Sep '19

25 Sep '19

Module: wine Branch: master Commit: 20336127a480037dfaf469ffc2727511c55fab11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20336127a480037dfaf469ff… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Sep 25 07:16:11 2019 -0500 winemac.drv: Trace display device counts. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/display.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index cb9f1ebcab..cc5e9beaff 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -1658,6 +1658,7 @@ void macdrv_init_display_devices(BOOL force) /* Initialize GPUs */ if (macdrv_get_gpus(&gpus, &gpu_count)) goto done; + TRACE("GPU count: %d\n", gpu_count); for (gpu = 0; gpu < gpu_count; gpu++) { @@ -1667,11 +1668,13 @@ void macdrv_init_display_devices(BOOL force) /* Initialize adapters */ if (macdrv_get_adapters(gpus[gpu].id, &adapters, &adapter_count)) goto done; + TRACE("GPU: %#llx %s, adapter count: %d\n", gpus[gpu].id, gpus[gpu].name, adapter_count); for (adapter = 0; adapter < adapter_count; adapter++) { if (macdrv_get_monitors(adapters[adapter].id, &monitors, &monitor_count)) goto done; + TRACE("adapter: %#x, monitor count: %d\n", adapters[adapter].id, monitor_count); if (!macdrv_init_adapter(video_hkey, video_index, gpu, adapter, monitor_count, &gpus[gpu], guidW, driverW, &adapters[adapter])) @@ -1680,6 +1683,7 @@ void macdrv_init_display_devices(BOOL force) /* Initialize monitors */ for (monitor = 0; monitor < monitor_count; monitor++) { + TRACE("monitor: %#x %s\n", monitor, monitors[monitor].name); if (!macdrv_init_monitor(monitor_devinfo, &monitors[monitor], monitor, video_index)) goto done; }

1 0

Zhiyi Zhang : winex11.drv: Trace display device counts.
by Alexandre Julliard 25 Sep '19

25 Sep '19

Module: wine Branch: master Commit: 10b2a996babece63e493999d1ddcfbeeaef40257 URL: https://source.winehq.org/git/wine.git/?a=commit;h=10b2a996babece63e493999d… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Sep 25 15:28:03 2019 +0800 winex11.drv: Trace display device counts. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/display.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index f96fd93a54..107719a26f 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -472,6 +472,7 @@ void X11DRV_DisplayDevices_Init(BOOL force) /* Initialize GPUs */ if (!handler.pGetGpus(&gpus, &gpu_count)) goto done; + TRACE("GPU count: %d\n", gpu_count); for (gpu = 0; gpu < gpu_count; gpu++) { @@ -481,11 +482,13 @@ void X11DRV_DisplayDevices_Init(BOOL force) /* Initialize adapters */ if (!handler.pGetAdapters(gpus[gpu].id, &adapters, &adapter_count)) goto done; + TRACE("GPU: %#lx %s, adapter count: %d\n", gpus[gpu].id, wine_dbgstr_w(gpus[gpu].name), adapter_count); for (adapter = 0; adapter < adapter_count; adapter++) { if (!handler.pGetMonitors(adapters[adapter].id, &monitors, &monitor_count)) goto done; + TRACE("adapter: %#lx, monitor count: %d\n", adapters[adapter].id, monitor_count); if (!X11DRV_InitAdapter(video_hkey, video_index, gpu, adapter, monitor_count, &gpus[gpu], guidW, driverW, &adapters[adapter])) @@ -494,6 +497,7 @@ void X11DRV_DisplayDevices_Init(BOOL force) /* Initialize monitors */ for (monitor = 0; monitor < monitor_count; monitor++) { + TRACE("monitor: %#x %s\n", monitor, wine_dbgstr_w(monitors[monitor].name)); if (!X11DRV_InitMonitor(monitor_devinfo, &monitors[monitor], monitor, video_index)) goto done; }

1 0

Zhiyi Zhang : winex11.drv: Handle XRandR not reporting any providers.
by Alexandre Julliard 25 Sep '19

25 Sep '19

Module: wine Branch: master Commit: ffd4caa5f0e401cf973078fbbd54e4950d408792 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ffd4caa5f0e401cf973078fb… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Sep 25 15:28:15 2019 +0800 winex11.drv: Handle XRandR not reporting any providers. Some XRandR implementations, e.g., the QXL driver used on Debian 10 TestBots, don't report any providers. In this case, we can still search in XRandR screen resources to get adapters. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xrandr.c | 45 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 37 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 2a1c7ce594..6bb2b18ce7 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -662,6 +662,7 @@ static BOOL is_crtc_primary( RECT primary, const XRRCrtcInfo *crtc ) static BOOL xrandr14_get_gpus( struct x11drv_gpu **new_gpus, int *count ) { + static const WCHAR wine_adapterW[] = {'W','i','n','e',' ','A','d','a','p','t','e','r',0}; struct x11drv_gpu *gpus = NULL; XRRScreenResources *screen_resources = NULL; XRRProviderResources *provider_resources = NULL; @@ -680,10 +681,22 @@ static BOOL xrandr14_get_gpus( struct x11drv_gpu **new_gpus, int *count ) if (!provider_resources) goto done; - gpus = heap_calloc( provider_resources->nproviders, sizeof(*gpus) ); + gpus = heap_calloc( provider_resources->nproviders ? provider_resources->nproviders : 1, sizeof(*gpus) ); if (!gpus) goto done; + /* Some XRandR implementations don't support providers. + * In this case, report a fake one to try searching adapters in screen resources */ + if (!provider_resources->nproviders) + { + WARN("XRandR implementation doesn't report any providers, faking one.\n"); + lstrcpyW( gpus[0].name, wine_adapterW ); + *new_gpus = gpus; + *count = 1; + ret = TRUE; + goto done; + } + primary_rect = get_primary_rect( screen_resources ); for (i = 0; i < provider_resources->nproviders; ++i) { @@ -751,6 +764,8 @@ static BOOL xrandr14_get_adapters( ULONG_PTR gpu_id, struct x11drv_adapter **new XRRProviderInfo *provider_info = NULL; XRRCrtcInfo *enum_crtc_info, *crtc_info = NULL; XRROutputInfo *output_info = NULL; + RROutput *outputs; + INT crtc_count, output_count; INT primary_adapter = 0; INT adapter_count = 0; BOOL mirrored, detached; @@ -762,19 +777,33 @@ static BOOL xrandr14_get_adapters( ULONG_PTR gpu_id, struct x11drv_adapter **new if (!screen_resources) goto done; - provider_info = pXRRGetProviderInfo( gdi_display, screen_resources, gpu_id ); - if (!provider_info) - goto done; + if (gpu_id) + { + provider_info = pXRRGetProviderInfo( gdi_display, screen_resources, gpu_id ); + if (!provider_info) + goto done; + + crtc_count = provider_info->ncrtcs; + output_count = provider_info->noutputs; + outputs = provider_info->outputs; + } + /* Fake provider id, search adapters in screen resources */ + else + { + crtc_count = screen_resources->ncrtc; + output_count = screen_resources->noutput; + outputs = screen_resources->outputs; + } /* Actual adapter count could be less */ - adapters = heap_calloc( provider_info->ncrtcs, sizeof(*adapters) ); + adapters = heap_calloc( crtc_count, sizeof(*adapters) ); if (!adapters) goto done; primary_rect = get_primary_rect( screen_resources ); - for (i = 0; i < provider_info->noutputs; ++i) + for (i = 0; i < output_count; ++i) { - output_info = pXRRGetOutputInfo( gdi_display, screen_resources, provider_info->outputs[i] ); + output_info = pXRRGetOutputInfo( gdi_display, screen_resources, outputs[i] ); if (!output_info) goto done; @@ -830,7 +859,7 @@ static BOOL xrandr14_get_adapters( ULONG_PTR gpu_id, struct x11drv_adapter **new { /* Use RROutput as adapter id. The reason of not using RRCrtc is that we need to detect inactive but * attached monitors */ - adapters[adapter_count].id = provider_info->outputs[i]; + adapters[adapter_count].id = outputs[i]; if (!detached) adapters[adapter_count].state_flags |= DISPLAY_DEVICE_ATTACHED_TO_DESKTOP; if (is_crtc_primary( primary_rect, crtc_info ))

1 0