wine-commits September 2022

wine-commits@winehq.org

1 participants
553 discussions

Henri Verbeet : wined3d: Return bools from all return paths in wined3d_cs_map_upload_bo().
by Alexandre Julliard 15 Sep '22

15 Sep '22

Module: wine Branch: master Commit: 030c37ceae9ab3370ed0d135471b825588a2b3b2 URL: https://gitlab.winehq.org/wine/wine/-/commit/030c37ceae9ab3370ed0d135471b82… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 14 11:34:28 2022 +0200 wined3d: Return bools from all return paths in wined3d_cs_map_upload_bo(). --- dlls/wined3d/cs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 9fd67cf0045..8ddcb95ddcc 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2968,13 +2968,13 @@ static bool wined3d_cs_map_upload_bo(struct wined3d_device_context *context, str if (!d3d_info->xyzrhw || !d3d_info->vertex_bgra || !d3d_info->ffp_generic_attributes) { TRACE("Not returning a persistent buffer because we might need to do vertex attribute conversion.\n"); - return NULL; + return false; } if (resource->pin_sysmem) { TRACE("Not allocating an upload buffer because system memory is pinned for this resource.\n"); - return NULL; + return false; } if ((flags & WINED3D_MAP_NOOVERWRITE) && client->addr.buffer_object == CLIENT_BO_DISCARDED)

1 0

Henri Verbeet : d3d11/tests: Move the is_warp_device() call out of the loop in check_format_support().
by Alexandre Julliard 15 Sep '22

15 Sep '22

Module: wine Branch: master Commit: e5f5bea390d263e2119e25ee8802864409719941 URL: https://gitlab.winehq.org/wine/wine/-/commit/e5f5bea390d263e2119e25ee880286… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 14 11:34:27 2022 +0200 d3d11/tests: Move the is_warp_device() call out of the loop in check_format_support(). There's no point in querying this multiple times, it's not going to change. Perhaps more importantly, calling is_warp_device() inside a todo_wine block will cause "Test succeeded inside todo block: ..." messages from get_device_adapter_desc(). These appear to have been introduced by commit fcc276ecb1508d5217ec977ca530ee7d30d355b9. Arguably get_device_adapter_desc() shouldn't use ok() in the first place. --- dlls/d3d11/tests/d3d11.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 5e00bc7a336..bc7f8fd971d 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -20961,6 +20961,7 @@ static void check_format_support(ID3D11Device *device, const unsigned int *forma D3D_FEATURE_LEVEL feature_level, const struct format_support *formats, unsigned int format_count, unsigned int feature_flag, const char *feature_name) { + BOOL warp = is_warp_device(device); unsigned int i; for (i = 0; i < format_count; ++i) @@ -20971,7 +20972,7 @@ static void check_format_support(ID3D11Device *device, const unsigned int *forma if (formats[i].fl_required <= feature_level) { todo_wine_if (feature_flag == D3D11_FORMAT_SUPPORT_DISPLAY) - ok(supported || broken(is_warp_device(device)), + ok(supported || broken(warp), "Format %#x - %s not supported, format support %#x.\n", format, feature_name, format_support[format]); continue;

1 0

Henri Verbeet : d3d11: Implement d3d11_input_layout_to_wined3d_declaration() on top of vkd3d_shader_parse_input_signature().
by Alexandre Julliard 15 Sep '22

15 Sep '22

Module: wine Branch: master Commit: 7d20333faf8e93a3a16680cf1beadc9cdcb50c45 URL: https://gitlab.winehq.org/wine/wine/-/commit/7d20333faf8e93a3a16680cf1beadc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 14 11:33:48 2022 +0200 d3d11: Implement d3d11_input_layout_to_wined3d_declaration() on top of vkd3d_shader_parse_input_signature(). This was originally prompted by the fact that wined3d_extract_shader_input_signature_from_dxbc() allocates elements with HeapAlloc(), but d3d11_input_layout_to_wined3d_declaration() attempts to free them with free(). That's a regression introduced by commit b951c37b8791ceb052c9e159ad7927f75a72d667. Since we're touching the code though, we may as well use vkd3d_shader_parse_input_signature(), and get rid of wined3d_extract_shader_input_signature_from_dxbc(). --- dlls/d3d11/Makefile.in | 1 + dlls/d3d11/inputlayout.c | 30 ++++++++++++++------------ dlls/wined3d/shader_sm4.c | 23 -------------------- dlls/wined3d/wined3d.spec | 2 -- dlls/wined3d/wined3d_private.h | 46 +++++++++++++++++++++++++++++++++++++++ include/wine/wined3d.h | 49 ------------------------------------------ 6 files changed, 63 insertions(+), 88 deletions(-) diff --git a/dlls/d3d11/Makefile.in b/dlls/d3d11/Makefile.in index 5a56faec523..5197f9ef9d7 100644 --- a/dlls/d3d11/Makefile.in +++ b/dlls/d3d11/Makefile.in @@ -1,6 +1,7 @@ MODULE = d3d11.dll IMPORTLIB = d3d11 IMPORTS = dxguid uuid dxgi wined3d +EXTRAINCL = $(VKD3D_PE_CFLAGS) C_SRCS = \ async.c \ diff --git a/dlls/d3d11/inputlayout.c b/dlls/d3d11/inputlayout.c index cfdd0e980ed..9f26ef4032b 100644 --- a/dlls/d3d11/inputlayout.c +++ b/dlls/d3d11/inputlayout.c @@ -19,27 +19,28 @@ #include "d3d11_private.h" #include "winternl.h" +#include <vkd3d_shader.h> WINE_DEFAULT_DEBUG_CHANNEL(d3d11); -static BOOL is_vs_sysval_semantic(const struct wined3d_shader_signature_element *e) +static BOOL is_vs_sysval_semantic(const struct vkd3d_shader_signature_element *e) { return !stricmp(e->semantic_name, "sv_instanceid") || !stricmp(e->semantic_name, "sv_vertexid"); } static unsigned int find_input_element(const D3D11_INPUT_ELEMENT_DESC *element_descs, unsigned int element_count, - struct wined3d_shader_signature_element *ise) + const struct vkd3d_shader_signature_element *ise) { const D3D11_INPUT_ELEMENT_DESC *f; unsigned int i; - if (ise->stream_idx) + if (ise->stream_index) return element_count; for (i = 0; i < element_count; ++i) { f = &element_descs[i]; - if (!stricmp(ise->semantic_name, f->SemanticName) && ise->semantic_idx == f->SemanticIndex) + if (!stricmp(ise->semantic_name, f->SemanticName) && ise->semantic_index == f->SemanticIndex) return i; } return element_count; @@ -54,22 +55,23 @@ static HRESULT d3d11_input_layout_to_wined3d_declaration(const D3D11_INPUT_ELEME UINT element_count, const void *shader_byte_code, SIZE_T shader_byte_code_length, struct wined3d_vertex_element **wined3d_elements) { - struct wined3d_shader_signature_element *ise; - struct wined3d_shader_signature is; + const struct vkd3d_shader_code dxbc = {shader_byte_code, shader_byte_code_length}; + struct vkd3d_shader_signature_element *ise; const D3D11_INPUT_ELEMENT_DESC *f; + struct vkd3d_shader_signature is; unsigned int i, index; - HRESULT hr; + int ret; - if (FAILED(hr = wined3d_extract_shader_input_signature_from_dxbc(&is, shader_byte_code, shader_byte_code_length))) + if ((ret = vkd3d_shader_parse_input_signature(&dxbc, &is, NULL)) < 0) { - ERR("Failed to extract input signature.\n"); + ERR("Failed to extract input signature, ret %d.\n", ret); return E_FAIL; } if (!(*wined3d_elements = calloc(element_count, sizeof(**wined3d_elements)))) { ERR("Failed to allocate wined3d vertex element array memory.\n"); - free(is.elements); + vkd3d_shader_free_shader_signature(&is); return E_OUTOFMEMORY; } @@ -96,18 +98,18 @@ static HRESULT d3d11_input_layout_to_wined3d_declaration(const D3D11_INPUT_ELEME { if ((index = find_input_element(element_descs, element_count, &ise[i])) < element_count) { - (*wined3d_elements)[index].output_slot = ise[i].register_idx; + (*wined3d_elements)[index].output_slot = ise[i].register_index; } else if (!is_vs_sysval_semantic(&ise[i])) { - WARN("Input element %s%u not found in shader signature.\n", ise[i].semantic_name, ise[i].semantic_idx); + WARN("Input element %s%u not found in shader signature.\n", ise[i].semantic_name, ise[i].semantic_index); free(*wined3d_elements); - free(is.elements); + vkd3d_shader_free_shader_signature(&is); return E_INVALIDARG; } } - free(is.elements); + vkd3d_shader_free_shader_signature(&is); return S_OK; } diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index e60eb9b2fc4..73001d90833 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -2159,26 +2159,3 @@ HRESULT shader_extract_from_dxbc(struct wined3d_shader *shader, return hr; } - -static HRESULT shader_isgn_chunk_handler(const char *data, DWORD data_size, DWORD tag, void *ctx) -{ - struct wined3d_shader_signature *is = ctx; - - if (tag != TAG_ISGN) - return S_OK; - - if (is->elements) - { - FIXME("Multiple shader signatures.\n"); - return S_OK; - } - - return shader_parse_signature(tag, data, data_size, is); -} - -HRESULT CDECL wined3d_extract_shader_input_signature_from_dxbc(struct wined3d_shader_signature *signature, - const void *code, SIZE_T code_size) -{ - memset(signature, 0, sizeof(*signature)); - return parse_dxbc(code, code_size, shader_isgn_chunk_handler, signature); -} diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index a5cf7eca22c..e6126faf838 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -319,8 +319,6 @@ @ cdecl wined3d_vertex_declaration_get_parent(ptr) @ cdecl wined3d_vertex_declaration_incref(ptr) -@ cdecl wined3d_extract_shader_input_signature_from_dxbc(ptr ptr long) - @ cdecl vkd3d_create_instance(ptr ptr) @ cdecl vkd3d_instance_decref(ptr) @ cdecl vkd3d_instance_get_vk_instance(ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a87471fd5d1..5217ee7d221 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -778,6 +778,52 @@ enum wined3d_shader_conditional_op WINED3D_SHADER_CONDITIONAL_OP_Z = 1 }; +enum wined3d_sysval_semantic +{ + WINED3D_SV_POSITION = 0x01, + WINED3D_SV_CLIP_DISTANCE = 0x02, + WINED3D_SV_CULL_DISTANCE = 0x03, + WINED3D_SV_RENDER_TARGET_ARRAY_INDEX = 0x04, + WINED3D_SV_VIEWPORT_ARRAY_INDEX = 0x05, + WINED3D_SV_VERTEX_ID = 0x06, + WINED3D_SV_PRIMITIVE_ID = 0x07, + WINED3D_SV_INSTANCE_ID = 0x08, + WINED3D_SV_IS_FRONT_FACE = 0x09, + WINED3D_SV_SAMPLE_INDEX = 0x0a, + WINED3D_SV_TESS_FACTOR_QUADEDGE = 0x0b, + WINED3D_SV_TESS_FACTOR_QUADINT = 0x0c, + WINED3D_SV_TESS_FACTOR_TRIEDGE = 0x0d, + WINED3D_SV_TESS_FACTOR_TRIINT = 0x0e, + WINED3D_SV_TESS_FACTOR_LINEDET = 0x0f, + WINED3D_SV_TESS_FACTOR_LINEDEN = 0x10, +}; + +enum wined3d_component_type +{ + WINED3D_TYPE_UNKNOWN = 0x0, + WINED3D_TYPE_UINT = 0x1, + WINED3D_TYPE_INT = 0x2, + WINED3D_TYPE_FLOAT = 0x3, +}; + +struct wined3d_shader_signature_element +{ + const char *semantic_name; + unsigned int semantic_idx; + unsigned int stream_idx; + enum wined3d_sysval_semantic sysval_semantic; + enum wined3d_component_type component_type; + unsigned int register_idx; + uint32_t mask; + unsigned int min_precision; +}; + +struct wined3d_shader_signature +{ + unsigned int element_count; + struct wined3d_shader_signature_element *elements; +}; + #define WINED3D_SM1_VS 0xfffeu #define WINED3D_SM1_PS 0xffffu #define WINED3D_SM4_PS 0x0000u diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 1348b6fe368..d1147e03f66 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -811,34 +811,6 @@ enum wined3d_decl_usage WINED3D_DECL_USAGE_SAMPLE = 13 }; -enum wined3d_sysval_semantic -{ - WINED3D_SV_POSITION = 1, - WINED3D_SV_CLIP_DISTANCE = 2, - WINED3D_SV_CULL_DISTANCE = 3, - WINED3D_SV_RENDER_TARGET_ARRAY_INDEX = 4, - WINED3D_SV_VIEWPORT_ARRAY_INDEX = 5, - WINED3D_SV_VERTEX_ID = 6, - WINED3D_SV_PRIMITIVE_ID = 7, - WINED3D_SV_INSTANCE_ID = 8, - WINED3D_SV_IS_FRONT_FACE = 9, - WINED3D_SV_SAMPLE_INDEX = 10, - WINED3D_SV_TESS_FACTOR_QUADEDGE = 11, - WINED3D_SV_TESS_FACTOR_QUADINT = 12, - WINED3D_SV_TESS_FACTOR_TRIEDGE = 13, - WINED3D_SV_TESS_FACTOR_TRIINT = 14, - WINED3D_SV_TESS_FACTOR_LINEDET = 15, - WINED3D_SV_TESS_FACTOR_LINEDEN = 16, -}; - -enum wined3d_component_type -{ - WINED3D_TYPE_UNKNOWN = 0, - WINED3D_TYPE_UINT = 1, - WINED3D_TYPE_INT = 2, - WINED3D_TYPE_FLOAT = 3, -}; - enum wined3d_scanline_ordering { WINED3D_SCANLINE_ORDERING_UNKNOWN = 0, @@ -2113,24 +2085,6 @@ struct wined3d_sampler_desc BOOL srgb_decode; }; -struct wined3d_shader_signature_element -{ - const char *semantic_name; - unsigned int semantic_idx; - unsigned int stream_idx; - enum wined3d_sysval_semantic sysval_semantic; - enum wined3d_component_type component_type; - unsigned int register_idx; - DWORD mask; - unsigned int min_precision; -}; - -struct wined3d_shader_signature -{ - UINT element_count; - struct wined3d_shader_signature_element *elements; -}; - struct wined3d_shader_desc { const DWORD *byte_code; @@ -2930,9 +2884,6 @@ ULONG __cdecl wined3d_vertex_declaration_decref(struct wined3d_vertex_declaratio void * __cdecl wined3d_vertex_declaration_get_parent(const struct wined3d_vertex_declaration *declaration); ULONG __cdecl wined3d_vertex_declaration_incref(struct wined3d_vertex_declaration *declaration); -HRESULT __cdecl wined3d_extract_shader_input_signature_from_dxbc(struct wined3d_shader_signature *signature, - const void *byte_code, SIZE_T byte_code_size); - static inline void wined3d_streaming_buffer_init(struct wined3d_streaming_buffer *buffer, unsigned int bind_flags) { memset(buffer, 0, sizeof(*buffer));

1 0

Henri Verbeet : d3d9/tests: The expected scissor rect after a reset is equal to the back-buffer dimensions.
by Alexandre Julliard 15 Sep '22

15 Sep '22

Module: wine Branch: master Commit: bba63771eb742470046801ca4123613b32288624 URL: https://gitlab.winehq.org/wine/wine/-/commit/bba63771eb742470046801ca412361… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 15 14:35:52 2022 +0200 d3d9/tests: The expected scissor rect after a reset is equal to the back-buffer dimensions. This appears to have gotten lost in commit 7623d0a6f585505302044beace53fb8ff81ae120. --- dlls/d3d9/tests/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 119ab0b3b34..dbdce1e5871 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -3644,6 +3644,7 @@ static void test_scissor_size(void) hr = IDirect3DDevice9_GetScissorRect(device_ptr, &scissorrect); ok(hr == S_OK, "Got hr %#lx.\n", hr); + SetRect(&expect, 0, 0, registry_mode.dmPelsWidth, registry_mode.dmPelsHeight); ok(EqualRect(&scissorrect, &expect), "Expected rect %s, got %s.\n", wine_dbgstr_rect(&expect), wine_dbgstr_rect(&scissorrect));

1 0

Henri Verbeet : wined3d: Destroy the Vulkan command pool after cleaning up resources.
by Alexandre Julliard 15 Sep '22

15 Sep '22

Module: wine Branch: master Commit: 51466755ad52d80164f969fffcf1f7ba4699a4d2 URL: https://gitlab.winehq.org/wine/wine/-/commit/51466755ad52d80164f969fffcf1f7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 14 15:14:44 2022 +0200 wined3d: Destroy the Vulkan command pool after cleaning up resources. This fixes an issue exposed (but not caused) by commit e553be7e776282fea77b8b60304298d9de90bd8b. Calling vkFreeCommandBuffers() after the corresponding command pool was destroyed causes invalid memory accesses. Thanks to Jacek for pointing this out. --- dlls/wined3d/context_vk.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index db1840d29e2..d47f7cf5d1a 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1684,10 +1684,13 @@ void wined3d_context_vk_cleanup(struct wined3d_context_vk *context_vk) heap_free(context_vk->vk_descriptor_pools); if (context_vk->vk_framebuffer) VK_CALL(vkDestroyFramebuffer(device_vk->vk_device, context_vk->vk_framebuffer, NULL)); - VK_CALL(vkDestroyCommandPool(device_vk->vk_device, context_vk->vk_command_pool, NULL)); if (context_vk->vk_so_counter_bo.vk_buffer) wined3d_context_vk_destroy_bo(context_vk, &context_vk->vk_so_counter_bo); wined3d_context_vk_cleanup_resources(context_vk, VK_NULL_HANDLE); + /* Destroy the command pool after cleaning up resources. In particular, + * this needs to happen after all command buffers are freed, because + * vkFreeCommandBuffers() requires a valid pool handle. */ + VK_CALL(vkDestroyCommandPool(device_vk->vk_device, context_vk->vk_command_pool, NULL)); wined3d_context_vk_destroy_query_pools(context_vk, &context_vk->free_occlusion_query_pools); wined3d_context_vk_destroy_query_pools(context_vk, &context_vk->free_timestamp_query_pools); wined3d_context_vk_destroy_query_pools(context_vk, &context_vk->free_pipeline_statistics_query_pools);

1 0

Henri Verbeet : wined3d: Fix the sub-resource index validation in wined3d_texture_update_overlay().
by Alexandre Julliard 15 Sep '22

15 Sep '22

Module: wine Branch: master Commit: 99a3bc3c2b295cb7dfbbec1468f95725451efd5e URL: https://gitlab.winehq.org/wine/wine/-/commit/99a3bc3c2b295cb7dfbbec1468f957… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 14 15:43:21 2022 +0200 wined3d: Fix the sub-resource index validation in wined3d_texture_update_overlay(). This condition accidentally got inverted when wined3d_texture_validate_sub_resource_idx() was introduced in commit 44d6f2adbcca119faebc095f3cfbeeafc50d04f3. --- dlls/wined3d/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 88404c9f8a8..a065d0ae54f 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -4242,7 +4242,7 @@ HRESULT CDECL wined3d_texture_update_overlay(struct wined3d_texture *texture, un return WINEDDERR_NOTAOVERLAYSURFACE; if (!dst_texture || dst_texture->resource.type != WINED3D_RTYPE_TEXTURE_2D - || wined3d_texture_validate_sub_resource_idx(dst_texture, dst_sub_resource_idx)) + || !wined3d_texture_validate_sub_resource_idx(dst_texture, dst_sub_resource_idx)) return WINED3DERR_INVALIDCALL; overlay = &texture->overlay_info[sub_resource_idx];

1 0

Alexandre Julliard : d2d1/tests: Skip subsequent todo tests for unsupported properties.
by Alexandre Julliard 15 Sep '22

15 Sep '22

Module: wine Branch: master Commit: 064edf1df476ef8ac1f0c8a11eb8ffb419ebd366 URL: https://gitlab.winehq.org/wine/wine/-/commit/064edf1df476ef8ac1f0c8a11eb8ff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 15 11:17:59 2022 +0200 d2d1/tests: Skip subsequent todo tests for unsupported properties. This reduces the number of printed todos in order to stay within the 32kB limit. --- dlls/d2d1/tests/d2d1.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 5043b8b02b3..08c7bc05224 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -10416,13 +10416,15 @@ static void check_system_properties_(unsigned int line, ID2D1Effect *effect, BOO name[0] = 0; hr = ID2D1Effect_GetPropertyName(effect, test->index, name, sizeof(name)); todo_wine_if((is_builtin && (test->type == D2D1_PROPERTY_TYPE_ARRAY || test->type == D2D1_PROPERTY_TYPE_STRING))) - { ok_(__FILE__, line)(hr == S_OK, "Failed to get property name, hr %#lx\n", hr); + if (hr == D2DERR_INVALID_PROPERTY) + { + winetest_pop_context(); + continue; + } ok_(__FILE__, line)(!wcscmp(name, test->name), "Got unexpected property name %s, expected %s.\n", debugstr_w(name), debugstr_w(test->name)); - } - type = D2D1_PROPERTY_TYPE_UNKNOWN; type = ID2D1Effect_GetType(effect, test->index); todo_wine_if((is_builtin && (test->type == D2D1_PROPERTY_TYPE_ARRAY || test->type == D2D1_PROPERTY_TYPE_STRING))) ok_(__FILE__, line)(type == test->type, "Got unexpected property type %#x, expected %#x.\n", @@ -11743,6 +11745,12 @@ static void test_effect_2d_affine(BOOL d3d11) D2D1_PROPERTY_TYPE_MATRIX_3X2, (const BYTE *)test->matrix, sizeof(*test->matrix)); todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + if (hr == D2DERR_INVALID_PROPERTY) + { + ID2D1Bitmap1_Release(bitmap); + winetest_pop_context(); + continue; + } ID2D1Effect_GetOutput(effect, &output); ID2D1DeviceContext_GetImageLocalBounds(context, output, &output_bounds); @@ -11858,6 +11866,12 @@ static void test_effect_crop(BOOL d3d11) (const BYTE *)&test->crop_rect, sizeof(test->crop_rect)); todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + if (hr == D2DERR_INVALID_PROPERTY) + { + ID2D1Bitmap1_Release(bitmap); + winetest_pop_context(); + continue; + } ID2D1Effect_GetOutput(effect, &output); set_rect(&output_bounds, -1.0f, -1.0f, -1.0f, -1.0f);

1 0

Jacek Caban : wininet/tests: Don't send two HTTP responses for a single request in server_thread.
by Alexandre Julliard 15 Sep '22

15 Sep '22

Module: wine Branch: master Commit: 2d8850365b51c4bf7e7d085ef42c3264bc710d8e URL: https://gitlab.winehq.org/wine/wine/-/commit/2d8850365b51c4bf7e7d085ef42c32… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 15 17:38:06 2022 +0200 wininet/tests: Don't send two HTTP responses for a single request in server_thread. --- dlls/wininet/tests/http.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index aadedd27f24..8fcb9df293a 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2407,7 +2407,7 @@ static DWORD CALLBACK server_thread(LPVOID param) "Content-Length: 10\r\n\r\n0123456789"; send(c, nocontentmsg, sizeof(nocontentmsg)-1, 0); } - if (strstr(buffer, "GET /test_no_content")) + else if (strstr(buffer, "GET /test_no_content")) { static const char nocontentmsg[] = "HTTP/1.1 204 No Content\r\nConnection: close\r\n\r\n" "0123456789";

1 0

Mohamad Al-Jaf : winusb: Add WinUsb_Free stub.
by Alexandre Julliard 15 Sep '22

15 Sep '22

Module: wine Branch: master Commit: 1df5309a822ac33daabda5654a3eaf93b88dffea URL: https://gitlab.winehq.org/wine/wine/-/commit/1df5309a822ac33daabda5654a3eaf… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sun Sep 11 23:58:39 2022 -0400 winusb: Add WinUsb_Free stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52677 Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- dlls/winusb/Makefile.in | 3 +++ dlls/winusb/main.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/winusb/winusb.spec | 2 +- 3 files changed, 40 insertions(+), 1 deletion(-) diff --git a/dlls/winusb/Makefile.in b/dlls/winusb/Makefile.in index c8cab4dbed9..d33bf088362 100644 --- a/dlls/winusb/Makefile.in +++ b/dlls/winusb/Makefile.in @@ -1 +1,4 @@ MODULE = winusb.dll + +C_SRCS = \ + main.c diff --git a/dlls/winusb/main.c b/dlls/winusb/main.c new file mode 100644 index 00000000000..52682a5f53d --- /dev/null +++ b/dlls/winusb/main.c @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2022 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winusb.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(winusb); + +/*********************************************************************** + * WinUsb_Free (winusb.@) + */ +BOOL WINAPI WinUsb_Free(WINUSB_INTERFACE_HANDLE handle) +{ + FIXME( "(%p) - stub\n", handle ); + return TRUE; +} diff --git a/dlls/winusb/winusb.spec b/dlls/winusb/winusb.spec index 09371e9ee46..a0b57d58096 100644 --- a/dlls/winusb/winusb.spec +++ b/dlls/winusb/winusb.spec @@ -1,7 +1,7 @@ @ stub WinUsb_AbortPipe @ stub WinUsb_ControlTransfer @ stub WinUsb_FlushPipe -@ stub WinUsb_Free +@ stdcall WinUsb_Free(ptr) @ stub WinUsb_GetAssociatedInterface @ stub WinUsb_GetCurrentAlternateSetting @ stub WinUsb_GetDescriptor

1 0

Mohamad Al-Jaf : include: Add winusb.h file.
by Alexandre Julliard 15 Sep '22

15 Sep '22

Module: wine Branch: master Commit: 437bdce96cf80266e607d6dff8135e5a24974dec URL: https://gitlab.winehq.org/wine/wine/-/commit/437bdce96cf80266e607d6dff8135e… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sun Sep 11 23:56:59 2022 -0400 include: Add winusb.h file. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- include/Makefile.in | 1 + include/winusb.h | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 70134a7bcb7..0598a3ce3de 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -890,6 +890,7 @@ SOURCES = \ wintabx.h \ winternl.h \ wintrust.h \ + winusb.h \ winuser.h \ winuser.rh \ winver.h \ diff --git a/include/winusb.h b/include/winusb.h new file mode 100644 index 00000000000..77b686b4c7c --- /dev/null +++ b/include/winusb.h @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2022 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _WINUSB_H_ +#define _WINUSB_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +typedef PVOID WINUSB_INTERFACE_HANDLE, *PWINUSB_INTERFACE_HANDLE; + +BOOL WINAPI WinUsb_Free(WINUSB_INTERFACE_HANDLE); + +#ifdef __cplusplus +} +#endif + +#endif /* _WINUSB_H_ */

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
56
Older →

Jump to page:

2025

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 September 2022