wine-commits July 2020

wine-commits@winehq.org

1 participants
826 discussions

Henri Verbeet : vkd3d-shader: Report error messages from vkd3d_shader_parse_root_signature().
by Alexandre Julliard 30 Jul '20

30 Jul '20

Module: vkd3d Branch: master Commit: 33eb944bf425a1fe21cf9b54daa299092fe730b1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=33eb944bf425a1fe21cf9b5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 30 15:17:57 2020 +0430 vkd3d-shader: Report error messages from vkd3d_shader_parse_root_signature(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 4 ++-- libs/vkd3d-shader/dxbc.c | 13 ++++++++++--- libs/vkd3d-shader/vkd3d_shader_main.c | 6 ++---- libs/vkd3d-shader/vkd3d_shader_private.h | 5 +++++ libs/vkd3d/vkd3d_main.c | 4 ++-- tests/vkd3d_shader_api.c | 2 +- 6 files changed, 22 insertions(+), 12 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 0dd9829..8ee6724 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -753,7 +753,7 @@ void vkd3d_shader_free_messages(char *messages); void vkd3d_shader_free_shader_code(struct vkd3d_shader_code *code); int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc, - struct vkd3d_shader_versioned_root_signature_desc *root_signature); + struct vkd3d_shader_versioned_root_signature_desc *root_signature, char **messages); void vkd3d_shader_free_root_signature(struct vkd3d_shader_versioned_root_signature_desc *root_signature); /* FIXME: Add support for returning error messages (ID3DBlob). */ @@ -784,7 +784,7 @@ typedef void (*PFN_vkd3d_shader_free_messages)(char *messages); typedef void (*PFN_vkd3d_shader_free_shader_code)(struct vkd3d_shader_code *code); typedef int (*PFN_vkd3d_shader_parse_root_signature)(const struct vkd3d_shader_code *dxbc, - struct vkd3d_shader_versioned_root_signature_desc *root_signature); + struct vkd3d_shader_versioned_root_signature_desc *root_signature, char **messages); typedef void (*PFN_vkd3d_shader_free_root_signature)(struct vkd3d_shader_versioned_root_signature_desc *root_signature); typedef int (*PFN_vkd3d_shader_serialize_root_signature)( diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index a00dbe9..28159a9 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2679,17 +2679,24 @@ static int rts0_handler(const char *data, DWORD data_size, DWORD tag, void *cont } int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc, - struct vkd3d_shader_versioned_root_signature_desc *root_signature) + struct vkd3d_shader_versioned_root_signature_desc *root_signature, char **messages) { struct vkd3d_shader_message_context message_context; int ret; - TRACE("dxbc {%p, %zu}, root_signature %p.\n", dxbc->code, dxbc->size, root_signature); + TRACE("dxbc {%p, %zu}, root_signature %p, messages %p.\n", dxbc->code, dxbc->size, root_signature, messages); memset(root_signature, 0, sizeof(*root_signature)); - if (!vkd3d_shader_message_context_init(&message_context, VKD3D_SHADER_LOG_NONE, NULL)) + if (messages) + *messages = NULL; + if (!vkd3d_shader_message_context_init(&message_context, VKD3D_SHADER_LOG_INFO, NULL)) return VKD3D_ERROR; + ret = parse_dxbc(dxbc->code, dxbc->size, &message_context, rts0_handler, root_signature); + vkd3d_shader_message_context_trace_messages(&message_context); + if (messages && !(*messages = vkd3d_shader_message_context_copy_messages(&message_context))) + ret = VKD3D_ERROR_OUT_OF_MEMORY; + vkd3d_shader_message_context_cleanup(&message_context); if (ret < 0) vkd3d_shader_free_root_signature(root_signature); diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 6511a89..0785c14 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -133,15 +133,13 @@ void vkd3d_shader_message_context_cleanup(struct vkd3d_shader_message_context *c vkd3d_string_buffer_cleanup(&context->messages); } -#define vkd3d_shader_message_context_trace_messages(context) \ - vkd3d_shader_message_context_trace_messages_(context, __FUNCTION__) -static void vkd3d_shader_message_context_trace_messages_(const struct vkd3d_shader_message_context *context, +void vkd3d_shader_message_context_trace_messages_(const struct vkd3d_shader_message_context *context, const char *function) { vkd3d_string_buffer_trace_(&context->messages, function); } -static char *vkd3d_shader_message_context_copy_messages(struct vkd3d_shader_message_context *context) +char *vkd3d_shader_message_context_copy_messages(struct vkd3d_shader_message_context *context) { char *messages; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 79056b3..3161087 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -830,8 +830,13 @@ struct vkd3d_shader_message_context }; void vkd3d_shader_message_context_cleanup(struct vkd3d_shader_message_context *context) DECLSPEC_HIDDEN; +char *vkd3d_shader_message_context_copy_messages(struct vkd3d_shader_message_context *context) DECLSPEC_HIDDEN; bool vkd3d_shader_message_context_init(struct vkd3d_shader_message_context *context, enum vkd3d_shader_log_level log_level, const char *source_name) DECLSPEC_HIDDEN; +void vkd3d_shader_message_context_trace_messages_(const struct vkd3d_shader_message_context *context, + const char *function) DECLSPEC_HIDDEN; +#define vkd3d_shader_message_context_trace_messages(context) \ + vkd3d_shader_message_context_trace_messages_(context, __FUNCTION__) void vkd3d_shader_error(struct vkd3d_shader_message_context *context, enum vkd3d_shader_error error, const char *format, ...) VKD3D_PRINTF_FUNC(3, 4) DECLSPEC_HIDDEN; diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index 5d7c71e..3fd9c1b 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -174,7 +174,7 @@ int vkd3d_parse_root_signature_v_1_0(const struct vkd3d_shader_code *dxbc, struct vkd3d_shader_versioned_root_signature_desc desc, converted_desc; int ret; - if ((ret = vkd3d_shader_parse_root_signature(dxbc, &desc)) < 0) + if ((ret = vkd3d_shader_parse_root_signature(dxbc, &desc, NULL)) < 0) { WARN("Failed to parse root signature, vkd3d result %d.\n", ret); return ret; @@ -389,7 +389,7 @@ static HRESULT d3d12_versioned_root_signature_deserializer_init(struct d3d12_ver deserializer->ID3D12VersionedRootSignatureDeserializer_iface.lpVtbl = &d3d12_versioned_root_signature_deserializer_vtbl; deserializer->refcount = 1; - if ((ret = vkd3d_shader_parse_root_signature(dxbc, &deserializer->desc.vkd3d)) < 0) + if ((ret = vkd3d_shader_parse_root_signature(dxbc, &deserializer->desc.vkd3d, NULL)) < 0) { WARN("Failed to parse root signature, vkd3d result %d.\n", ret); return hresult_from_vkd3d_result(ret); diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c index 6977945..a730c86 100644 --- a/tests/vkd3d_shader_api.c +++ b/tests/vkd3d_shader_api.c @@ -129,7 +129,7 @@ static void test_vkd3d_shader_pfns(void) rc = pfn_vkd3d_shader_serialize_root_signature(&empty_rs_desc, &dxbc); ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); - rc = pfn_vkd3d_shader_parse_root_signature(&dxbc, &root_signature_desc); + rc = pfn_vkd3d_shader_parse_root_signature(&dxbc, &root_signature_desc, NULL); ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); pfn_vkd3d_shader_free_root_signature(&root_signature_desc); pfn_vkd3d_shader_free_shader_code(&dxbc);

1 0

Henri Verbeet : vkd3d-shader: Report error messages from vkd3d_shader_parse_input_signature().
by Alexandre Julliard 30 Jul '20

30 Jul '20

Module: vkd3d Branch: master Commit: d135b4687b79bc45928c467510b4c3f0a79b8ea0 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d135b4687b79bc45928c467… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 30 15:17:56 2020 +0430 vkd3d-shader: Report error messages from vkd3d_shader_parse_input_signature(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 4 ++-- libs/vkd3d-shader/dxbc.c | 8 ++------ libs/vkd3d-shader/vkd3d_shader_main.c | 21 ++++++++++++++++++--- libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- libs/vkd3d/state.c | 2 +- tests/vkd3d_shader_api.c | 2 +- 6 files changed, 25 insertions(+), 14 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 96d0545..0dd9829 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -767,7 +767,7 @@ int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char void vkd3d_shader_free_scan_descriptor_info(struct vkd3d_shader_scan_descriptor_info *scan_descriptor_info); int vkd3d_shader_parse_input_signature(const struct vkd3d_shader_code *dxbc, - struct vkd3d_shader_signature *signature); + struct vkd3d_shader_signature *signature, char **messages); struct vkd3d_shader_signature_element *vkd3d_shader_find_signature_element( const struct vkd3d_shader_signature *signature, const char *semantic_name, unsigned int semantic_index, unsigned int stream_index); @@ -798,7 +798,7 @@ typedef void (*PFN_vkd3d_shader_free_scan_descriptor_info)( struct vkd3d_shader_scan_descriptor_info *scan_descriptor_info); typedef int (*PFN_vkd3d_shader_parse_input_signature)(const struct vkd3d_shader_code *dxbc, - struct vkd3d_shader_signature *signature); + struct vkd3d_shader_signature *signature, char **messages); typedef struct vkd3d_shader_signature_element * (*PFN_vkd3d_shader_find_signature_element)( const struct vkd3d_shader_signature *signature, const char *semantic_name, unsigned int semantic_index, unsigned int stream_index); diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index f738abe..a00dbe9 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2132,17 +2132,13 @@ static int isgn_handler(const char *data, DWORD data_size, DWORD tag, void *ctx) } int shader_parse_input_signature(const void *dxbc, size_t dxbc_length, - struct vkd3d_shader_signature *signature) + struct vkd3d_shader_message_context *message_context, struct vkd3d_shader_signature *signature) { - struct vkd3d_shader_message_context message_context; int ret; memset(signature, 0, sizeof(*signature)); - if (!vkd3d_shader_message_context_init(&message_context, VKD3D_SHADER_LOG_NONE, NULL)) - return VKD3D_ERROR; - if ((ret = parse_dxbc(dxbc, dxbc_length, &message_context, isgn_handler, signature)) < 0) + if ((ret = parse_dxbc(dxbc, dxbc_length, message_context, isgn_handler, signature)) < 0) ERR("Failed to parse input signature.\n"); - vkd3d_shader_message_context_cleanup(&message_context); return ret; } diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 5d50487..6511a89 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -971,11 +971,26 @@ void vkd3d_shader_free_root_signature(struct vkd3d_shader_versioned_root_signatu } int vkd3d_shader_parse_input_signature(const struct vkd3d_shader_code *dxbc, - struct vkd3d_shader_signature *signature) + struct vkd3d_shader_signature *signature, char **messages) { - TRACE("dxbc {%p, %zu}, signature %p.\n", dxbc->code, dxbc->size, signature); + struct vkd3d_shader_message_context message_context; + int ret; + + TRACE("dxbc {%p, %zu}, signature %p, messages %p.\n", dxbc->code, dxbc->size, signature, messages); + + if (messages) + *messages = NULL; + if (!vkd3d_shader_message_context_init(&message_context, VKD3D_SHADER_LOG_INFO, NULL)) + return VKD3D_ERROR; - return shader_parse_input_signature(dxbc->code, dxbc->size, signature); + ret = shader_parse_input_signature(dxbc->code, dxbc->size, &message_context, signature); + vkd3d_shader_message_context_trace_messages(&message_context); + if (messages && !(*messages = vkd3d_shader_message_context_copy_messages(&message_context))) + ret = VKD3D_ERROR_OUT_OF_MEMORY; + + vkd3d_shader_message_context_cleanup(&message_context); + + return ret; } struct vkd3d_shader_signature_element *vkd3d_shader_find_signature_element( diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index ae2f6c2..79056b3 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -840,7 +840,7 @@ int shader_extract_from_dxbc(const void *dxbc, size_t dxbc_length, void free_shader_desc(struct vkd3d_shader_desc *desc) DECLSPEC_HIDDEN; int shader_parse_input_signature(const void *dxbc, size_t dxbc_length, - struct vkd3d_shader_signature *signature) DECLSPEC_HIDDEN; + struct vkd3d_shader_message_context *message_context, struct vkd3d_shader_signature *signature) DECLSPEC_HIDDEN; struct vkd3d_dxbc_compiler; diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 93f22ce..449f242 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2316,7 +2316,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s switch (shader_stages[i].stage) { case VK_SHADER_STAGE_VERTEX_BIT: - if ((ret = vkd3d_shader_parse_input_signature(&dxbc, &input_signature)) < 0) + if ((ret = vkd3d_shader_parse_input_signature(&dxbc, &input_signature, NULL)) < 0) { hr = hresult_from_vkd3d_result(ret); goto fail; diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c index be63b39..6977945 100644 --- a/tests/vkd3d_shader_api.c +++ b/tests/vkd3d_shader_api.c @@ -134,7 +134,7 @@ static void test_vkd3d_shader_pfns(void) pfn_vkd3d_shader_free_root_signature(&root_signature_desc); pfn_vkd3d_shader_free_shader_code(&dxbc); - rc = pfn_vkd3d_shader_parse_input_signature(&vs, &signature); + rc = pfn_vkd3d_shader_parse_input_signature(&vs, &signature, NULL); ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); element = pfn_vkd3d_shader_find_signature_element(&signature, "position", 0, 0); ok(element, "Could not find shader signature element.\n");

1 0

Henri Verbeet : vkd3d-shader: Pass a vkd3d_shader_compile_info structure to vkd3d_shader_scan_dxbc().
by Alexandre Julliard 30 Jul '20

30 Jul '20

Module: vkd3d Branch: master Commit: 11f82d985c4e2f32f0b8c2ccabe2aca51eada245 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=11f82d985c4e2f32f0b8c2c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 30 15:17:55 2020 +0430 vkd3d-shader: Pass a vkd3d_shader_compile_info structure to vkd3d_shader_scan_dxbc(). In order to allow it to handle different source types. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 18 +++--- libs/vkd3d-shader/spirv.c | 33 ++--------- libs/vkd3d-shader/vkd3d_shader.map | 4 +- libs/vkd3d-shader/vkd3d_shader_main.c | 97 +++++++++++++++++++------------- libs/vkd3d-shader/vkd3d_shader_private.h | 23 +++++++- libs/vkd3d/state.c | 41 ++++++++++---- tests/vkd3d_shader_api.c | 20 +++++-- 7 files changed, 141 insertions(+), 95 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=11f82d985c4e2f32f0b…

1 0

Henri Verbeet : vkd3d-shader: Validate control flow instructions in vkd3d_shader_scan_dxbc().
by Alexandre Julliard 30 Jul '20

30 Jul '20

Module: vkd3d Branch: master Commit: 1c8077546ef3d7ea787b6622ea456951f6bd2cfd URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1c8077546ef3d7ea787b662… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 30 15:17:54 2020 +0430 vkd3d-shader: Validate control flow instructions in vkd3d_shader_scan_dxbc(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/vkd3d_shader_main.c | 276 +++++++++++++++++++++++++++++-- libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 2 files changed, 259 insertions(+), 18 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=1c8077546ef3d7ea787…

1 0

Zebediah Figura : ntdll: Append ntdll.dll to the builtin_modules list.
by Alexandre Julliard 29 Jul '20

29 Jul '20

Module: wine Branch: master Commit: b7e51a1653320d06a9c04f53d0d9e7eda577c31b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7e51a1653320d06a9c04f53… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jul 29 11:41:05 2020 -0500 ntdll: Append ntdll.dll to the builtin_modules list. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49626 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 499d9bf58b..bd3a095875 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1301,7 +1301,10 @@ static HMODULE load_ntdll(void) if ((fd = open( name, O_RDONLY )) != -1) { - status = virtual_map_ntdll( fd, &module ); + struct stat st; + fstat( fd, &st ); + if (!(status = virtual_map_ntdll( fd, &module ))) + add_builtin_module( module, NULL, &st ); close( fd ); } else

1 0

Zebediah Figura : ntdll: Compare builtins by their device and inode number directly.
by Alexandre Julliard 29 Jul '20

29 Jul '20

Module: wine Branch: master Commit: 3f8d60e2ac5997766f19107aef23e351c7d68a03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f8d60e2ac5997766f19107a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jul 29 11:41:04 2020 -0500 ntdll: Compare builtins by their device and inode number directly. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index afb6405864..499d9bf58b 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -129,7 +129,8 @@ static HMODULE ntdll_module; struct file_id { - BYTE ObjectId[16]; + dev_t dev; + ino_t ino; }; struct builtin_module @@ -142,13 +143,17 @@ struct builtin_module static struct list builtin_modules = LIST_INIT( builtin_modules ); -static NTSTATUS add_builtin_module( void *module, void *handle, const FILE_OBJECTID_BUFFER *id ) +static NTSTATUS add_builtin_module( void *module, void *handle, const struct stat *st ) { struct builtin_module *builtin; if (!(builtin = malloc( sizeof(*builtin) ))) return STATUS_NO_MEMORY; builtin->handle = handle; builtin->module = module; - if (id) memcpy( &builtin->id, id->ObjectId, sizeof(builtin->id) ); + if (st) + { + builtin->id.dev = st->st_dev; + builtin->id.ino = st->st_ino; + } else memset( &builtin->id, 0, sizeof(builtin->id) ); list_add_tail( &builtin_modules, &builtin->entry ); return STATUS_SUCCESS; @@ -996,9 +1001,7 @@ static NTSTATUS open_dll_file( const char *name, void **module, pe_image_info_t { struct builtin_module *builtin; OBJECT_ATTRIBUTES attr = { sizeof(attr) }; - IO_STATUS_BLOCK io; LARGE_INTEGER size; - FILE_OBJECTID_BUFFER id; struct stat st; SIZE_T len = 0; NTSTATUS status; @@ -1017,11 +1020,11 @@ static NTSTATUS open_dll_file( const char *name, void **module, pe_image_info_t return STATUS_DLL_NOT_FOUND; } - if (!NtFsControlFile( handle, 0, NULL, NULL, &io, FSCTL_GET_OBJECT_ID, NULL, 0, &id, sizeof(id) )) + if (!stat( name, &st )) { LIST_FOR_EACH_ENTRY( builtin, &builtin_modules, struct builtin_module, entry ) { - if (!memcmp( &builtin->id, id.ObjectId, sizeof(builtin->id) )) + if (builtin->id.dev == st.st_dev && builtin->id.ino == st.st_ino) { TRACE( "%s is the same file as existing module %p\n", debugstr_a(name), builtin->module ); @@ -1032,7 +1035,7 @@ static NTSTATUS open_dll_file( const char *name, void **module, pe_image_info_t } } } - else memset( id.ObjectId, 0, sizeof(id.ObjectId) ); + else memset( &st, 0, sizeof(st) ); size.QuadPart = 0; status = NtCreateSection( &mapping, STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | @@ -1063,7 +1066,7 @@ static NTSTATUS open_dll_file( const char *name, void **module, pe_image_info_t status = STATUS_IMAGE_MACHINE_TYPE_MISMATCH; } - if (!status) status = add_builtin_module( *module, NULL, &id ); + if (!status) status = add_builtin_module( *module, NULL, &st ); if (status) {

1 0

Jeff Smith : usp10: Fix typo in comment about box drawing unicode range.
by Alexandre Julliard 29 Jul '20

29 Jul '20

Module: wine Branch: master Commit: d9c085f1821790ef00f55b95e904704559565ff9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9c085f1821790ef00f55b95… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Wed Jul 29 13:12:26 2020 -0500 usp10: Fix typo in comment about box drawing unicode range. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/usp10.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index a6664279b5..84cd6aa709 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -169,7 +169,7 @@ script_ranges[] = /* Control Pictures : U+2400 –U+243f */ /* Optical Character Recognition : U+2440 –U+245f */ /* Enclosed Alphanumerics : U+2460 –U+24ff */ - /* Box Drawing : U+2500 –U+25ff */ + /* Box Drawing : U+2500 –U+257f */ /* Block Elements : U+2580 –U+259f */ /* Geometric Shapes : U+25a0 –U+25ff */ /* Miscellaneous Symbols : U+2600 –U+26ff */

1 0

Gijs Vermeulen : amstream: Get rid of the IAudioStreamSampleImpl typedef.
by Alexandre Julliard 29 Jul '20

29 Jul '20

Module: wine Branch: master Commit: e68e74a1bc9b77844ff118c9d032c552bbb8ee02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e68e74a1bc9b77844ff118c9… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Wed Jul 29 12:30:37 2020 +0200 amstream: Get rid of the IAudioStreamSampleImpl typedef. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/audiostream.c | 98 ++++++++++++++++++++++----------------------- 1 file changed, 47 insertions(+), 51 deletions(-) diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index 41f225d022..072850aae7 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -63,7 +63,8 @@ struct audio_stream struct list update_queue; }; -typedef struct { +struct audio_sample +{ IAudioStreamSample IAudioStreamSample_iface; LONG ref; struct audio_stream *parent; @@ -77,7 +78,7 @@ typedef struct { BYTE *pointer; DWORD position; HRESULT update_hr; -} IAudioStreamSampleImpl; +}; static void remove_queued_receive(struct queued_receive *receive) { @@ -86,7 +87,7 @@ static void remove_queued_receive(struct queued_receive *receive) free(receive); } -static void remove_queued_update(IAudioStreamSampleImpl *sample) +static void remove_queued_update(struct audio_sample *sample) { HRESULT hr; @@ -112,7 +113,7 @@ static STREAM_TIME stream_time_from_position(struct audio_stream *stream, struct return receive->start_time + (receive->position * 10000000 + format->nAvgBytesPerSec / 2) / format->nAvgBytesPerSec; } -static void process_update(IAudioStreamSampleImpl *sample, struct queued_receive *receive) +static void process_update(struct audio_sample *sample, struct queued_receive *receive) { DWORD advance; @@ -134,7 +135,7 @@ static void process_updates(struct audio_stream *stream) { while (!list_empty(&stream->update_queue) && !list_empty(&stream->receive_queue)) { - IAudioStreamSampleImpl *sample = LIST_ENTRY(list_head(&stream->update_queue), IAudioStreamSampleImpl, entry); + struct audio_sample *sample = LIST_ENTRY(list_head(&stream->update_queue), struct audio_sample, entry); struct queued_receive *receive = LIST_ENTRY(list_head(&stream->receive_queue), struct queued_receive, entry); process_update(sample, receive); @@ -148,7 +149,7 @@ static void process_updates(struct audio_stream *stream) { while (!list_empty(&stream->update_queue)) { - IAudioStreamSampleImpl *sample = LIST_ENTRY(list_head(&stream->update_queue), IAudioStreamSampleImpl, entry); + struct audio_sample *sample = LIST_ENTRY(list_head(&stream->update_queue), struct audio_sample, entry); sample->update_hr = sample->position ? S_OK : MS_S_ENDOFSTREAM; remove_queued_update(sample); @@ -156,13 +157,13 @@ static void process_updates(struct audio_stream *stream) } } -static inline IAudioStreamSampleImpl *impl_from_IAudioStreamSample(IAudioStreamSample *iface) +static inline struct audio_sample *impl_from_IAudioStreamSample(IAudioStreamSample *iface) { - return CONTAINING_RECORD(iface, IAudioStreamSampleImpl, IAudioStreamSample_iface); + return CONTAINING_RECORD(iface, struct audio_sample, IAudioStreamSample_iface); } /*** IUnknown methods ***/ -static HRESULT WINAPI IAudioStreamSampleImpl_QueryInterface(IAudioStreamSample *iface, +static HRESULT WINAPI audio_sample_QueryInterface(IAudioStreamSample *iface, REFIID riid, void **ret_iface) { TRACE("(%p)->(%s,%p)\n", iface, debugstr_guid(riid), ret_iface); @@ -182,38 +183,33 @@ static HRESULT WINAPI IAudioStreamSampleImpl_QueryInterface(IAudioStreamSample * return E_NOINTERFACE; } -static ULONG WINAPI IAudioStreamSampleImpl_AddRef(IAudioStreamSample *iface) +static ULONG WINAPI audio_sample_AddRef(IAudioStreamSample *iface) { - IAudioStreamSampleImpl *This = impl_from_IAudioStreamSample(iface); - ULONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p)->(): new ref = %u\n", iface, ref); - - return ref; + struct audio_sample *sample = impl_from_IAudioStreamSample(iface); + ULONG refcount = InterlockedIncrement(&sample->ref); + TRACE("%p increasing refcount to %u.\n", sample, refcount); + return refcount; } -static ULONG WINAPI IAudioStreamSampleImpl_Release(IAudioStreamSample *iface) +static ULONG WINAPI audio_sample_Release(IAudioStreamSample *iface) { - IAudioStreamSampleImpl *This = impl_from_IAudioStreamSample(iface); - ULONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p)->(): new ref = %u\n", iface, ref); - - if (!ref) + struct audio_sample *sample = impl_from_IAudioStreamSample(iface); + ULONG refcount = InterlockedDecrement(&sample->ref); + TRACE("%p decreasing refcount to %u.\n", sample, refcount); + if (!refcount) { - IAMMediaStream_Release(&This->parent->IAMMediaStream_iface); - IAudioData_Release(This->audio_data); - CloseHandle(This->update_event); - HeapFree(GetProcessHeap(), 0, This); + IAMMediaStream_Release(&sample->parent->IAMMediaStream_iface); + IAudioData_Release(sample->audio_data); + CloseHandle(sample->update_event); + HeapFree(GetProcessHeap(), 0, sample); } - - return ref; + return refcount; } /*** IStreamSample methods ***/ -static HRESULT WINAPI IAudioStreamSampleImpl_GetMediaStream(IAudioStreamSample *iface, IMediaStream **media_stream) +static HRESULT WINAPI audio_sample_GetMediaStream(IAudioStreamSample *iface, IMediaStream **media_stream) { - IAudioStreamSampleImpl *sample = impl_from_IAudioStreamSample(iface); + struct audio_sample *sample = impl_from_IAudioStreamSample(iface); TRACE("sample %p, media_stream %p.\n", iface, media_stream); @@ -226,10 +222,10 @@ static HRESULT WINAPI IAudioStreamSampleImpl_GetMediaStream(IAudioStreamSample * return S_OK; } -static HRESULT WINAPI IAudioStreamSampleImpl_GetSampleTimes(IAudioStreamSample *iface, STREAM_TIME *start_time, +static HRESULT WINAPI audio_sample_GetSampleTimes(IAudioStreamSample *iface, STREAM_TIME *start_time, STREAM_TIME *end_time, STREAM_TIME *current_time) { - IAudioStreamSampleImpl *sample = impl_from_IAudioStreamSample(iface); + struct audio_sample *sample = impl_from_IAudioStreamSample(iface); TRACE("sample %p, start_time %p, end_time %p, current_time %p.\n", sample, start_time, end_time, current_time); @@ -244,7 +240,7 @@ static HRESULT WINAPI IAudioStreamSampleImpl_GetSampleTimes(IAudioStreamSample * return S_OK; } -static HRESULT WINAPI IAudioStreamSampleImpl_SetSampleTimes(IAudioStreamSample *iface, const STREAM_TIME *start_time, +static HRESULT WINAPI audio_sample_SetSampleTimes(IAudioStreamSample *iface, const STREAM_TIME *start_time, const STREAM_TIME *end_time) { FIXME("(%p)->(%p,%p): stub\n", iface, start_time, end_time); @@ -252,10 +248,10 @@ static HRESULT WINAPI IAudioStreamSampleImpl_SetSampleTimes(IAudioStreamSample * return E_NOTIMPL; } -static HRESULT WINAPI IAudioStreamSampleImpl_Update(IAudioStreamSample *iface, +static HRESULT WINAPI audio_sample_Update(IAudioStreamSample *iface, DWORD flags, HANDLE event, PAPCFUNC apc_func, DWORD apc_data) { - IAudioStreamSampleImpl *sample = impl_from_IAudioStreamSample(iface); + struct audio_sample *sample = impl_from_IAudioStreamSample(iface); BYTE *pointer; DWORD length; HRESULT hr; @@ -326,9 +322,9 @@ static HRESULT WINAPI IAudioStreamSampleImpl_Update(IAudioStreamSample *iface, return sample->update_hr; } -static HRESULT WINAPI IAudioStreamSampleImpl_CompletionStatus(IAudioStreamSample *iface, DWORD flags, DWORD milliseconds) +static HRESULT WINAPI audio_sample_CompletionStatus(IAudioStreamSample *iface, DWORD flags, DWORD milliseconds) { - IAudioStreamSampleImpl *sample = impl_from_IAudioStreamSample(iface); + struct audio_sample *sample = impl_from_IAudioStreamSample(iface); HRESULT hr; TRACE("sample %p, flags %#x, milliseconds %u.\n", sample, flags, milliseconds); @@ -349,9 +345,9 @@ static HRESULT WINAPI IAudioStreamSampleImpl_CompletionStatus(IAudioStreamSample } /*** IAudioStreamSample methods ***/ -static HRESULT WINAPI IAudioStreamSampleImpl_GetAudioData(IAudioStreamSample *iface, IAudioData **audio_data) +static HRESULT WINAPI audio_sample_GetAudioData(IAudioStreamSample *iface, IAudioData **audio_data) { - IAudioStreamSampleImpl *sample = impl_from_IAudioStreamSample(iface); + struct audio_sample *sample = impl_from_IAudioStreamSample(iface); TRACE("sample %p, audio_data %p.\n", sample, audio_data); @@ -367,26 +363,26 @@ static HRESULT WINAPI IAudioStreamSampleImpl_GetAudioData(IAudioStreamSample *if static const struct IAudioStreamSampleVtbl AudioStreamSample_Vtbl = { /*** IUnknown methods ***/ - IAudioStreamSampleImpl_QueryInterface, - IAudioStreamSampleImpl_AddRef, - IAudioStreamSampleImpl_Release, + audio_sample_QueryInterface, + audio_sample_AddRef, + audio_sample_Release, /*** IStreamSample methods ***/ - IAudioStreamSampleImpl_GetMediaStream, - IAudioStreamSampleImpl_GetSampleTimes, - IAudioStreamSampleImpl_SetSampleTimes, - IAudioStreamSampleImpl_Update, - IAudioStreamSampleImpl_CompletionStatus, + audio_sample_GetMediaStream, + audio_sample_GetSampleTimes, + audio_sample_SetSampleTimes, + audio_sample_Update, + audio_sample_CompletionStatus, /*** IAudioStreamSample methods ***/ - IAudioStreamSampleImpl_GetAudioData + audio_sample_GetAudioData }; static HRESULT audiostreamsample_create(struct audio_stream *parent, IAudioData *audio_data, IAudioStreamSample **audio_stream_sample) { - IAudioStreamSampleImpl *object; + struct audio_sample *object; TRACE("(%p)\n", audio_stream_sample); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IAudioStreamSampleImpl)); + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) return E_OUTOFMEMORY;

1 0

Gijs Vermeulen : amstream: Implement IAudioStreamSample::GetAudioData().
by Alexandre Julliard 29 Jul '20

29 Jul '20

Module: wine Branch: master Commit: b8a39aaf759e20ee738bdee7cbcef2119d524f6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8a39aaf759e20ee738bdee7… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Wed Jul 29 12:30:36 2020 +0200 amstream: Implement IAudioStreamSample::GetAudioData(). Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/audiostream.c | 12 +++++++++-- dlls/amstream/tests/amstream.c | 48 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index 0761050a65..41f225d022 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -351,9 +351,17 @@ static HRESULT WINAPI IAudioStreamSampleImpl_CompletionStatus(IAudioStreamSample /*** IAudioStreamSample methods ***/ static HRESULT WINAPI IAudioStreamSampleImpl_GetAudioData(IAudioStreamSample *iface, IAudioData **audio_data) { - FIXME("(%p)->(%p): stub\n", iface, audio_data); + IAudioStreamSampleImpl *sample = impl_from_IAudioStreamSample(iface); - return E_NOTIMPL; + TRACE("sample %p, audio_data %p.\n", sample, audio_data); + + if (!audio_data) + return E_POINTER; + + IAudioData_AddRef(sample->audio_data); + *audio_data = sample->audio_data; + + return S_OK; } static const struct IAudioStreamSampleVtbl AudioStreamSample_Vtbl = diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index d1c3992585..130f9f0e0e 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -5680,6 +5680,53 @@ static void test_audiostreamsample_get_media_stream(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_audiostreamsample_get_audio_data(void) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + IAudioData *audio_data, *audio_data2; + IAudioStreamSample *audio_sample; + IAudioMediaStream *audio_stream; + IMediaStream *stream; + HRESULT hr; + ULONG ref; + + hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryAudio, 0, &stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaStream_QueryInterface(stream, &IID_IAudioMediaStream, (void **)&audio_stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = CoCreateInstance(&CLSID_AMAudioData, NULL, CLSCTX_INPROC_SERVER, &IID_IAudioData, (void **)&audio_data); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAudioMediaStream_CreateSample(audio_stream, audio_data, 0, &audio_sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAudioStreamSample_GetAudioData(audio_sample, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + EXPECT_REF(audio_data, 2); + hr = IAudioStreamSample_GetAudioData(audio_sample, &audio_data2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(audio_data2 == audio_data, "Expected audio data %p, got %p.\n", audio_data, audio_data2); + EXPECT_REF(audio_data, 3); + + IAudioData_Release(audio_data2); + + IAudioMediaStream_Release(audio_stream); + ref = IAudioStreamSample_Release(audio_sample); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IAudioData_Release(audio_data); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IMediaStream_Release(stream); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(amstream) { const WCHAR *test_avi_path; @@ -5727,6 +5774,7 @@ START_TEST(amstream) test_audiostreamsample_completion_status(); test_audiostreamsample_get_sample_times(); test_audiostreamsample_get_media_stream(); + test_audiostreamsample_get_audio_data(); test_ddrawstream_initialize(); test_ddrawstream_getsetdirectdraw();

1 0

Gijs Vermeulen : amstream: Implement IAudioStreamSample::GetMediaStream().
by Alexandre Julliard 29 Jul '20

29 Jul '20

Module: wine Branch: master Commit: 67b7d597c92798a9719ee0fe10d6bde5bf116536 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67b7d597c92798a9719ee0fe… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Wed Jul 29 12:30:35 2020 +0200 amstream: Implement IAudioStreamSample::GetMediaStream(). Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/audiostream.c | 12 ++++++++-- dlls/amstream/tests/amstream.c | 52 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index 85613f4f0e..0761050a65 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -213,9 +213,17 @@ static ULONG WINAPI IAudioStreamSampleImpl_Release(IAudioStreamSample *iface) /*** IStreamSample methods ***/ static HRESULT WINAPI IAudioStreamSampleImpl_GetMediaStream(IAudioStreamSample *iface, IMediaStream **media_stream) { - FIXME("(%p)->(%p): stub\n", iface, media_stream); + IAudioStreamSampleImpl *sample = impl_from_IAudioStreamSample(iface); - return E_NOTIMPL; + TRACE("sample %p, media_stream %p.\n", iface, media_stream); + + if (!media_stream) + return E_POINTER; + + IAMMediaStream_AddRef(&sample->parent->IAMMediaStream_iface); + *media_stream = (IMediaStream *)&sample->parent->IAMMediaStream_iface; + + return S_OK; } static HRESULT WINAPI IAudioStreamSampleImpl_GetSampleTimes(IAudioStreamSample *iface, STREAM_TIME *start_time, diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 6631fd312a..d1c3992585 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -5629,6 +5629,57 @@ static void test_ddrawstream_getsetdirectdraw(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_audiostreamsample_get_media_stream(void) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + IAudioStreamSample *audio_sample; + IAudioMediaStream *audio_stream; + IMediaStream *stream, *stream2; + IAudioData *audio_data; + HRESULT hr; + ULONG ref; + + hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryAudio, 0, &stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaStream_QueryInterface(stream, &IID_IAudioMediaStream, (void **)&audio_stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = CoCreateInstance(&CLSID_AMAudioData, NULL, CLSCTX_INPROC_SERVER, &IID_IAudioData, (void **)&audio_data); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAudioMediaStream_CreateSample(audio_stream, audio_data, 0, &audio_sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Crashes on native. */ + if (0) + { + hr = IAudioStreamSample_GetMediaStream(audio_sample, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + } + + EXPECT_REF(stream, 4); + hr = IAudioStreamSample_GetMediaStream(audio_sample, &stream2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(stream2 == stream, "Expected stream %p, got %p.\n", stream, stream2); + EXPECT_REF(stream, 5); + + IMediaStream_Release(stream2); + + IAudioMediaStream_Release(audio_stream); + ref = IAudioStreamSample_Release(audio_sample); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IAudioData_Release(audio_data); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IMediaStream_Release(stream); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(amstream) { const WCHAR *test_avi_path; @@ -5675,6 +5726,7 @@ START_TEST(amstream) test_audiostreamsample_update(); test_audiostreamsample_completion_status(); test_audiostreamsample_get_sample_times(); + test_audiostreamsample_get_media_stream(); test_ddrawstream_initialize(); test_ddrawstream_getsetdirectdraw();

1 0

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 July 2020