May 2019 - Wine-Devel - list.winehq.org

[PATCH 2/6] wined3d: Share more swapchain setup with the "no3d" adapter in wined3d_device_set_implicit_swapchain().
by Henri Verbeet May 7, 2019

May 7, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/device.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b2dbb403932..dcf05f054f5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1151,23 +1151,24 @@ HRESULT wined3d_device_set_implicit_swapchain(struct wined3d_device *device, str { if (FAILED(hr = wined3d_device_create_primary_opengl_context(device))) goto err_out; - device_init_swapchain_state(device, swapchain); - TRACE("All defaults now set up.\n"); + device->d3d_initialized = TRUE; + } - /* Clear the screen */ - if (device->back_buffer_view) - clear_flags |= WINED3DCLEAR_TARGET; - if (swapchain_desc->enable_auto_depth_stencil) - clear_flags |= WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL; - if (clear_flags) - wined3d_device_clear(device, 0, NULL, clear_flags, &black, 1.0f, 0); + device_init_swapchain_state(device, swapchain); - device->d3d_initialized = TRUE; + TRACE("All defaults now set up.\n"); - if (wined3d_settings.logo) - device_load_logo(device, wined3d_settings.logo); - } + /* Clear the screen. */ + if (device->back_buffer_view) + clear_flags |= WINED3DCLEAR_TARGET; + if (swapchain_desc->enable_auto_depth_stencil) + clear_flags |= WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL; + if (clear_flags) + wined3d_device_clear(device, 0, NULL, clear_flags, &black, 1.0f, 0); + + if (wined3d_settings.logo) + device_load_logo(device, wined3d_settings.logo); return WINED3D_OK; -- 2.11.0

1 0

[PATCH 1/6] wined3d: Get rid of a redundant initialisation in wined3d_device_set_implicit_swapchain().
by Henri Verbeet May 7, 2019

May 7, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/device.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a27251c86e3..b2dbb403932 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1153,8 +1153,6 @@ HRESULT wined3d_device_set_implicit_swapchain(struct wined3d_device *device, str goto err_out; device_init_swapchain_state(device, swapchain); - device->contexts[0]->last_was_rhw = 0; - TRACE("All defaults now set up.\n"); /* Clear the screen */ -- 2.11.0

1 0

[PATCH 4/4] d3d11: Report format support more accurately based on feature level.
by Józef Kucia May 7, 2019

May 7, 2019

Our partial stub for CheckFormatSupport() is still quite inaccurate. For example, we might report SHADER_SAMPLE support for UINT formats. In the long term, wined3d should probably return the format support flags directly. Unfortunately, the current wined3d interface shared with d3d9 isn't well suited for returning fine-grained format support flags. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d10core/tests/d3d10core.c | 20 ++++++++++++++++-- dlls/d3d11/device.c | 13 +++++++++--- dlls/d3d11/tests/d3d11.c | 35 ++++++++++++++++++++++++++++++-- 3 files changed, 61 insertions(+), 7 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 32f943704af8..ecf1f3814726 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -13390,7 +13390,7 @@ static void check_format_support(const unsigned int *format_support, } } -static void test_required_format_support(void) +static void test_format_support(void) { unsigned int format_support[DXGI_FORMAT_B4G4R4A4_UNORM + 1]; ID3D10Device *device; @@ -13425,6 +13425,22 @@ static void test_required_format_support(void) format, hr, format_support[format]); } + for (format = DXGI_FORMAT_UNKNOWN; format <= DXGI_FORMAT_B4G4R4A4_UNORM; ++format) + { + ok(!(format_support[format] & D3D10_FORMAT_SUPPORT_SHADER_GATHER), + "Unexpected SHADER_GATHER for format %#x.\n", format); + ok(!(format_support[format] & D3D11_FORMAT_SUPPORT_SHADER_GATHER_COMPARISON), + "Unexpected SHADER_GATHER_COMPARISON for format %#x.\n", format); + } + + ok(format_support[DXGI_FORMAT_R8G8B8A8_UNORM] & D3D10_FORMAT_SUPPORT_SHADER_SAMPLE, + "SHADER_SAMPLE is not supported for R8G8B8A8_UNORM.\n"); + todo_wine + ok(!(format_support[DXGI_FORMAT_R32G32B32A32_UINT] & D3D10_FORMAT_SUPPORT_SHADER_SAMPLE), + "SHADER_SAMPLE is supported for R32G32B32A32_UINT.\n"); + ok(format_support[DXGI_FORMAT_R32G32B32A32_UINT] & D3D10_FORMAT_SUPPORT_SHADER_LOAD, + "SHADER_LOAD is not supported for R32G32B32A32_UINT.\n"); + check_format_support(format_support, index_buffers, ARRAY_SIZE(index_buffers), D3D10_FORMAT_SUPPORT_IA_INDEX_BUFFER, "index buffer"); @@ -18057,7 +18073,7 @@ START_TEST(d3d10core) queue_test(test_index_buffer_offset); queue_test(test_face_culling); queue_test(test_line_antialiasing_blending); - queue_test(test_required_format_support); + queue_test(test_format_support); queue_test(test_ddy); queue_test(test_shader_input_registers_limits); queue_test(test_unbind_shader_resource_view); diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 751afc132112..31292e9ddff8 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3378,6 +3378,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device2 * struct d3d_device *device = impl_from_ID3D11Device2(iface); struct wined3d_device_creation_parameters params; enum wined3d_format_id wined3d_format; + D3D_FEATURE_LEVEL feature_level; struct wined3d *wined3d; unsigned int i; @@ -3410,6 +3411,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device2 * *format_support = 0; wined3d_mutex_lock(); + feature_level = device->feature_level; wined3d = wined3d_device_get_wined3d(device->wined3d_device); wined3d_device_get_creation_parameters(device->wined3d_device, &params); for (i = 0; i < ARRAY_SIZE(flag_mapping); ++i) @@ -3434,12 +3436,17 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device2 * { *format_support |= D3D11_FORMAT_SUPPORT_SHADER_LOAD; *format_support |= D3D11_FORMAT_SUPPORT_SHADER_SAMPLE; - *format_support |= D3D11_FORMAT_SUPPORT_SHADER_GATHER; + + if (feature_level >= D3D_FEATURE_LEVEL_10_1) + *format_support |= D3D11_FORMAT_SUPPORT_SHADER_GATHER; if (*format_support & D3D11_FORMAT_SUPPORT_DEPTH_STENCIL) { - *format_support |= D3D11_FORMAT_SUPPORT_SHADER_SAMPLE_COMPARISON; - *format_support |= D3D11_FORMAT_SUPPORT_SHADER_GATHER_COMPARISON; + if (feature_level >= D3D_FEATURE_LEVEL_10_0) + *format_support |= D3D11_FORMAT_SUPPORT_SHADER_SAMPLE_COMPARISON; + + if (feature_level >= D3D_FEATURE_LEVEL_10_1) + *format_support |= D3D11_FORMAT_SUPPORT_SHADER_GATHER_COMPARISON; } } diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 5b56a04c54bb..e8c2f649f80b 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -18425,7 +18425,7 @@ static void check_format_support(const unsigned int *format_support, D3D_FEATURE } } -static void test_required_format_support(const D3D_FEATURE_LEVEL feature_level) +static void test_format_support(const D3D_FEATURE_LEVEL feature_level) { unsigned int format_support[DXGI_FORMAT_B4G4R4A4_UNORM + 1]; struct device_desc device_desc; @@ -18463,6 +18463,37 @@ static void test_required_format_support(const D3D_FEATURE_LEVEL feature_level) format, hr, format_support[format]); } + for (format = DXGI_FORMAT_UNKNOWN; format <= DXGI_FORMAT_B4G4R4A4_UNORM; ++format) + { + if (feature_level < D3D_FEATURE_LEVEL_10_0) + { + /* SHADER_SAMPLE_COMPARISON is never advertised as supported on feature level 9. */ + ok(!(format_support[format] & D3D11_FORMAT_SUPPORT_SHADER_SAMPLE_COMPARISON), + "Unexpected SHADER_SAMPLE_COMPARISON for format %#x, feature level %#x.\n", + format, feature_level); + } + if (feature_level < D3D_FEATURE_LEVEL_10_1) + { + ok(!(format_support[format] & D3D11_FORMAT_SUPPORT_SHADER_GATHER), + "Unexpected SHADER_GATHER for format %#x, feature level %#x.\n", + format, feature_level); + ok(!(format_support[format] & D3D11_FORMAT_SUPPORT_SHADER_GATHER_COMPARISON), + "Unexpected SHADER_GATHER_COMPARISON for format %#x, feature level %#x.\n", + format, feature_level); + } + } + + ok(format_support[DXGI_FORMAT_R8G8B8A8_UNORM] & D3D11_FORMAT_SUPPORT_SHADER_SAMPLE, + "SHADER_SAMPLE is not supported for R8G8B8A8_UNORM.\n"); + todo_wine + ok(!(format_support[DXGI_FORMAT_R32G32B32A32_UINT] & D3D11_FORMAT_SUPPORT_SHADER_SAMPLE), + "SHADER_SAMPLE is supported for R32G32B32A32_UINT.\n"); + if (feature_level >= D3D_FEATURE_LEVEL_10_0) + { + ok(format_support[DXGI_FORMAT_R32G32B32A32_UINT] & D3D11_FORMAT_SUPPORT_SHADER_LOAD, + "SHADER_LOAD is not supported for R32G32B32A32_UINT.\n"); + } + check_format_support(format_support, feature_level, index_buffers, ARRAY_SIZE(index_buffers), D3D11_FORMAT_SUPPORT_IA_INDEX_BUFFER, "index buffer"); @@ -29365,7 +29396,7 @@ START_TEST(d3d11) queue_test(test_index_buffer_offset); queue_test(test_face_culling); queue_test(test_line_antialiasing_blending); - queue_for_each_feature_level(test_required_format_support); + queue_for_each_feature_level(test_format_support); queue_for_each_9_x_feature_level(test_fl9_draw); queue_test(test_ddy); queue_test(test_shader_input_registers_limits); -- 2.21.0

3 2

[PATCH 3/4] wined3d: Store texture swizzle capability in struct wined3d_d3d_info.
by Józef Kucia May 7, 2019

May 7, 2019

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/adapter_vk.c | 1 + dlls/wined3d/cs.c | 3 +-- dlls/wined3d/shader.c | 2 +- dlls/wined3d/texture.c | 2 +- dlls/wined3d/utils.c | 2 +- dlls/wined3d/view.c | 2 +- dlls/wined3d/wined3d_private.h | 6 +++--- 8 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 866cfecbe1f2..1555ba4aaa38 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3729,6 +3729,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, d3d_info->draw_base_vertex_offset = !!gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX]; d3d_info->vertex_bgra = !!gl_info->supported[ARB_VERTEX_ARRAY_BGRA]; + d3d_info->texture_swizzle = !!gl_info->supported[ARB_TEXTURE_SWIZZLE]; if (gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) d3d_info->multisample_draw_location = WINED3D_LOCATION_TEXTURE_RGB; diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 0d5e2f59348c..87a111274fe4 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -729,6 +729,7 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, adapter->shader_backend = &none_shader_backend; adapter->d3d_info.wined3d_creation_flags = wined3d_creation_flags; + adapter->d3d_info.texture_swizzle = TRUE; return TRUE; diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 9960d06cea72..b2a2b1ad4ffd 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1348,7 +1348,6 @@ void wined3d_cs_emit_set_constant_buffer(struct wined3d_cs *cs, enum wined3d_sha static void wined3d_cs_exec_set_texture(struct wined3d_cs *cs, const void *data) { - const struct wined3d_gl_info *gl_info = &cs->device->adapter->gl_info; const struct wined3d_d3d_info *d3d_info = &cs->device->adapter->d3d_info; const struct wined3d_cs_set_texture *op = data; struct wined3d_texture *prev; @@ -1369,7 +1368,7 @@ static void wined3d_cs_exec_set_texture(struct wined3d_cs *cs, const void *data) if (!prev || wined3d_texture_gl(op->texture)->target != wined3d_texture_gl(prev)->target || (!is_same_fixup(new_format->color_fixup, old_format->color_fixup) - && !(can_use_texture_swizzle(gl_info, new_format) && can_use_texture_swizzle(gl_info, old_format))) + && !(can_use_texture_swizzle(d3d_info, new_format) && can_use_texture_swizzle(d3d_info, old_format))) || (new_fmt_flags & WINED3DFMT_FLAG_SHADOW) != (old_fmt_flags & WINED3DFMT_FLAG_SHADOW)) device_invalidate_state(cs->device, STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL)); diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 7ebfd4dee16b..609b574d461c 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -4025,7 +4025,7 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 args->color_fixup[i] = COLOR_FIXUP_IDENTITY; continue; } - if (can_use_texture_swizzle(gl_info, texture->resource.format)) + if (can_use_texture_swizzle(d3d_info, texture->resource.format)) args->color_fixup[i] = COLOR_FIXUP_IDENTITY; else args->color_fixup[i] = texture->resource.format->color_fixup; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 949492063d2c..664f8a902053 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1037,7 +1037,7 @@ void wined3d_texture_gl_bind(struct wined3d_texture_gl *texture_gl, checkGLcall("glTexParameteri(GL_DEPTH_TEXTURE_MODE_ARB, GL_INTENSITY)"); } - if (!is_identity_fixup(fixup) && can_use_texture_swizzle(gl_info, format)) + if (!is_identity_fixup(fixup) && can_use_texture_swizzle(context->d3d_info, format)) { GLint swizzle[4]; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index e54eec241ea4..2ec3546125bb 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5988,7 +5988,7 @@ void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d if ((texture = state->textures[i])) { - if (can_use_texture_swizzle(gl_info, texture->resource.format)) + if (can_use_texture_swizzle(d3d_info, texture->resource.format)) settings->op[i].color_fixup = COLOR_FIXUP_IDENTITY; else settings->op[i].color_fixup = texture->resource.format->color_fixup; diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 0cfadf7329b9..ec9df71380cd 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -226,7 +226,7 @@ static void create_texture_view(struct wined3d_gl_view *view, GLenum view_target context_invalidate_compute_state(context, STATE_COMPUTE_SHADER_RESOURCE_BINDING); context_invalidate_state(context, STATE_GRAPHICS_SHADER_RESOURCE_BINDING); } - else if (!is_identity_fixup(view_format->color_fixup) && can_use_texture_swizzle(gl_info, view_format)) + else if (!is_identity_fixup(view_format->color_fixup) && can_use_texture_swizzle(context->d3d_info, view_format)) { GLint swizzle[4]; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 221ca6e04f46..875c33bd0b40 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -209,6 +209,7 @@ struct wined3d_d3d_info unsigned int texture_npot_conditional : 1; unsigned int draw_base_vertex_offset : 1; unsigned int vertex_bgra : 1; + unsigned int texture_swizzle : 1; enum wined3d_feature_level feature_level; DWORD multisample_draw_location; @@ -4739,10 +4740,9 @@ static inline GLuint wined3d_texture_gl_get_texture_name(const struct wined3d_te ? texture_gl->texture_srgb.name : texture_gl->texture_rgb.name; } -static inline BOOL can_use_texture_swizzle(const struct wined3d_gl_info *gl_info, const struct wined3d_format *format) +static inline BOOL can_use_texture_swizzle(const struct wined3d_d3d_info *d3d_info, const struct wined3d_format *format) { - return gl_info->supported[ARB_TEXTURE_SWIZZLE] && !is_complex_fixup(format->color_fixup) - && !is_scaling_fixup(format->color_fixup); + return d3d_info->texture_swizzle && !is_complex_fixup(format->color_fixup) && !is_scaling_fixup(format->color_fixup); } static inline BOOL needs_interpolation_qualifiers_for_shader_outputs(const struct wined3d_gl_info *gl_info) -- 2.21.0

2 1

[PATCH 2/4] wined3d: Query Vulkan shared system memory.
by Józef Kucia May 7, 2019

May 7, 2019

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 2 +- dlls/wined3d/adapter_vk.c | 9 ++++++--- dlls/wined3d/directx.c | 19 +++++++++++-------- dlls/wined3d/wined3d_private.h | 3 ++- 4 files changed, 20 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index cedd012c89d1..866cfecbe1f2 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3855,7 +3855,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, } fixup_extensions(gl_info, caps_gl_ctx, gl_renderer_str, gl_vendor, gpu_description->vendor, gpu_description->device); - wined3d_driver_info_init(driver_info, gpu_description, vram_bytes); + wined3d_driver_info_init(driver_info, gpu_description, vram_bytes, 0); TRACE("Reporting (fake) driver version 0x%08x-0x%08x.\n", driver_info->version_high, driver_info->version_low); diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 8fd9adf31909..0d5e2f59348c 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -635,8 +635,8 @@ static void adapter_vk_init_driver_info(struct wined3d_adapter *adapter, { const struct wined3d_gpu_description *gpu_description; struct wined3d_gpu_description description; + UINT64 vram_bytes, sysmem_bytes; const VkMemoryHeap *heap; - UINT64 vram_bytes; unsigned int i; TRACE("Device name: %s.\n", debugstr_a(properties->deviceName)); @@ -644,15 +644,18 @@ static void adapter_vk_init_driver_info(struct wined3d_adapter *adapter, TRACE("Driver version: %#x.\n", properties->driverVersion); TRACE("API version: %s.\n", debug_vk_version(properties->apiVersion)); - for (i = 0, vram_bytes = 0; i < memory_properties->memoryHeapCount; ++i) + for (i = 0, vram_bytes = 0, sysmem_bytes = 0; i < memory_properties->memoryHeapCount; ++i) { heap = &memory_properties->memoryHeaps[i]; TRACE("Memory heap [%u]: flags %#x, size 0x%s.\n", i, heap->flags, wine_dbgstr_longlong(heap->size)); if (heap->flags & VK_MEMORY_HEAP_DEVICE_LOCAL_BIT) vram_bytes += heap->size; + else + sysmem_bytes += heap->size; } TRACE("Total device memory: 0x%s.\n", wine_dbgstr_longlong(vram_bytes)); + TRACE("Total shared system memory: 0x%s.\n", wine_dbgstr_longlong(sysmem_bytes)); if (!(gpu_description = wined3d_get_user_override_gpu_description(properties->vendorID, properties->deviceID))) gpu_description = wined3d_get_gpu_description(properties->vendorID, properties->deviceID); @@ -671,7 +674,7 @@ static void adapter_vk_init_driver_info(struct wined3d_adapter *adapter, gpu_description = &description; } - wined3d_driver_info_init(&adapter->driver_info, gpu_description, vram_bytes); + wined3d_driver_info_init(&adapter->driver_info, gpu_description, vram_bytes, sysmem_bytes); } static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c909e5185a1d..be7e8182ec2a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -541,7 +541,7 @@ static void wined3d_copy_name(char *dst, const char *src, unsigned int dst_size) } void wined3d_driver_info_init(struct wined3d_driver_info *driver_info, - const struct wined3d_gpu_description *gpu_desc, UINT64 vram_bytes) + const struct wined3d_gpu_description *gpu_desc, UINT64 vram_bytes, UINT64 sysmem_bytes) { const struct driver_version_information *version_info; enum wined3d_driver_model driver_model; @@ -637,12 +637,15 @@ void wined3d_driver_info_init(struct wined3d_driver_info *driver_info, driver_info->vram_bytes = LONG_MAX; } - driver_info->sysmem_bytes = 64 * 1024 * 1024; - memory_status.dwLength = sizeof(memory_status); - if (GlobalMemoryStatusEx(&memory_status)) - driver_info->sysmem_bytes = max(memory_status.ullTotalPhys / 2, driver_info->sysmem_bytes); - else - ERR("Failed to get global memory status.\n"); + if (!(driver_info->sysmem_bytes = sysmem_bytes)) + { + driver_info->sysmem_bytes = 64 * 1024 * 1024; + memory_status.dwLength = sizeof(memory_status); + if (GlobalMemoryStatusEx(&memory_status)) + driver_info->sysmem_bytes = max(memory_status.ullTotalPhys / 2, driver_info->sysmem_bytes); + else + ERR("Failed to get global memory status.\n"); + } /* Try to obtain driver version information for the current Windows version. This fails in * some cases: @@ -2305,7 +2308,7 @@ static struct wined3d_adapter *wined3d_adapter_no3d_create(unsigned int ordinal, if (!(adapter = heap_alloc_zero(sizeof(*adapter)))) return NULL; - wined3d_driver_info_init(&adapter->driver_info, &gpu_description, 0); + wined3d_driver_info_init(&adapter->driver_info, &gpu_description, 0, 0); adapter->vram_bytes_used = 0; TRACE("Emulating 0x%s bytes of video ram.\n", wine_dbgstr_longlong(adapter->driver_info.vram_bytes)); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fbcda94537e6..221ca6e04f46 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2701,7 +2701,8 @@ struct wined3d_driver_info }; void wined3d_driver_info_init(struct wined3d_driver_info *driver_info, - const struct wined3d_gpu_description *gpu_description, UINT64 vram_bytes) DECLSPEC_HIDDEN; + const struct wined3d_gpu_description *gpu_description, + UINT64 vram_bytes, UINT64 sysmem_bytes) DECLSPEC_HIDDEN; struct wined3d_adapter_ops { -- 2.21.0

2 1

[PATCH 1/4] wined3d: Query Vulkan GPU memory.
by Józef Kucia May 7, 2019

May 7, 2019

From: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- [rebased and sligtly modified] --- dlls/wined3d/adapter_vk.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index da53edd953a6..8fd9adf31909 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -631,20 +631,32 @@ static enum wined3d_display_driver guess_display_driver(enum wined3d_pci_vendor } static void adapter_vk_init_driver_info(struct wined3d_adapter *adapter, - const VkPhysicalDeviceProperties *properties) + const VkPhysicalDeviceProperties *properties, const VkPhysicalDeviceMemoryProperties *memory_properties) { const struct wined3d_gpu_description *gpu_description; struct wined3d_gpu_description description; + const VkMemoryHeap *heap; + UINT64 vram_bytes; + unsigned int i; TRACE("Device name: %s.\n", debugstr_a(properties->deviceName)); TRACE("Vendor ID: 0x%04x, Device ID: 0x%04x.\n", properties->vendorID, properties->deviceID); TRACE("Driver version: %#x.\n", properties->driverVersion); TRACE("API version: %s.\n", debug_vk_version(properties->apiVersion)); + for (i = 0, vram_bytes = 0; i < memory_properties->memoryHeapCount; ++i) + { + heap = &memory_properties->memoryHeaps[i]; + TRACE("Memory heap [%u]: flags %#x, size 0x%s.\n", + i, heap->flags, wine_dbgstr_longlong(heap->size)); + if (heap->flags & VK_MEMORY_HEAP_DEVICE_LOCAL_BIT) + vram_bytes += heap->size; + } + TRACE("Total device memory: 0x%s.\n", wine_dbgstr_longlong(vram_bytes)); + if (!(gpu_description = wined3d_get_user_override_gpu_description(properties->vendorID, properties->deviceID))) gpu_description = wined3d_get_gpu_description(properties->vendorID, properties->deviceID); - /* FIXME: Get vidmem from Vulkan. */ if (!gpu_description) { FIXME("Failed to retrieve GPU description for device %s %04x:%04x.\n", @@ -654,18 +666,19 @@ static void adapter_vk_init_driver_info(struct wined3d_adapter *adapter, description.device = properties->deviceID; description.description = properties->deviceName; description.driver = guess_display_driver(properties->vendorID); - description.vidmem = 0; + description.vidmem = vram_bytes; gpu_description = &description; } - wined3d_driver_info_init(&adapter->driver_info, gpu_description, wined3d_settings.emulated_textureram); + wined3d_driver_info_init(&adapter->driver_info, gpu_description, vram_bytes); } static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, unsigned int ordinal, unsigned int wined3d_creation_flags) { struct wined3d_vk_info *vk_info = &adapter_vk->vk_info; + VkPhysicalDeviceMemoryProperties memory_properties; struct wined3d_adapter *adapter = &adapter_vk->a; VkPhysicalDeviceIDProperties id_properties; VkPhysicalDeviceProperties2 properties2; @@ -696,7 +709,11 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, VK_CALL(vkGetPhysicalDeviceProperties(adapter_vk->physical_device, &properties2.properties)); adapter_vk->device_limits = properties2.properties.limits; - adapter_vk_init_driver_info(adapter, &properties2.properties); + VK_CALL(vkGetPhysicalDeviceMemoryProperties(adapter_vk->physical_device, &memory_properties)); + + adapter_vk_init_driver_info(adapter, &properties2.properties, &memory_properties); + adapter->vram_bytes_used = 0; + TRACE("Emulating 0x%s bytes of video ram.\n", wine_dbgstr_longlong(adapter->driver_info.vram_bytes)); memcpy(&adapter->driver_uuid, id_properties.driverUUID, sizeof(adapter->driver_uuid)); memcpy(&adapter->device_uuid, id_properties.deviceUUID, sizeof(adapter->device_uuid)); -- 2.21.0

2 1

[PATCH] kernel32: Mark LoadAppInitDlls as stub in spec file
by Louis Lenders May 7, 2019

May 7, 2019

Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=47061 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/kernel32/kernel32.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 2e2828e58b..989b52387d 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1041,7 +1041,7 @@ @ stdcall LZStart() @ stdcall LeaveCriticalSection(ptr) ntdll.RtlLeaveCriticalSection @ stdcall LeaveCriticalSectionWhenCallbackReturns(ptr ptr) ntdll.TpCallbackLeaveCriticalSectionOnCompletion -# @ stub LoadAppInitDlls +@ stub LoadAppInitDlls @ stdcall LoadLibraryA(str) @ stdcall LoadLibraryExA( str long long) @ stdcall LoadLibraryExW(wstr long long) -- 2.20.1

1 0

[PATCH 2/2] dinput: Support DIDEVICEINSTANCE_DX3 for Keyboard GetDeviceInfo
by Alistair Leslie-Hughes May 7, 2019

May 7, 2019

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dinput/keyboard.c | 5 ----- dlls/dinput/tests/keyboard.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 70eb579..8341f7d 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -526,11 +526,6 @@ static HRESULT WINAPI SysKeyboardAImpl_GetDeviceInfo( SysKeyboardImpl *This = impl_from_IDirectInputDevice8A(iface); TRACE("(this=%p,%p)\n", This, pdidi); - if (pdidi->dwSize != sizeof(DIDEVICEINSTANCEA)) { - WARN(" dinput3 not supported yet...\n"); - return DI_OK; - } - fill_keyboard_dideviceinstanceA(pdidi, This->base.dinput->dwVersion, This->subtype); return DI_OK; diff --git a/dlls/dinput/tests/keyboard.c b/dlls/dinput/tests/keyboard.c index e8dfb4f..9254123 100644 --- a/dlls/dinput/tests/keyboard.c +++ b/dlls/dinput/tests/keyboard.c @@ -453,6 +453,35 @@ fail: IUnknown_Release(device); } +static void test_GetDeviceInfo(IDirectInputA *pDI) +{ + HRESULT hr; + IDirectInputDeviceA *pKey = NULL; + DIDEVICEINSTANCEA instA; + DIDEVICEINSTANCE_DX3A inst3A; + + hr = IDirectInput_CreateDevice(pDI, &GUID_SysKeyboard, &pKey, NULL); + ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %08x\n", hr); + if (FAILED(hr)) return; + + instA.dwSize = sizeof(instA); + hr = IDirectInputDevice_GetDeviceInfo(pKey, &instA); + ok(SUCCEEDED(hr), "got %08x\n", hr); + + inst3A.dwSize = sizeof(inst3A); + hr = IDirectInputDevice_GetDeviceInfo(pKey, (DIDEVICEINSTANCEA *)&inst3A); + ok(SUCCEEDED(hr), "got %08x\n", hr); + + ok(instA.dwSize != inst3A.dwSize, "got %d, %d \n", instA.dwSize, inst3A.dwSize); + ok(IsEqualGUID(&instA.guidInstance, &inst3A.guidInstance), "got %s, %s\n", + wine_dbgstr_guid(&instA.guidInstance), wine_dbgstr_guid(&inst3A.guidInstance) ); + ok(IsEqualGUID(&instA.guidProduct, &inst3A.guidProduct), "got %s, %s\n", + wine_dbgstr_guid(&instA.guidProduct), wine_dbgstr_guid(&inst3A.guidProduct) ); + ok(instA.dwDevType == inst3A.dwDevType, "got %d, %d\n", instA.dwDevType, inst3A.dwDevType); + + if (pKey) IUnknown_Release(pKey); +} + static void keyboard_tests(DWORD version) { HRESULT hr; @@ -483,6 +512,7 @@ static void keyboard_tests(DWORD version) test_set_coop(pDI, hwnd); test_get_prop(pDI, hwnd); test_capabilities(pDI, hwnd); + test_GetDeviceInfo(pDI); test_dik_codes(pDI, hwnd, MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT)); test_dik_codes(pDI, hwnd, MAKELANGID(LANG_FRENCH, SUBLANG_FRENCH)); -- 1.9.1

2 1

[PATCH] kernel32: Add K32GetWsChangesEx stub
by Louis Lenders May 7, 2019

May 7, 2019

Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=47131 The program is happy with just stub entrypoint in kernel32.spec, but i added stub implementation anyway Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- .../api-ms-win-core-psapi-l1-1-0.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/virtual.c | 11 +++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- dlls/psapi/psapi.spec | 1 + include/psapi.h | 7 +++++++ 6 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-psapi-l1-1-0/api-ms-win-core-psapi-l1-1-0.spec b/dlls/api-ms-win-core-psapi-l1-1-0/api-ms-win-core-psapi-l1-1-0.spec index c966b3ff0d..c54c107784 100644 --- a/dlls/api-ms-win-core-psapi-l1-1-0/api-ms-win-core-psapi-l1-1-0.spec +++ b/dlls/api-ms-win-core-psapi-l1-1-0/api-ms-win-core-psapi-l1-1-0.spec @@ -9,7 +9,7 @@ @ stdcall K32GetProcessImageFileNameW(long ptr long) kernel32.K32GetProcessImageFileNameW @ stdcall K32GetProcessMemoryInfo(long ptr long) kernel32.K32GetProcessMemoryInfo @ stdcall K32GetWsChanges(long ptr long) kernel32.K32GetWsChanges -@ stub K32GetWsChangesEx +@ stdcall K32GetWsChangesEx(long ptr ptr) kernel32.K32GetWsChangesEx @ stdcall K32InitializeProcessForWsWatch(long) kernel32.K32InitializeProcessForWsWatch @ stdcall K32QueryWorkingSet(long ptr long) kernel32.K32QueryWorkingSet @ stdcall K32QueryWorkingSetEx(long ptr long) kernel32.K32QueryWorkingSetEx diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 295a4dbab6..2e2828e58b 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1018,7 +1018,7 @@ @ stdcall K32GetProcessImageFileNameW(long ptr long) @ stdcall K32GetProcessMemoryInfo(long ptr long) @ stdcall K32GetWsChanges(long ptr long) -# @ stub K32GetWsChangesEx +@ stdcall K32GetWsChangesEx(long ptr ptr) @ stdcall K32InitializeProcessForWsWatch(long) @ stdcall K32QueryWorkingSet(long ptr long) @ stdcall K32QueryWorkingSetEx(long ptr long) diff --git a/dlls/kernel32/virtual.c b/dlls/kernel32/virtual.c index 59c96bd215..a5a2dfdf27 100644 --- a/dlls/kernel32/virtual.c +++ b/dlls/kernel32/virtual.c @@ -724,6 +724,17 @@ BOOL WINAPI K32GetWsChanges(HANDLE process, PPSAPI_WS_WATCH_INFORMATION watchinf return TRUE; } +/*********************************************************************** + * K32GetWsChangesEx (KERNEL32.@) + */ +BOOL WINAPI K32GetWsChangesEx(HANDLE process, PSAPI_WS_WATCH_INFORMATION_EX *watchinfoex, DWORD *size) +{ + FIXME_(seh)("(%p, %p, %p)\n", process, watchinfoex, size); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + /*********************************************************************** * K32InitializeProcessForWsWatch (KERNEL32.@) */ diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 22ea65fe1c..9bba9ae545 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -908,7 +908,7 @@ @ stdcall K32GetProcessImageFileNameW(long ptr long) kernel32.K32GetProcessImageFileNameW @ stdcall K32GetProcessMemoryInfo(long ptr long) kernel32.K32GetProcessMemoryInfo @ stdcall K32GetWsChanges(long ptr long) kernel32.K32GetWsChanges -# @ stub K32GetWsChangesEx +@ stdcall K32GetWsChangesEx(long ptr ptr) kernel32.K32GetWsChangesEx @ stdcall K32InitializeProcessForWsWatch(long) kernel32.K32InitializeProcessForWsWatch @ stdcall K32QueryWorkingSet(long ptr long) kernel32.K32QueryWorkingSet @ stdcall K32QueryWorkingSetEx(long ptr long) kernel32.K32QueryWorkingSetEx diff --git a/dlls/psapi/psapi.spec b/dlls/psapi/psapi.spec index d6116f8c64..6a7bc14815 100644 --- a/dlls/psapi/psapi.spec +++ b/dlls/psapi/psapi.spec @@ -21,6 +21,7 @@ @ stdcall GetProcessImageFileNameW(long ptr long) kernel32.K32GetProcessImageFileNameW @ stdcall GetProcessMemoryInfo(long ptr long) kernel32.K32GetProcessMemoryInfo @ stdcall GetWsChanges(long ptr long) kernel32.K32GetWsChanges +@ stdcall GetWsChangesEx(long ptr ptr) kernel32.K32GetWsChangesEx @ stdcall InitializeProcessForWsWatch(long) kernel32.K32InitializeProcessForWsWatch @ stdcall QueryWorkingSet(long ptr long) kernel32.K32QueryWorkingSet @ stdcall QueryWorkingSetEx(long ptr long) kernel32.K32QueryWorkingSetEx diff --git a/include/psapi.h b/include/psapi.h index c7663f856d..742bf7b574 100644 --- a/include/psapi.h +++ b/include/psapi.h @@ -50,6 +50,12 @@ typedef struct _PSAPI_WS_WATCH_INFORMATION { LPVOID FaultingVa; } PSAPI_WS_WATCH_INFORMATION, *PPSAPI_WS_WATCH_INFORMATION; +typedef struct _PSAPI_WS_WATCH_INFORMATION_EX { + PSAPI_WS_WATCH_INFORMATION BasicInfo; + ULONG_PTR FaultingThreadId; + ULONG_PTR Flags; +} PSAPI_WS_WATCH_INFORMATION_EX, *PPSAPI_WS_WATCH_INFORMATION_EX; + typedef struct _PERFORMANCE_INFORMATION { DWORD cb; SIZE_T CommitTotal; @@ -128,6 +134,7 @@ BOOL WINAPI QueryWorkingSet(HANDLE, PVOID, DWORD); BOOL WINAPI QueryWorkingSetEx(HANDLE, PVOID, DWORD); BOOL WINAPI InitializeProcessForWsWatch(HANDLE); BOOL WINAPI GetWsChanges(HANDLE, PPSAPI_WS_WATCH_INFORMATION, DWORD); +BOOL WINAPI GetWsChangesEx(HANDLE, PSAPI_WS_WATCH_INFORMATION_EX*, DWORD*); DWORD WINAPI GetMappedFileNameW(HANDLE, LPVOID, LPWSTR, DWORD); DWORD WINAPI GetMappedFileNameA(HANDLE, LPVOID, LPSTR, DWORD); #define GetMappedFileName WINELIB_NAME_AW(GetMappedFileName) -- 2.20.1

2 1

[PATCH V3] server: rewrite to use all attributes for group in create_token
by Vijay Kiran Kamuju May 6, 2019

May 6, 2019

Based on patch from Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- server/token.c | 31 ++++++------------------------- 1 file changed, 6 insertions(+), 25 deletions(-) diff --git a/server/token.c b/server/token.c index e0f28c6da6e..9944e3bb69c 100644 --- a/server/token.c +++ b/server/token.c @@ -125,13 +125,7 @@ struct privilege struct group { struct list entry; - unsigned enabled : 1; /* is the sid currently enabled? */ - unsigned def : 1; /* is the sid enabled by default? */ - unsigned logon : 1; /* is this a logon sid? */ - unsigned mandatory: 1; /* is this sid always enabled? */ - unsigned owner : 1; /* can this sid be an owner of an object? */ - unsigned resource : 1; /* is this a domain-local group? */ - unsigned deny_only: 1; /* is this a sid that should be use for denying only? */ + unsigned attributes; SID sid; }; @@ -584,16 +578,10 @@ static struct token *create_token( unsigned primary, const SID *user, return NULL; } memcpy( &group->sid, groups[i].Sid, security_sid_len( groups[i].Sid )); - group->enabled = TRUE; - group->def = TRUE; - group->logon = (groups[i].Attributes & SE_GROUP_LOGON_ID) != 0; - group->mandatory = (groups[i].Attributes & SE_GROUP_MANDATORY) != 0; - group->owner = (groups[i].Attributes & SE_GROUP_OWNER) != 0; - group->resource = FALSE; - group->deny_only = FALSE; + group->attributes = groups[i].Attributes; list_add_tail( &token->groups, &group->entry ); /* Use first owner capable group as owner and primary group */ - if (!token->primary_group && group->owner) + if (!token->primary_group && (group->attributes & SE_GROUP_OWNER)) { token->owner = &group->sid; token->primary_group = &group->sid; @@ -963,8 +951,8 @@ int token_sid_present( struct token *token, const SID *sid, int deny ) LIST_FOR_EACH_ENTRY( group, &token->groups, struct group, entry ) { - if (!group->enabled) continue; - if (group->deny_only && !deny) continue; + if (!(group->attributes & SE_GROUP_ENABLED)) continue; + if ((group->attributes & SE_GROUP_USE_FOR_DENY_ONLY) && !deny) continue; if (security_equal_sid( &group->sid, sid )) return TRUE; } @@ -1498,14 +1486,7 @@ DECL_HANDLER(get_token_groups) LIST_FOR_EACH_ENTRY( group, &token->groups, const struct group, entry ) { - *attr_ptr = 0; - if (group->mandatory) *attr_ptr |= SE_GROUP_MANDATORY; - if (group->def) *attr_ptr |= SE_GROUP_ENABLED_BY_DEFAULT; - if (group->enabled) *attr_ptr |= SE_GROUP_ENABLED; - if (group->owner) *attr_ptr |= SE_GROUP_OWNER; - if (group->deny_only) *attr_ptr |= SE_GROUP_USE_FOR_DENY_ONLY; - if (group->resource) *attr_ptr |= SE_GROUP_RESOURCE; - if (group->logon) *attr_ptr |= SE_GROUP_LOGON_ID; + *attr_ptr = group->attributes; memcpy(sid_ptr, &group->sid, security_sid_len( &group->sid )); -- 2.17.0

1 0