wine-commits May 2022

2 participants
907 discussions

Stefan Dösinger : wined3d: Prepare sysmem LOCATION_CLEARED handling for non-zero colors.

by Alexandre Julliard

Module: wine Branch: master Commit: 32b4aa7b2970e64a19262fafda88d7549a4fba53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32b4aa7b2970e64a19262faf… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Apr 27 18:25:20 2022 +0300 wined3d: Prepare sysmem LOCATION_CLEARED handling for non-zero colors. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- dlls/wined3d/texture.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 99cb7101aed..6b80fed0c1b 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -815,7 +815,6 @@ BOOL wined3d_texture_load_location(struct wined3d_texture *texture, { struct wined3d_bo_address source, destination; struct wined3d_range range; - void *map_ptr; if (!wined3d_texture_prepare_location(texture, sub_resource_idx, context, location)) return FALSE; @@ -824,12 +823,21 @@ BOOL wined3d_texture_load_location(struct wined3d_texture *texture, range.size = texture->sub_resources[sub_resource_idx].size; if (current & WINED3D_LOCATION_CLEARED) { + static const struct wined3d_color black; + unsigned int level_idx = sub_resource_idx % texture->level_count; + struct wined3d_map_desc map; + struct wined3d_box box; + + wined3d_texture_get_pitch(texture, level_idx, &map.row_pitch, &map.slice_pitch); if (destination.buffer_object) - map_ptr = wined3d_context_map_bo_address(context, &destination, range.size, + map.data = wined3d_context_map_bo_address(context, &destination, range.size, WINED3D_MAP_WRITE | WINED3D_MAP_DISCARD); else - map_ptr = destination.addr; - memset(map_ptr, 0, range.size); + map.data = destination.addr; + + wined3d_texture_get_level_box(texture, level_idx, &box); + wined3d_resource_memory_colour_fill(&texture->resource, &map, &black, &box, true); + if (destination.buffer_object) wined3d_context_unmap_bo_address(context, &destination, 1, &range); }

1 year, 11 months

Stefan Dösinger : wined3d: Add a memory_colour_fill path for clearing the entire level to zero.

by Alexandre Julliard

Module: wine Branch: master Commit: e1386f7b48f3486b43f254b8b636b2455fb22f08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1386f7b48f3486b43f254b8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 29 15:35:24 2022 +0300 wined3d: Add a memory_colour_fill path for clearing the entire level to zero. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- dlls/wined3d/resource.c | 11 ++++++++++- dlls/wined3d/surface.c | 6 +++++- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index aeece1ab512..857750d6bd7 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -618,13 +618,22 @@ void *resource_offset_map_pointer(struct wined3d_resource *resource, unsigned in void wined3d_resource_memory_colour_fill(struct wined3d_resource *resource, const struct wined3d_map_desc *map, const struct wined3d_color *colour, - const struct wined3d_box *box) + const struct wined3d_box *box, bool full_subresource) { const struct wined3d_format *format = resource->format; unsigned int w, h, d, x, y, z, bpp; uint8_t *dst, *dst2; uint32_t c[4]; + /* Fast and simple path for setting everything to zero. The C library's memset is + * more sophisticated than our code below. Also this works for block formats, which + * we still need to zero-initialize for newly created resources. */ + if (full_subresource && !colour->r && !colour->g && !colour->b && !colour->a) + { + memset(map->data, 0, map->slice_pitch * box->back); + return; + } + w = box->right - box->left; h = box->bottom - box->top; d = box->back - box->front; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 20a06b32d03..7d62af5b31f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1181,8 +1181,10 @@ static void surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *view, struct wined3d_context *context; struct wined3d_texture *texture; struct wined3d_bo_address data; + struct wined3d_box level_box; struct wined3d_map_desc map; struct wined3d_range range; + bool full_subresource; unsigned int level; DWORD map_binding; @@ -1208,6 +1210,8 @@ static void surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *view, texture = texture_from_resource(view->resource); level = view->sub_resource_idx % texture->level_count; + wined3d_texture_get_level_box(texture_from_resource(view->resource), level, &level_box); + full_subresource = !memcmp(box, &level_box, sizeof(*box)); map_binding = texture->resource.map_binding; if (!wined3d_texture_load_location(texture, view->sub_resource_idx, context, map_binding)) @@ -1220,7 +1224,7 @@ static void surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *view, range.offset = 0; range.size = texture->sub_resources[view->sub_resource_idx].size; - wined3d_resource_memory_colour_fill(view->resource, &map, colour, box); + wined3d_resource_memory_colour_fill(view->resource, &map, colour, box, full_subresource); wined3d_context_unmap_bo_address(context, &data, 1, &range); context_release(context); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ce4d7384066..dfb2d76c08a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4429,7 +4429,7 @@ BOOL wined3d_resource_prepare_sysmem(struct wined3d_resource *resource) DECLSPEC void wined3d_resource_update_draw_binding(struct wined3d_resource *resource) DECLSPEC_HIDDEN; void wined3d_resource_memory_colour_fill(struct wined3d_resource *resource, const struct wined3d_map_desc *map, const struct wined3d_color *colour, - const struct wined3d_box *box) DECLSPEC_HIDDEN; + const struct wined3d_box *box, bool full_subresource) DECLSPEC_HIDDEN; /* Tests show that the start address of resources is 32 byte aligned */ #define RESOURCE_ALIGNMENT 16

1 year, 11 months

Nikolay Sivov : d2d1: Validate bitmap options against surface description in CreateBitmapFromDxgiSurface().

by Alexandre Julliard

Module: wine Branch: master Commit: ab70e9c4f4f43e4af5728286aa72ae88f539f57e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab70e9c4f4f43e4af5728286… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 30 12:52:17 2022 +0300 d2d1: Validate bitmap options against surface description in CreateBitmapFromDxgiSurface(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/device.c | 56 +++++++++++++++++++++++++++++++++++++++++-- dlls/d2d1/tests/d2d1.c | 65 ++++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 109 insertions(+), 12 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index b7faf33e266..12aa2acc331 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1856,17 +1856,69 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateColorContextFromWicCol return E_NOTIMPL; } +static BOOL d2d_bitmap_check_options_with_surface(unsigned int options, unsigned int surface_options) +{ + switch (options) + { + case D2D1_BITMAP_OPTIONS_NONE: + case D2D1_BITMAP_OPTIONS_TARGET: + case D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW: + case D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW | D2D1_BITMAP_OPTIONS_GDI_COMPATIBLE: + case D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_GDI_COMPATIBLE: + case D2D1_BITMAP_OPTIONS_CANNOT_DRAW | D2D1_BITMAP_OPTIONS_CPU_READ: + case D2D1_BITMAP_OPTIONS_CANNOT_DRAW: + break; + default: + WARN("Invalid bitmap options %#x.\n", options); + return FALSE; + } + + if (options && (options & D2D1_BITMAP_OPTIONS_TARGET) != (surface_options & D2D1_BITMAP_OPTIONS_TARGET)) + return FALSE; + if (options & D2D1_BITMAP_OPTIONS_TARGET) + { + if (!(options & D2D1_BITMAP_OPTIONS_CANNOT_DRAW) && (surface_options & D2D1_BITMAP_OPTIONS_CANNOT_DRAW)) + return FALSE; + if (options & D2D1_BITMAP_OPTIONS_GDI_COMPATIBLE && !(surface_options & D2D1_BITMAP_OPTIONS_GDI_COMPATIBLE)) + return FALSE; + return TRUE; + } + + if (options & D2D1_BITMAP_OPTIONS_CANNOT_DRAW) + { + if (!(surface_options & D2D1_BITMAP_OPTIONS_CANNOT_DRAW)) + return FALSE; + + if (options & D2D1_BITMAP_OPTIONS_CPU_READ && !(surface_options & D2D1_BITMAP_OPTIONS_CPU_READ)) + return FALSE; + } + + return TRUE; +} + static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateBitmapFromDxgiSurface(ID2D1DeviceContext *iface, IDXGISurface *surface, const D2D1_BITMAP_PROPERTIES1 *desc, ID2D1Bitmap1 **bitmap) { struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); D2D1_BITMAP_PROPERTIES1 bitmap_desc; + unsigned int surface_options; struct d2d_bitmap *object; HRESULT hr; TRACE("iface %p, surface %p, desc %p, bitmap %p.\n", iface, surface, desc, bitmap); - if (!desc) + surface_options = d2d_get_bitmap_options_for_surface(surface); + + if (desc) + { + if (!d2d_bitmap_check_options_with_surface(desc->bitmapOptions, surface_options)) + { + WARN("Incompatible bitmap options %#x, surface options %#x.\n", + desc->bitmapOptions, surface_options); + return E_INVALIDARG; + } + } + else { DXGI_SURFACE_DESC surface_desc; @@ -1879,7 +1931,7 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateBitmapFromDxgiSurface( memset(&bitmap_desc, 0, sizeof(bitmap_desc)); bitmap_desc.pixelFormat.format = surface_desc.Format; bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_PREMULTIPLIED; - bitmap_desc.bitmapOptions = d2d_get_bitmap_options_for_surface(surface); + bitmap_desc.bitmapOptions = surface_options; desc = &bitmap_desc; } diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 5185c07c29b..c73039504d3 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -1213,6 +1213,24 @@ static BOOL init_test_context_(unsigned int line, struct d2d1_test_context *ctx, return TRUE; } +#define check_bitmap_options(b, o) check_bitmap_options_(__LINE__, b, o) +static void check_bitmap_options_(unsigned int line, ID2D1Bitmap *bitmap, DWORD expected_options) +{ + D2D1_BITMAP_OPTIONS options; + ID2D1Bitmap1 *bitmap1; + HRESULT hr; + + hr = ID2D1Bitmap_QueryInterface(bitmap, &IID_ID2D1Bitmap1, (void **)&bitmap1); + if (FAILED(hr)) + return; + + options = ID2D1Bitmap1_GetOptions(bitmap1); + ok_(__FILE__, line)(options == expected_options, "Got unexpected bitmap options %#x, expected %#lx.\n", + options, expected_options); + + ID2D1Bitmap1_Release(bitmap1); +} + #define check_bitmap_surface(b, s, o) check_bitmap_surface_(__LINE__, b, s, o) static void check_bitmap_surface_(unsigned int line, ID2D1Bitmap *bitmap, BOOL has_surface, DWORD expected_options) { @@ -11605,6 +11623,7 @@ static void test_bitmap_map(BOOL d3d11) }; D2D1_BITMAP_PROPERTIES1 bitmap_desc; D3D11_TEXTURE2D_DESC texture_desc; + ID2D1Bitmap *bitmap2, *bitmap3; struct d2d1_test_context ctx; D2D1_MAPPED_RECT mapped_rect; ID3D11Device *d3d_device; @@ -11612,7 +11631,6 @@ static void test_bitmap_map(BOOL d3d11) unsigned int i, options; IDXGISurface *surface; ID2D1Bitmap1 *bitmap; - ID2D1Bitmap *bitmap2; D2D1_SIZE_U size; HRESULT hr; @@ -11768,14 +11786,13 @@ static void test_bitmap_map(BOOL d3d11) hr = ID2D1DeviceContext_CreateSharedBitmap(ctx.context, &IID_IDXGISurface, surface, (const D2D1_BITMAP_PROPERTIES *)&bitmap_desc, &bitmap2); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + check_bitmap_options(bitmap2, D2D1_BITMAP_OPTIONS_CANNOT_DRAW | D2D1_BITMAP_OPTIONS_CPU_READ); - hr = ID2D1Bitmap_QueryInterface(bitmap2, &IID_ID2D1Bitmap1, (void **)&bitmap); + hr = ID2D1DeviceContext_CreateSharedBitmap(ctx.context, &IID_ID2D1Bitmap, bitmap2, NULL, &bitmap3); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - options = ID2D1Bitmap1_GetOptions(bitmap); - ok(options == (D2D1_BITMAP_OPTIONS_CANNOT_DRAW | D2D1_BITMAP_OPTIONS_CPU_READ), - "Unexpected options %#x.\n", options); + check_bitmap_options(bitmap3, D2D1_BITMAP_OPTIONS_CANNOT_DRAW | D2D1_BITMAP_OPTIONS_CPU_READ); + ID2D1Bitmap_Release(bitmap3); - ID2D1Bitmap1_Release(bitmap); ID2D1Bitmap_Release(bitmap2); hr = ID2D1DeviceContext_CreateBitmapFromDxgiSurface(ctx.context, surface, NULL, &bitmap); @@ -11788,9 +11805,7 @@ static void test_bitmap_map(BOOL d3d11) /* Options incompatible with the surface. */ bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_TARGET; hr = ID2D1DeviceContext_CreateBitmapFromDxgiSurface(ctx.context, surface, &bitmap_desc, &bitmap); - todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); - if (SUCCEEDED(hr)) ID2D1Bitmap1_Release(bitmap); bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_NONE; hr = ID2D1DeviceContext_CreateBitmapFromDxgiSurface(ctx.context, surface, &bitmap_desc, &bitmap); todo_wine @@ -11798,9 +11813,7 @@ static void test_bitmap_map(BOOL d3d11) if (SUCCEEDED(hr)) ID2D1Bitmap1_Release(bitmap); bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW; hr = ID2D1DeviceContext_CreateBitmapFromDxgiSurface(ctx.context, surface, &bitmap_desc, &bitmap); - todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); - if (SUCCEEDED(hr)) ID2D1Bitmap1_Release(bitmap); /* Create without D2D1_BITMAP_OPTIONS_CPU_READ, surface supports CPU reads. */ bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_CANNOT_DRAW; @@ -11813,6 +11826,38 @@ static void test_bitmap_map(BOOL d3d11) ID3D11Texture2D_Release(texture); IDXGISurface_Release(surface); + /* Surface D2D1_BITMAP_OPTIONS_TARGET */ + texture_desc.Width = 4; + texture_desc.Height = 4; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_B8G8R8A8_UNORM; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D11_USAGE_DEFAULT; + texture_desc.BindFlags = D3D11_BIND_RENDER_TARGET | D3D11_BIND_SHADER_RESOURCE; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + hr = ID3D11Device_CreateTexture2D(d3d_device, &texture_desc, NULL, &texture); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID3D11Texture2D_QueryInterface(texture, &IID_IDXGISurface, (void **)&surface); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_CANNOT_DRAW | D2D1_BITMAP_OPTIONS_TARGET; + hr = ID2D1DeviceContext_CreateBitmapFromDxgiSurface(ctx.context, surface, &bitmap_desc, &bitmap); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ID2D1Bitmap1_Release(bitmap); + + bitmap_desc.bitmapOptions = 0; + hr = ID2D1DeviceContext_CreateBitmapFromDxgiSurface(ctx.context, surface, &bitmap_desc, &bitmap); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + check_bitmap_options((ID2D1Bitmap *)bitmap, 0); + ID2D1Bitmap1_Release(bitmap); + + ID3D11Texture2D_Release(texture); + IDXGISurface_Release(surface); + ID3D11Device_Release(d3d_device); release_test_context(&ctx);

1 year, 11 months

Nikolay Sivov : d2d1: Derive bitmap options from surface description in CreateSharedBitmap().

by Alexandre Julliard

Module: wine Branch: master Commit: a3273a585aef1b2a8d56f865c0daecabced8f482 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3273a585aef1b2a8d56f865… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 30 10:18:20 2022 +0300 d2d1: Derive bitmap options from surface description in CreateSharedBitmap(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/bitmap.c | 1 + dlls/d2d1/device.c | 5 ++++- dlls/d2d1/tests/d2d1.c | 1 - 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index 097d984e3ae..cebabbe4a61 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -616,6 +616,7 @@ HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid, { memset(&d, 0, sizeof(d)); d.pixelFormat.format = surface_desc.Format; + d.bitmapOptions = d2d_get_bitmap_options_for_surface(surface); } else { diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 64b573da974..b7faf33e266 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -405,7 +405,10 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateSharedBitmap(ID2D1Devi if (desc) { memcpy(&bitmap_desc, desc, sizeof(*desc)); - bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW; + if (IsEqualIID(iid, &IID_IDXGISurface) || IsEqualIID(iid, &IID_IDXGISurface1)) + bitmap_desc.bitmapOptions = d2d_get_bitmap_options_for_surface(data); + else + bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW; bitmap_desc.colorContext = NULL; } diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 515c14e5adb..5185c07c29b 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -11772,7 +11772,6 @@ static void test_bitmap_map(BOOL d3d11) hr = ID2D1Bitmap_QueryInterface(bitmap2, &IID_ID2D1Bitmap1, (void **)&bitmap); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); options = ID2D1Bitmap1_GetOptions(bitmap); - todo_wine ok(options == (D2D1_BITMAP_OPTIONS_CANNOT_DRAW | D2D1_BITMAP_OPTIONS_CPU_READ), "Unexpected options %#x.\n", options);

1 year, 11 months

Nikolay Sivov : d2d1: Derive bitmap options from surface description in CreateBitmapFromDxgiSurface().

by Alexandre Julliard

Module: wine Branch: master Commit: 08be8fd5ab372042e2b6be9a57216570f6746804 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08be8fd5ab372042e2b6be9a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 30 10:13:14 2022 +0300 d2d1: Derive bitmap options from surface description in CreateBitmapFromDxgiSurface(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/bitmap.c | 24 ++++++++++++++++++++++++ dlls/d2d1/d2d1_private.h | 1 + dlls/d2d1/device.c | 2 +- dlls/d2d1/tests/d2d1.c | 1 - 4 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index 1c6383ae4a9..097d984e3ae 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -495,6 +495,30 @@ HRESULT d2d_bitmap_create(struct d2d_device_context *context, D2D1_SIZE_U size, return *bitmap ? S_OK : E_OUTOFMEMORY; } +unsigned int d2d_get_bitmap_options_for_surface(IDXGISurface *surface) +{ + D3D11_TEXTURE2D_DESC desc; + unsigned int options = 0; + ID3D11Texture2D *texture; + + if (FAILED(IDXGISurface_QueryInterface(surface, &IID_ID3D11Texture2D, (void **)&texture))) + return 0; + + ID3D11Texture2D_GetDesc(texture, &desc); + ID3D11Texture2D_Release(texture); + + if (desc.BindFlags & D3D11_BIND_RENDER_TARGET) + options |= D2D1_BITMAP_OPTIONS_TARGET; + if (!(desc.BindFlags & D3D11_BIND_SHADER_RESOURCE)) + options |= D2D1_BITMAP_OPTIONS_CANNOT_DRAW; + if (desc.MiscFlags & D3D11_RESOURCE_MISC_GDI_COMPATIBLE) + options |= D2D1_BITMAP_OPTIONS_GDI_COMPATIBLE; + if (desc.Usage == D3D11_USAGE_STAGING && desc.CPUAccessFlags & D3D11_CPU_ACCESS_READ) + options |= D2D1_BITMAP_OPTIONS_CPU_READ; + + return options; +} + HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid, void *data, const D2D1_BITMAP_PROPERTIES1 *desc, struct d2d_bitmap **bitmap) { diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 48649f6a916..efc9247a822 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -409,6 +409,7 @@ HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid, const D2D1_BITMAP_PROPERTIES1 *desc, struct d2d_bitmap **bitmap) DECLSPEC_HIDDEN; HRESULT d2d_bitmap_create_from_wic_bitmap(struct d2d_device_context *context, IWICBitmapSource *bitmap_source, const D2D1_BITMAP_PROPERTIES1 *desc, struct d2d_bitmap **bitmap) DECLSPEC_HIDDEN; +unsigned int d2d_get_bitmap_options_for_surface(IDXGISurface *surface) DECLSPEC_HIDDEN; struct d2d_bitmap *unsafe_impl_from_ID2D1Bitmap(ID2D1Bitmap *iface) DECLSPEC_HIDDEN; struct d2d_state_block diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index eb0c1935ebb..64b573da974 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1876,7 +1876,7 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateBitmapFromDxgiSurface( memset(&bitmap_desc, 0, sizeof(bitmap_desc)); bitmap_desc.pixelFormat.format = surface_desc.Format; bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_PREMULTIPLIED; - bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW; + bitmap_desc.bitmapOptions = d2d_get_bitmap_options_for_surface(surface); desc = &bitmap_desc; } diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 9706b02528b..515c14e5adb 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -11782,7 +11782,6 @@ static void test_bitmap_map(BOOL d3d11) hr = ID2D1DeviceContext_CreateBitmapFromDxgiSurface(ctx.context, surface, NULL, &bitmap); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); options = ID2D1Bitmap1_GetOptions(bitmap); - todo_wine ok(options == (D2D1_BITMAP_OPTIONS_CANNOT_DRAW | D2D1_BITMAP_OPTIONS_CPU_READ), "Unexpected options %#x.\n", options); ID2D1Bitmap1_Release(bitmap);

1 year, 11 months

Nikolay Sivov : d2d1: Use bitmap options to check if mapping is supported.

by Alexandre Julliard

Module: wine Branch: master Commit: 828a7aa07171dc8d6ffa40bbb443e8d6806e45e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=828a7aa07171dc8d6ffa40bb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 30 09:07:58 2022 +0300 d2d1: Use bitmap options to check if mapping is supported. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/bitmap.c | 3 +++ dlls/d2d1/tests/d2d1.c | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index 6a02279b91b..1c6383ae4a9 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -257,6 +257,9 @@ static HRESULT STDMETHODCALLTYPE d2d_bitmap_Map(ID2D1Bitmap1 *iface, D2D1_MAP_OP TRACE("iface %p, options %#x, mapped_rect %p.\n", iface, options, mapped_rect); + if (!(bitmap->options & D2D1_BITMAP_OPTIONS_CPU_READ)) + return E_INVALIDARG; + if (bitmap->mapped_resource.pData) return D2DERR_WRONG_STATE; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 807a7be5ae6..9706b02528b 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -11804,6 +11804,14 @@ static void test_bitmap_map(BOOL d3d11) ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); if (SUCCEEDED(hr)) ID2D1Bitmap1_Release(bitmap); + /* Create without D2D1_BITMAP_OPTIONS_CPU_READ, surface supports CPU reads. */ + bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_CANNOT_DRAW; + hr = ID2D1DeviceContext_CreateBitmapFromDxgiSurface(ctx.context, surface, &bitmap_desc, &bitmap); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_READ, &mapped_rect); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + ID2D1Bitmap1_Release(bitmap); + ID3D11Texture2D_Release(texture); IDXGISurface_Release(surface);

1 year, 11 months

Alex Henrie : ntoskrnl: Add KeLowerIrql stub.

by Alexandre Julliard

Module: wine Branch: master Commit: f185a3acb9d8719498c088ae8a7f4c8a95e0b184 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f185a3acb9d8719498c088ae… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon May 30 17:13:59 2022 -0600 ntoskrnl: Add KeLowerIrql stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53076 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/hal/hal.spec | 2 +- dlls/ntoskrnl.exe/ntoskrnl.c | 5 +++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/hal/hal.spec b/dlls/hal/hal.spec index d44ffb96fa9..d8db011914f 100644 --- a/dlls/hal/hal.spec +++ b/dlls/hal/hal.spec @@ -71,7 +71,7 @@ @ stdcall -arch=i386 KeAcquireSpinLock(ptr ptr) @ stub KeFlushWriteBuffer @ stdcall -arch=arm,arm64,i386 KeGetCurrentIrql() -@ stub KeLowerIrql +@ stdcall -arch=x86_64 KeLowerIrql(long) ntoskrnl.exe.KeLowerIrql @ stdcall -ret64 KeQueryPerformanceCounter(ptr) @ stub KeRaiseIrql @ stub KeRaiseIrqlToDpcLevel diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 556b683e8f4..f3495796e23 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -4462,6 +4462,11 @@ void WINAPI KfRaiseIrql(KIRQL new, KIRQL *old) FIXME("new %u old %p: stub.\n", new, old); } +void WINAPI KeLowerIrql(KIRQL new) +{ + FIXME("new %u: stub.\n", new); +} + #endif /***************************************************** diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 84f4a3feec3..8ae4bc1f5a9 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -589,6 +589,7 @@ @ stub KeIsExecutingDpc @ stdcall KeLeaveCriticalRegion() @ stub KeLoaderBlock +@ stdcall -arch=x86_64 KeLowerIrql(long) @ stub KeNumberProcessors @ stub KeProfileInterrupt @ stub KeProfileInterruptWithSource

1 year, 11 months

Alex Henrie : ntoskrnl: Add KfRaiseIrql stub.

by Alexandre Julliard

Module: wine Branch: master Commit: ddca4eb838f1564734dd9c1d2e42fc67e8e20c90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ddca4eb838f1564734dd9c1d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon May 30 17:13:59 2022 -0600 ntoskrnl: Add KfRaiseIrql stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53076 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + 2 files changed, 10 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 0994af447f9..556b683e8f4 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -4455,6 +4455,15 @@ NTSTATUS WINAPI KdEnableDebugger(void) return STATUS_DEBUGGER_INACTIVE; } +#ifdef __x86_64__ + +void WINAPI KfRaiseIrql(KIRQL new, KIRQL *old) +{ + FIXME("new %u old %p: stub.\n", new, old); +} + +#endif + /***************************************************** * DllMain */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 4df6b1ae472..84f4a3feec3 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -659,6 +659,7 @@ @ stdcall KeWaitForMultipleObjects(long ptr long long long long ptr ptr) @ stdcall KeWaitForMutexObject(ptr long long long ptr) @ stdcall KeWaitForSingleObject(ptr long long long ptr) +@ stdcall -arch=x86_64 KfRaiseIrql(long ptr) @ stub KiBugCheckData @ stub KiCoprocessorError @ stub KiDeliverApc

1 year, 11 months

Rémi Bernon : ntdll: Remove tail checking on large blocks.

by Alexandre Julliard

Module: wine Branch: master Commit: 526fc34a39ac146d717eaf96ebadcdeaba4e095e URL: https://source.winehq.org/git/wine.git/?a=commit;h=526fc34a39ac146d717eaf96… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon May 30 22:07:42 2022 +0200 ntdll: Remove tail checking on large blocks. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernel32/tests/heap.c | 27 +++------------------------ dlls/ntdll/heap.c | 30 +++++++++--------------------- 2 files changed, 12 insertions(+), 45 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 8ef0bfc3668..bb5e57fe94e 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -2242,7 +2242,6 @@ static void test_block_layout( HANDLE heap, DWORD global_flags, DWORD heap_flags ok( diff > expect_size, "got diff %#Ix\n", diff ); tail = ptr0[alloc_size] | ptr1[alloc_size] | ptr2[alloc_size]; - todo_wine_if( heap_flags & HEAP_TAIL_CHECKING_ENABLED ) ok( !tail, "got tail\n" ); ret = HeapFree( heap, 0, ptr2 ); @@ -2492,29 +2491,9 @@ static void test_heap_checks( DWORD flags ) if (flags & HEAP_TAIL_CHECKING_ENABLED) { /* Windows doesn't do tail checking on large blocks */ - ok( p[large_size] == 0xab || broken(p[large_size] == 0), "wrong data %x\n", p[large_size] ); - ok( p[large_size+1] == 0xab || broken(p[large_size+1] == 0), "wrong data %x\n", p[large_size+1] ); - ok( p[large_size+2] == 0xab || broken(p[large_size+2] == 0), "wrong data %x\n", p[large_size+2] ); - if (p[large_size] == 0xab) - { - p[large_size] = 0xcc; - ret = HeapValidate( GetProcessHeap(), 0, p ); - ok( !ret, "HeapValidate succeeded\n" ); - - /* other calls only check when HEAP_VALIDATE is set */ - if (flags & HEAP_VALIDATE) - { - size = HeapSize( GetProcessHeap(), 0, p ); - ok( size == ~(SIZE_T)0, "Wrong size %Iu\n", size ); - - p2 = HeapReAlloc( GetProcessHeap(), 0, p, large_size - 3 ); - ok( p2 == NULL, "HeapReAlloc succeeded\n" ); - - ret = HeapFree( GetProcessHeap(), 0, p ); - ok( !ret, "HeapFree succeeded\n" ); - } - p[large_size] = 0xab; - } + ok( p[large_size] == 0, "wrong data %x\n", p[large_size] ); + ok( p[large_size + 1] == 0, "wrong data %x\n", p[large_size + 1] ); + ok( p[large_size + 2] == 0, "wrong data %x\n", p[large_size + 2] ); } ret = HeapFree( GetProcessHeap(), 0, p ); diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 0102ba3ea42..00b4cd7e894 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -783,7 +783,7 @@ static inline void shrink_used_block( SUBHEAP *subheap, struct block *block, UIN static void *allocate_large_block( HEAP *heap, DWORD flags, SIZE_T size ) { ARENA_LARGE *arena; - SIZE_T block_size = sizeof(*arena) + ROUND_SIZE(size) + HEAP_TAIL_EXTRA_SIZE(flags); + SIZE_T block_size = sizeof(*arena) + ROUND_SIZE( size ); LPVOID address = NULL; if (!(flags & HEAP_GROWABLE)) return NULL; @@ -799,8 +799,9 @@ static void *allocate_large_block( HEAP *heap, DWORD flags, SIZE_T size ) arena->block_size = block_size; arena->size = ARENA_LARGE_SIZE; arena->magic = ARENA_LARGE_MAGIC; - mark_block_tail( (char *)(arena + 1) + size, block_size - sizeof(*arena) - size, flags ); list_add_tail( &heap->large_list, &arena->entry ); + valgrind_make_noaccess( (char *)arena + sizeof(*arena) + arena->data_size, + arena->block_size - sizeof(*arena) - arena->data_size ); return arena + 1; } @@ -825,19 +826,17 @@ static void free_large_block( HEAP *heap, void *ptr ) static void *realloc_large_block( HEAP *heap, DWORD flags, void *ptr, SIZE_T size ) { ARENA_LARGE *arena = (ARENA_LARGE *)ptr - 1; + SIZE_T old_size = arena->data_size; void *new_ptr; if (arena->block_size - sizeof(*arena) >= size) { - SIZE_T unused = arena->block_size - sizeof(*arena) - size; - /* FIXME: we could remap zero-pages instead */ - valgrind_notify_resize( arena + 1, arena->data_size, size ); - if (size > arena->data_size) - initialize_block( (char *)ptr + arena->data_size, size - arena->data_size, unused, flags ); - else - mark_block_tail( (char *)ptr + size, unused, flags ); + valgrind_notify_resize( arena + 1, old_size, size ); + if (size > old_size) initialize_block( (char *)ptr + old_size, size - old_size, 0, flags ); arena->data_size = size; + valgrind_make_noaccess( (char *)arena + sizeof(*arena) + arena->data_size, + arena->block_size - sizeof(*arena) - arena->data_size ); return ptr; } if (flags & HEAP_REALLOC_IN_PLACE_ONLY) return NULL; @@ -847,7 +846,7 @@ static void *realloc_large_block( HEAP *heap, DWORD flags, void *ptr, SIZE_T siz return NULL; } valgrind_notify_alloc( new_ptr, size, 0 ); - memcpy( new_ptr, ptr, arena->data_size ); + memcpy( new_ptr, ptr, old_size ); valgrind_notify_free( ptr ); free_large_block( heap, ptr ); return new_ptr; @@ -877,12 +876,6 @@ static BOOL validate_large_arena( const HEAP *heap, const ARENA_LARGE *arena ) err = "invalid block header"; else if (!contains( arena, arena->block_size, arena + 1, arena->data_size )) err = "invalid block size"; - else if (heap->flags & HEAP_TAIL_CHECKING_ENABLED) - { - SIZE_T i, unused = arena->block_size - sizeof(*arena) - arena->data_size; - const unsigned char *data = (const unsigned char *)(arena + 1) + arena->data_size; - for (i = 0; i < unused && !err; i++) if (data[i] != ARENA_TAIL_FILLER) err = "invalid block tail"; - } if (err) { @@ -1317,7 +1310,6 @@ static void heap_set_debug_flags( HANDLE handle ) if (flags & (HEAP_FREE_CHECKING_ENABLED | HEAP_TAIL_CHECKING_ENABLED)) /* fix existing blocks */ { struct block *block; - ARENA_LARGE *large; SUBHEAP *subheap; LIST_FOR_EACH_ENTRY( subheap, &heap->subheap_list, SUBHEAP, entry ) @@ -1342,10 +1334,6 @@ static void heap_set_debug_flags( HANDLE handle ) } } } - - LIST_FOR_EACH_ENTRY( large, &heap->large_list, ARENA_LARGE, entry ) - mark_block_tail( (char *)(large + 1) + large->data_size, - large->block_size - sizeof(*large) - large->data_size, flags ); } if ((heap->flags & HEAP_GROWABLE) && !heap->pending_free &&

1 year, 11 months

Rémi Bernon : ntdll: Merge common resize case in heap_realloc.

by Alexandre Julliard

Module: wine Branch: master Commit: 75b78517ceebaf33d09b03323bab87c2085ad09a URL: https://source.winehq.org/git/wine.git/?a=commit;h=75b78517ceebaf33d09b0332… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon May 30 22:26:48 2022 +0200 ntdll: Merge common resize case in heap_realloc. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/heap.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 4050c00c265..0102ba3ea42 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1609,8 +1609,6 @@ static NTSTATUS heap_reallocate( HEAP *heap, ULONG flags, void *ptr, SIZE_T size list_remove( &entry->entry ); old_block_size += block_get_size( next ); if (!subheap_commit( subheap, block, block_size )) return STATUS_NO_MEMORY; - valgrind_notify_resize( block + 1, old_size, size ); - shrink_used_block( subheap, block, block_get_flags( block ), old_block_size, block_size, size ); } else { @@ -1624,13 +1622,9 @@ static NTSTATUS heap_reallocate( HEAP *heap, ULONG flags, void *ptr, SIZE_T size return STATUS_SUCCESS; } } - else - { - valgrind_notify_resize( block + 1, old_size, size ); - shrink_used_block( subheap, block, block_get_flags( block ), old_block_size, block_size, size ); - } - /* Clear the extra bytes if needed */ + valgrind_notify_resize( block + 1, old_size, size ); + shrink_used_block( subheap, block, block_get_flags( block ), old_block_size, block_size, size ); if (size <= old_size) mark_block_tail( (char *)(block + 1) + size, block->unused_bytes, flags ); else initialize_block( (char *)(block + 1) + old_size, size - old_size, block->unused_bytes, flags );

1 year, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2022