September 2020 - Wine-commits

Zebediah Figura : include: Document struct vkd3d_shader_compile_info and members.
by Alexandre Julliard 02 Sep '20

02 Sep '20

Module: vkd3d Branch: master Commit: 139d979733df684093bc7927e3d20e8559e704a5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=139d979733df684093bc792… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Aug 31 20:34:28 2020 -0500 include: Document struct vkd3d_shader_compile_info and members. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 91 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 86 insertions(+), 5 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index da05f2c..9150f14 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -57,13 +57,17 @@ enum vkd3d_shader_structure_type VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_STRUCTURE_TYPE), }; -/* This also affects UAV counters in Vulkan environments. In OpenGL - * environments, atomic counter buffers are always used for UAV counters. */ +/** + * Determines how buffer UAVs are stored. + * + * This also affects UAV counters in Vulkan environments. In OpenGL + * environments, atomic counter buffers are always used for UAV counters. + */ enum vkd3d_shader_compile_option_buffer_uav { - /* Use buffer textures for buffer UAVs, this is the default. */ + /** Use buffer textures for buffer UAVs. This is the default value. */ VKD3D_SHADER_COMPILE_OPTION_BUFFER_UAV_STORAGE_TEXEL_BUFFER = 0x00000000, - /* Use storage buffers for buffer UAVs. */ + /** Use storage buffers for buffer UAVs. */ VKD3D_SHADER_COMPILE_OPTION_BUFFER_UAV_STORAGE_BUFFER = 0x00000001, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_COMPILE_OPTION_BUFFER_UAV), @@ -71,15 +75,33 @@ enum vkd3d_shader_compile_option_buffer_uav enum vkd3d_shader_compile_option_name { + /** + * If \a value is nonzero, do not include debug information in the + * compiled shader. The default value is zero. + * + * This option is supported by vkd3d_shader_compile(). However, not all + * compilers support generating debug information. + */ VKD3D_SHADER_COMPILE_OPTION_STRIP_DEBUG = 0x00000001, - VKD3D_SHADER_COMPILE_OPTION_BUFFER_UAV = 0x00000002, /* vkd3d_shader_compile_option_buffer_uav */ + /** \a value is a member of enum vkd3d_shader_compile_option_buffer_uav. */ + VKD3D_SHADER_COMPILE_OPTION_BUFFER_UAV = 0x00000002, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_COMPILE_OPTION_NAME), }; +/** + * Various settings which may affect shader compilation or scanning, passed as + * part of struct vkd3d_shader_compile_info. For more details, see the + * documentation for individual options. + */ struct vkd3d_shader_compile_option { + /** Name of the option. */ enum vkd3d_shader_compile_option_name name; + /** + * A value associated with the option. The type and interpretation of the + * value depends on the option in question. + */ unsigned int value; }; @@ -97,9 +119,12 @@ enum vkd3d_shader_visibility VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_VISIBILITY), }; +/** A generic structure containing a GPU shader, in text or byte-code format. */ struct vkd3d_shader_code { + /** Pointer to the code. */ const void *code; + /** Size of \a code, in bytes. */ size_t size; }; @@ -264,46 +289,102 @@ struct vkd3d_shader_transform_feedback_info unsigned int buffer_stride_count; }; +/** The format of a shader to be compiled or scanned. */ enum vkd3d_shader_source_type { + /** + * The shader has no type or is to be ignored. This is not a valid value + * for vkd3d_shader_compile() or vkd3d_shader_scan(). + */ VKD3D_SHADER_SOURCE_NONE, + /** + * A 'Tokenized Program Format' shader embedded in a DXBC container. This is + * the format used for Direct3D shader model 4 and 5 shaders. + */ VKD3D_SHADER_SOURCE_DXBC_TPF, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_SOURCE_TYPE), }; +/** The output format of a compiled shader. */ enum vkd3d_shader_target_type { + /** + * The shader has no type or is to be ignored. This is not a valid value + * for vkd3d_shader_compile() or vkd3d_shader_scan(). + */ VKD3D_SHADER_TARGET_NONE, + /** + * A SPIR-V shader in binary form. This is the format used for Vulkan + * shaders. + */ VKD3D_SHADER_TARGET_SPIRV_BINARY, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_TARGET_TYPE), }; +/** + * Describes the maximum severity of compilation messages returned by + * vkd3d_shader_compile() and similar functions. + */ enum vkd3d_shader_log_level { + /** No messages will be returned. */ VKD3D_SHADER_LOG_NONE, + /** Only fatal errors which prevent successful compilation will be returned. */ VKD3D_SHADER_LOG_ERROR, + /** Non-fatal warnings and fatal errors will be returned. */ VKD3D_SHADER_LOG_WARNING, + /** + * All messages, including general informational messages, will be returned. + */ VKD3D_SHADER_LOG_INFO, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_LOG_LEVEL), }; +/** + * A chained structure containing compilation parameters. + */ struct vkd3d_shader_compile_info { + /** Must be set to VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO. */ enum vkd3d_shader_structure_type type; + /** + * Optional pointer to a structure containing further parameters. For a list + * of valid structures, refer to the respective function documentation. If + * no further parameters are needed, this field should be set to NULL. + */ const void *next; + /** Input source code or byte code. */ struct vkd3d_shader_code source; + /** Format of the input code passed in \ref source. */ enum vkd3d_shader_source_type source_type; + /** Desired output format. */ enum vkd3d_shader_target_type target_type; + /** + * Pointer to an array of compilation options. This field is ignored if + * \ref option_count is zero, but must be valid otherwise. + * + * If the same option is specified multiple times, only the last value is + * used. + * + * Options not relevant to or not supported by a particular shader compiler + * or scanner will be ignored. + */ const struct vkd3d_shader_compile_option *options; + /** Size, in elements, of \ref options. */ unsigned int option_count; + /** Minimum severity of messages returned from the shader function. */ enum vkd3d_shader_log_level log_level; + /** + * Name of the initial source file, which may be used in error messages or + * debug information. This parameter is optional and may be NULL. + */ const char *source_name; };

1 0

Zebediah Figura : include: Document vkd3d-shader compilation and scanning functions.
by Alexandre Julliard 02 Sep '20

02 Sep '20

Module: vkd3d Branch: master Commit: e61242b6261d4137e73b66022dc21c4e6740eff0 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e61242b6261d4137e73b660… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Aug 31 20:34:29 2020 -0500 include: Document vkd3d-shader compilation and scanning functions. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 110 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 110 insertions(+) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 9150f14..7e011e3 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -864,13 +864,99 @@ static inline uint32_t vkd3d_shader_create_swizzle(enum vkd3d_shader_swizzle_com #ifndef VKD3D_SHADER_NO_PROTOTYPES const char *vkd3d_shader_get_version(unsigned int *major, unsigned int *minor); +/** + * Returns the source types supported, with any target type, by + * vkd3d_shader_compile(). + * + * Use vkd3d_shader_get_supported_target_types() to determine which target types + * are supported for each source type. + * + * \param count Output location for the size, in elements, of the returned + * array. + * + * \return Pointer to an array of source types supported by this version of + * vkd3d-shader. This array may be a pointer to static data in libvkd3d-shader; + * it should not be freed. + */ const enum vkd3d_shader_source_type *vkd3d_shader_get_supported_source_types(unsigned int *count); +/** + * Returns the target types supported, with the given source type, by + * vkd3d_shader_compile(). + * + * \param source_type Source type for which to enumerate supported target types. + * + * \param count Output location for the size, in elements, of the returned + * array. + * + * \return Pointer to an array of target types supported by this version of + * vkd3d-shader. This array may be a pointer to static data in libvkd3d-shader; + * it should not be freed. + */ const enum vkd3d_shader_target_type *vkd3d_shader_get_supported_target_types( enum vkd3d_shader_source_type source_type, unsigned int *count); +/** + * Transform a form of GPU shader source code or byte code into another form of + * source code or byte code. + * + * This version of vkd3d-shader supports the following transformations: + * - VKD3D_SHADER_SOURCE_DXBC_TPF to VKD3D_SHADER_TARGET_SPIRV_BINARY + * + * Supported transformations can also be detected at runtime with the functions + * vkd3d_shader_get_supported_source_types() and + * vkd3d_shader_get_supported_target_types(). + * + * Depending on the source and target types, this function may support the + * following chained structures: + * - vkd3d_shader_interface_info + * - vkd3d_shader_spirv_domain_shader_target_info + * - vkd3d_shader_spirv_target_info + * - vkd3d_shader_transform_feedback_info + * + * \param compile_info A chained structure containing compilation parameters. + * + * \param out A pointer to a vkd3d_shader_code structure in which the compiled + * code will be stored. + * \n + * The compiled shader is allocated by vkd3d-shader and should be freed with + * vkd3d_shader_free_shader_code() when no longer needed. + * + * \param messages Optional output location for error or informational messages + * produced by the compiler. + * \n + * This string is null-terminated and UTF-8 encoded. + * \n + * The messages are allocated by vkd3d-shader and should be freed with + * vkd3d_shader_free_messages() when no longer needed. + * \n + * The messages returned can be regulated with the \a log_level member of struct + * vkd3d_shader_compile_info. Regardless of the requested level, if this + * parameter is NULL, no compilation messages will be returned. + * \n + * If no compilation messages are produced by the compiler, this parameter may + * receive NULL instead of a valid string pointer. + * + * \return A member of \ref vkd3d_result. + */ int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, char **messages); +/** + * Free shader messages allocated by another vkd3d-shader function, such as + * vkd3d_shader_compile(). + * + * \param messages Messages to free. This pointer is optional and may be NULL, + * in which case no action will be taken. + */ void vkd3d_shader_free_messages(char *messages); +/** + * Free shader code allocated by another vkd3d-shader function, such as + * vkd3d_shader_compile(). + * + * This function frees the \ref vkd3d_shader_code.code member, but does not free + * the structure itself. + * + * \param code Code to free. + */ void vkd3d_shader_free_shader_code(struct vkd3d_shader_code *code); int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc, @@ -883,6 +969,30 @@ int vkd3d_shader_serialize_root_signature(const struct vkd3d_shader_versioned_ro int vkd3d_shader_convert_root_signature(struct vkd3d_shader_versioned_root_signature_desc *dst, enum vkd3d_shader_root_signature_version version, const struct vkd3d_shader_versioned_root_signature_desc *src); +/** + * Parse shader source code or byte code, returning various types of requested + * information. + * + * Currently this function supports the following code types: + * - VKD3D_SHADER_SOURCE_DXBC_TPF + * + * \param compile_info A chained structure containing scan parameters. + * \n + * The DXBC_TPF scanner supports the following chained structures: + * - vkd3d_shader_scan_descriptor_info + * \n + * Although the \a compile_info parameter is read-only, chained structures + * passed to this function need not be, and may serve as output parameters, + * depending on their structure type. + * + * \param messages Optional output location for error or informational messages + * produced by the compiler. + * \n + * This parameter behaves identically to the \a messages parameter of + * vkd3d_shader_compile(). + * + * \return A member of \ref vkd3d_result. + */ int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char **messages); void vkd3d_shader_free_scan_descriptor_info(struct vkd3d_shader_scan_descriptor_info *scan_descriptor_info);

1 0

Zebediah Figura : include: Document struct vkd3d_shader_interface_info.
by Alexandre Julliard 02 Sep '20

02 Sep '20

Module: vkd3d Branch: master Commit: 72984bddcdce65ea643e02a9a8d338c4e7473816 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=72984bddcdce65ea643e02a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Aug 31 20:34:30 2020 -0500 include: Document struct vkd3d_shader_interface_info. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 154 +++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 143 insertions(+), 11 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 7e011e3..cc5615c 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -105,15 +105,23 @@ struct vkd3d_shader_compile_option unsigned int value; }; +/** Describes which shader stages a resource is visible to. */ enum vkd3d_shader_visibility { + /** The resource is visible to all shader stages. */ VKD3D_SHADER_VISIBILITY_ALL = 0, + /** The resource is visible only to the vertex shader. */ VKD3D_SHADER_VISIBILITY_VERTEX = 1, + /** The resource is visible only to the hull shader. */ VKD3D_SHADER_VISIBILITY_HULL = 2, + /** The resource is visible only to the domain shader. */ VKD3D_SHADER_VISIBILITY_DOMAIN = 3, + /** The resource is visible only to the geometry shader. */ VKD3D_SHADER_VISIBILITY_GEOMETRY = 4, + /** The resource is visible only to the pixel shader. */ VKD3D_SHADER_VISIBILITY_PIXEL = 5, + /** The resource is visible only to the compute shader. */ VKD3D_SHADER_VISIBILITY_COMPUTE = 1000000000, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_VISIBILITY), @@ -128,21 +136,51 @@ struct vkd3d_shader_code size_t size; }; +/** The type of a shader resource descriptor. */ enum vkd3d_shader_descriptor_type { - VKD3D_SHADER_DESCRIPTOR_TYPE_SRV = 0x0, /* t# */ - VKD3D_SHADER_DESCRIPTOR_TYPE_UAV = 0x1, /* u# */ - VKD3D_SHADER_DESCRIPTOR_TYPE_CBV = 0x2, /* cb# */ - VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER = 0x3, /* s# */ + /** + * The descriptor is a shader resource view. In Direct3D assembly, this is + * bound to a t# register. + */ + VKD3D_SHADER_DESCRIPTOR_TYPE_SRV = 0x0, + /** + * The descriptor is an unordered access view. In Direct3D assembly, this is + * bound to a u# register. + */ + VKD3D_SHADER_DESCRIPTOR_TYPE_UAV = 0x1, + /** + * The descriptor is a constant buffer view. In Direct3D assembly, this is + * bound to a cb# register. + */ + VKD3D_SHADER_DESCRIPTOR_TYPE_CBV = 0x2, + /** + * The descriptor is a sampler. In Direct3D assembly, this is bound to an s# + * register. + */ + VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER = 0x3, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_DESCRIPTOR_TYPE), }; +/** + * A common structure describing the bind point of a descriptor or descriptor + * array in the target environment. + */ struct vkd3d_shader_descriptor_binding { + /** + * The set of the descriptor. If the target environment does not support + * descriptor sets, this value must be set to 0. + */ unsigned int set; + /** The binding index of the descriptor. */ unsigned int binding; - unsigned int count; /* This must be 1 in this version of vkd3d-shader. */ + /** + * The size of this descriptor array. Descriptor arrays are not supported in + * this version of vkd3d-shader, and therefore this value must be 1. + */ + unsigned int count; }; enum vkd3d_shader_binding_flag @@ -203,67 +241,161 @@ struct vkd3d_shader_parameter } u; }; +/** + * Describes the mapping of a single resource or resource array to its binding + * point in the target environment. + * + * For example, to map a Direct3D SRV with register space 2, register "t3" to + * a Vulkan descriptor in set 4 and with binding 5, set the following members: + * - \a type = VKD3D_SHADER_DESCRIPTOR_TYPE_SRV + * - \a register_space = 2 + * - \a register_index = 3 + * - \a binding.set = 4 + * - \a binding.binding = 5 + * - \a binding.count = 1 + * + * This structure is used in struct vkd3d_shader_interface_info. + */ struct vkd3d_shader_resource_binding { + /** The type of this descriptor. */ enum vkd3d_shader_descriptor_type type; + /** + * Register space of the Direct3D resource. If the source format does not + * support multiple register spaces, this parameter must be set to 0. + */ unsigned int register_space; + /** Register index of the DXBC resource. */ unsigned int register_index; + /** Shader stage(s) to which the resource is visible. */ enum vkd3d_shader_visibility shader_visibility; - unsigned int flags; /* vkd3d_shader_binding_flag */ + /** A combination of zero or more elements of vkd3d_shader_binding_flag. */ + unsigned int flags; + /** The binding in the target environment. */ struct vkd3d_shader_descriptor_binding binding; }; #define VKD3D_SHADER_DUMMY_SAMPLER_INDEX ~0u +/** + * Describes the mapping of a Direct3D resource-sampler pair to a combined + * sampler (i.e. sampled image). + * + * This structure is used in struct vkd3d_shader_interface_info. + */ struct vkd3d_shader_combined_resource_sampler { + /** + * Register space of the Direct3D resource. If the source format does not + * support multiple register spaces, this parameter must be set to 0. + */ unsigned int resource_space; + /** Register index of the Direct3D resource. */ unsigned int resource_index; + /** + * Register space of the Direct3D sampler. If the source format does not + * support multiple register spaces, this parameter must be set to 0. + */ unsigned int sampler_space; + /** Register index of the Direct3D sampler. */ unsigned int sampler_index; + /** Shader stage(s) to which the resource is visible. */ enum vkd3d_shader_visibility shader_visibility; - unsigned int flags; /* vkd3d_shader_binding_flag */ + /** A combination of zero or more elements of vkd3d_shader_binding_flag. */ + unsigned int flags; + /** The binding in the target environment. */ struct vkd3d_shader_descriptor_binding binding; }; +/** + * Describes the mapping of a single Direct3D UAV counter. + * + * This structure is used in struct vkd3d_shader_interface_info. + */ struct vkd3d_shader_uav_counter_binding { + /** + * Register space of the Direct3D UAV descriptor. If the source format does + * not support multiple register spaces, this parameter must be set to 0. + */ unsigned int register_space; - unsigned int register_index; /* u# */ + /** Register index of the Direct3D UAV descriptor. */ + unsigned int register_index; + /** Shader stage(s) to which the UAV counter is visible. */ enum vkd3d_shader_visibility shader_visibility; + /** The binding in the target environment. */ struct vkd3d_shader_descriptor_binding binding; unsigned int offset; }; +/** + * Describes the mapping of a Direct3D constant buffer to a range of push + * constants in the target environment. + * + * This structure is used in struct vkd3d_shader_interface_info. + */ struct vkd3d_shader_push_constant_buffer { + /** + * Register space of the Direct3D resource. If the source format does not + * support multiple register spaces, this parameter must be set to 0. + */ unsigned int register_space; + /** Register index of the Direct3D resource. */ unsigned int register_index; + /** Shader stage(s) to which the resource is visible. */ enum vkd3d_shader_visibility shader_visibility; - unsigned int offset; /* in bytes */ - unsigned int size; /* in bytes */ + /** Offset, in bytes, of the target push constants. */ + unsigned int offset; + /** Size, in bytes, of the target push constants. */ + unsigned int size; }; -/* Extends vkd3d_shader_compile_info. */ +/** + * A chained structure describing the interface between a compiled shader and + * the target environment. + * + * For example, when compiling Direct3D shader byte code to SPIR-V, this + * structure contains mappings from Direct3D descriptor registers to SPIR-V + * descriptor bindings. + * + * This structure is optional. If omitted, vkd3d_shader_compile() will use a + * default mapping, in which resources are mapped to sequential bindings in + * register set 0. + * + * This structure extends vkd3d_shader_compile_info. + * + * This structure contains only input parameters. + */ struct vkd3d_shader_interface_info { + /** Must be set to VKD3D_SHADER_STRUCTURE_TYPE_INTERFACE_INFO. */ enum vkd3d_shader_structure_type type; + /** Optional pointer to a structure containing further parameters. */ const void *next; + /** Pointer to an array of bindings for shader resource descriptors. */ const struct vkd3d_shader_resource_binding *bindings; + /** Size, in elements, of \ref bindings. */ unsigned int binding_count; + /** Pointer to an array of bindings for push constant buffers. */ const struct vkd3d_shader_push_constant_buffer *push_constant_buffers; + /** Size, in elements, of \ref push_constant_buffers. */ unsigned int push_constant_buffer_count; + /** Pointer to an array of bindings for combined samplers. */ const struct vkd3d_shader_combined_resource_sampler *combined_samplers; + /** Size, in elements, of \ref combined_samplers. */ unsigned int combined_sampler_count; + /** Pointer to an array of bindings for UAV counters. */ const struct vkd3d_shader_uav_counter_binding *uav_counters; + /** Size, in elements, of \ref uav_counters. */ unsigned int uav_counter_count; };

1 0

Ziqing Hui : d3dx10: Introduce get_d3dx10_dds_format().
by Alexandre Julliard 01 Sep '20

01 Sep '20

Module: wine Branch: master Commit: b4d273e7fee0b39fe9dbba346d11974f5039c864 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4d273e7fee0b39fe9dbba34… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon Aug 17 19:33:47 2020 +0800 d3dx10: Introduce get_d3dx10_dds_format(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/d3dx10_43_main.c | 26 +++++++++++++++++++++++++- dlls/d3dx10_43/tests/d3dx10.c | 2 -- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx10_43/d3dx10_43_main.c b/dlls/d3dx10_43/d3dx10_43_main.c index 53781f5de6..005b234437 100644 --- a/dlls/d3dx10_43/d3dx10_43_main.c +++ b/dlls/d3dx10_43/d3dx10_43_main.c @@ -54,6 +54,18 @@ file_formats[] = { &GUID_ContainerFormatWmp, D3DX10_IFF_WMP }, }; +static const DXGI_FORMAT to_be_converted_format[] = +{ + DXGI_FORMAT_UNKNOWN, + DXGI_FORMAT_R8_UNORM, + DXGI_FORMAT_R8G8_UNORM, + DXGI_FORMAT_B5G6R5_UNORM, + DXGI_FORMAT_B4G4R4A4_UNORM, + DXGI_FORMAT_B5G5R5A1_UNORM, + DXGI_FORMAT_B8G8R8X8_UNORM, + DXGI_FORMAT_B8G8R8A8_UNORM +}; + static D3DX10_IMAGE_FILE_FORMAT wic_container_guid_to_file_format(GUID *container_format) { unsigned int i; @@ -82,6 +94,18 @@ static D3D10_RESOURCE_DIMENSION wic_dimension_to_d3dx10_dimension(WICDdsDimensio } } +static DXGI_FORMAT get_d3dx10_dds_format(DXGI_FORMAT format) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(to_be_converted_format); ++i) + { + if (format == to_be_converted_format[i]) + return DXGI_FORMAT_R8G8B8A8_UNORM; + } + return format; +} + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { switch (fdwReason) @@ -339,7 +363,7 @@ HRESULT WINAPI D3DX10GetImageInfoFromMemory(const void *src_data, SIZE_T src_dat img_info->Depth = dds_params.Depth; img_info->MipLevels = dds_params.MipLevels; img_info->ResourceDimension = wic_dimension_to_d3dx10_dimension(dds_params.Dimension); - img_info->Format = dds_params.DxgiFormat; + img_info->Format = get_d3dx10_dds_format(dds_params.DxgiFormat); img_info->MiscFlags = 0; if (dds_params.Dimension == WICDdsTextureCube) { diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index e1d3ba0b83..e39025a930 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -1346,8 +1346,6 @@ static void test_get_image_info(void) ok(image_info.MiscFlags == test_image[i].expected.MiscFlags, "Test %u: Got unexpected MiscFlags %#x, expected %#x.\n", i, image_info.MiscFlags, test_image[i].expected.MiscFlags); - todo_wine_if(test_image[i].expected.ImageFileFormat == D3DX10_IFF_DDS - && test_image[i].expected.Format == DXGI_FORMAT_R8G8B8A8_UNORM) ok(image_info.Format == test_image[i].expected.Format, "Test %u: Got unexpected Format %#x, expected %#x.\n", i, image_info.Format, test_image[i].expected.Format);

1 0

Jacek Caban : kernel32/tests: Skip more FreeConsole tests on win7.
by Alexandre Julliard 01 Sep '20

01 Sep '20

Module: wine Branch: master Commit: 7d3503d83ece320ed023297e12d766e487383462 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d3503d83ece320ed023297e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 1 15:35:33 2020 +0200 kernel32/tests: Skip more FreeConsole tests on win7. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index a8c07dcae7..3d53bfe260 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3659,6 +3659,8 @@ static void test_FreeConsole(void) ok(title[0] == 0xc0c0, "title byffer changed\n"); ok(GetLastError() == ERROR_INVALID_HANDLE, "last error %u\n", GetLastError()); + if (skip_nt) return; + SetLastError(0xdeadbeef); ret = SetConsoleTitleW( L"test" ); ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, "SetConsoleTitleW returned %x(%u)\n", ret, GetLastError()); @@ -3668,15 +3670,12 @@ static void test_FreeConsole(void) ok(!hwnd, "hwnd = %p\n", hwnd); ok(GetLastError() == ERROR_INVALID_HANDLE, "last error %u\n", GetLastError()); - if (!skip_nt) - { - SetStdHandle( STD_INPUT_HANDLE, (HANDLE)0xdeadbeef ); - handle = GetConsoleInputWaitHandle(); - ok(handle == (HANDLE)0xdeadbeef, "GetConsoleInputWaitHandle returned %p\n", handle); - SetStdHandle( STD_INPUT_HANDLE, NULL ); - handle = GetConsoleInputWaitHandle(); - ok(!handle, "GetConsoleInputWaitHandle returned %p\n", handle); - } + SetStdHandle( STD_INPUT_HANDLE, (HANDLE)0xdeadbeef ); + handle = GetConsoleInputWaitHandle(); + ok(handle == (HANDLE)0xdeadbeef, "GetConsoleInputWaitHandle returned %p\n", handle); + SetStdHandle( STD_INPUT_HANDLE, NULL ); + handle = GetConsoleInputWaitHandle(); + ok(!handle, "GetConsoleInputWaitHandle returned %p\n", handle); } static void test_SetConsoleScreenBufferInfoEx(HANDLE std_output)

1 0

Jacek Caban : server: Introduce IOCTL_CONDRV_CTRL_EVENT ioctl.
by Alexandre Julliard 01 Sep '20

01 Sep '20

Module: wine Branch: master Commit: f9c89932595c874cf9eb6fc8d3244d89ff55bbf8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9c89932595c874cf9eb6fc8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 1 15:35:51 2020 +0200 server: Introduce IOCTL_CONDRV_CTRL_EVENT ioctl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 8 ++++++++ server/console.c | 19 +++++++++++++++++++ server/trace.c | 1 + 3 files changed, 28 insertions(+) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index 14177a5e19..2e6c5c689f 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -36,6 +36,7 @@ #define IOCTL_CONDRV_SET_INPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 14, METHOD_BUFFERED, FILE_WRITE_PROPERTIES) #define IOCTL_CONDRV_GET_TITLE CTL_CODE(FILE_DEVICE_CONSOLE, 15, METHOD_BUFFERED, FILE_READ_PROPERTIES) #define IOCTL_CONDRV_SET_TITLE CTL_CODE(FILE_DEVICE_CONSOLE, 16, METHOD_BUFFERED, FILE_WRITE_PROPERTIES) +#define IOCTL_CONDRV_CTRL_EVENT CTL_CODE(FILE_DEVICE_CONSOLE, 17, METHOD_BUFFERED, FILE_WRITE_PROPERTIES) /* console output ioctls */ #define IOCTL_CONDRV_READ_OUTPUT CTL_CODE(FILE_DEVICE_CONSOLE, 30, METHOD_BUFFERED, FILE_READ_DATA) @@ -226,6 +227,13 @@ enum condrv_renderer_event_type CONSOLE_RENDERER_EXIT_EVENT, }; +/* IOCTL_CONDRV_CTRL_EVENT params */ +struct condrv_ctrl_event +{ + int event; /* the event to send */ + unsigned int group_id; /* the group to send the event to */ +}; + /* Wine specific values for console inheritance (params->ConsoleHandle) */ #define CONSOLE_HANDLE_ALLOC ((HANDLE)1) diff --git a/server/console.c b/server/console.c index 93ea509ae4..8339819458 100644 --- a/server/console.c +++ b/server/console.c @@ -1844,6 +1844,25 @@ static int console_input_ioctl( struct fd *fd, ioctl_code_t code, struct async * return 1; } + case IOCTL_CONDRV_CTRL_EVENT: + { + const struct condrv_ctrl_event *event = get_req_data(); + process_id_t group; + if (get_req_data_size() != sizeof(*event)) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + group = event->group_id ? event->group_id : current->process->group_id; + if (!group) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + propagate_console_signal( console, event->event, group ); + return !get_error(); + } + default: set_error( STATUS_INVALID_HANDLE ); return 0; diff --git a/server/trace.c b/server/trace.c index 93e53d2f42..ffb3d37db9 100644 --- a/server/trace.c +++ b/server/trace.c @@ -116,6 +116,7 @@ static void dump_ioctl_code( const char *prefix, const ioctl_code_t *code ) #define CASE(c) case c: fprintf( stderr, "%s%s", prefix, #c ); break CASE(IOCTL_CONDRV_ACTIVATE); CASE(IOCTL_CONDRV_ATTACH_RENDERER); + CASE(IOCTL_CONDRV_CTRL_EVENT); CASE(IOCTL_CONDRV_FILL_OUTPUT); CASE(IOCTL_CONDRV_GET_INPUT_INFO); CASE(IOCTL_CONDRV_GET_MODE);

1 0

Jacek Caban : kernelbase: Use IOCTL_CONDRV_CTRL_EVENT in GenerateConsoleCtrlEvent.
by Alexandre Julliard 01 Sep '20

01 Sep '20

Module: wine Branch: master Commit: 82e8fd97f6996a13ecdd0c827336e0681e2216a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82e8fd97f6996a13ecdd0c82… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 1 15:36:05 2020 +0200 kernelbase: Use IOCTL_CONDRV_CTRL_EVENT in GenerateConsoleCtrlEvent. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 4 ++++ dlls/kernelbase/console.c | 14 +++++--------- include/wine/server_protocol.h | 19 +------------------ server/console.c | 13 ------------- server/protocol.def | 7 ------- server/request.h | 5 ----- server/trace.c | 9 --------- 7 files changed, 10 insertions(+), 61 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 3d53bfe260..46816f6ac0 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3670,6 +3670,10 @@ static void test_FreeConsole(void) ok(!hwnd, "hwnd = %p\n", hwnd); ok(GetLastError() == ERROR_INVALID_HANDLE, "last error %u\n", GetLastError()); + ret = GenerateConsoleCtrlEvent(CTRL_C_EVENT, 0); + ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, "GenerateConsoleCtrlEvent returned %x(%u)\n", + ret, GetLastError()); + SetStdHandle( STD_INPUT_HANDLE, (HANDLE)0xdeadbeef ); handle = GetConsoleInputWaitHandle(); ok(handle == (HANDLE)0xdeadbeef, "GetConsoleInputWaitHandle returned %p\n", handle); diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 7589f305b5..f4dd06ae2d 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -593,7 +593,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH FreeConsole(void) */ BOOL WINAPI DECLSPEC_HOTPATCH GenerateConsoleCtrlEvent( DWORD event, DWORD group ) { - BOOL ret; + struct condrv_ctrl_event ctrl_event; TRACE( "(%d, %x)\n", event, group ); @@ -603,14 +603,10 @@ BOOL WINAPI DECLSPEC_HOTPATCH GenerateConsoleCtrlEvent( DWORD event, DWORD group return FALSE; } - SERVER_START_REQ( send_console_signal ) - { - req->signal = event; - req->group_id = group; - ret = !wine_server_call_err( req ); - } - SERVER_END_REQ; - return ret; + ctrl_event.event = event; + ctrl_event.group_id = group; + return console_ioctl( RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle, + IOCTL_CONDRV_CTRL_EVENT, &ctrl_event, sizeof(ctrl_event), NULL, 0, NULL ); } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 98e4825439..5259b5a60c 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1924,20 +1924,6 @@ struct create_console_output_reply -struct send_console_signal_request -{ - struct request_header __header; - int signal; - process_id_t group_id; - char __pad_20[4]; -}; -struct send_console_signal_reply -{ - struct reply_header __header; -}; - - - struct get_next_console_request_request { struct request_header __header; @@ -5541,7 +5527,6 @@ enum request REQ_append_console_input_history, REQ_get_console_input_history, REQ_create_console_output, - REQ_send_console_signal, REQ_get_next_console_request, REQ_read_directory_changes, REQ_read_change, @@ -5831,7 +5816,6 @@ union generic_request struct append_console_input_history_request append_console_input_history_request; struct get_console_input_history_request get_console_input_history_request; struct create_console_output_request create_console_output_request; - struct send_console_signal_request send_console_signal_request; struct get_next_console_request_request get_next_console_request_request; struct read_directory_changes_request read_directory_changes_request; struct read_change_request read_change_request; @@ -6119,7 +6103,6 @@ union generic_reply struct append_console_input_history_reply append_console_input_history_reply; struct get_console_input_history_reply get_console_input_history_reply; struct create_console_output_reply create_console_output_reply; - struct send_console_signal_reply send_console_signal_reply; struct get_next_console_request_reply get_next_console_request_reply; struct read_directory_changes_reply read_directory_changes_reply; struct read_change_reply read_change_reply; @@ -6337,7 +6320,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 640 +#define SERVER_PROTOCOL_VERSION 641 /* ### protocol_version end ### */ diff --git a/server/console.c b/server/console.c index 8339819458..15c764f3b5 100644 --- a/server/console.c +++ b/server/console.c @@ -2394,19 +2394,6 @@ DECL_HANDLER(create_console_output) release_object( console ); } -/* sends a signal to a console (process, group...) */ -DECL_HANDLER(send_console_signal) -{ - process_id_t group; - - group = req->group_id ? req->group_id : current->process->group_id; - - if (!group) - set_error( STATUS_INVALID_PARAMETER ); - else - propagate_console_signal( current->process->console, req->signal, group ); -} - /* get console which renderer is 'current' */ static int cgwe_enum( struct process* process, void* user) { diff --git a/server/protocol.def b/server/protocol.def index 6e92f86cc0..92290af701 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1515,13 +1515,6 @@ enum server_fd_type @END -/* Sends a signal to a process group */ -(a)REQ(send_console_signal) - int signal; /* the signal to send */ - process_id_t group_id; /* the group to send the signal to */ -(a)END - - /* Retrieve the next pending console ioctl request */ @REQ(get_next_console_request) obj_handle_t handle; /* console server handle */ diff --git a/server/request.h b/server/request.h index 5a602d3d81..db7215bd43 100644 --- a/server/request.h +++ b/server/request.h @@ -188,7 +188,6 @@ DECL_HANDLER(get_console_wait_event); DECL_HANDLER(append_console_input_history); DECL_HANDLER(get_console_input_history); DECL_HANDLER(create_console_output); -DECL_HANDLER(send_console_signal); DECL_HANDLER(get_next_console_request); DECL_HANDLER(read_directory_changes); DECL_HANDLER(read_change); @@ -477,7 +476,6 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_append_console_input_history, (req_handler)req_get_console_input_history, (req_handler)req_create_console_output, - (req_handler)req_send_console_signal, (req_handler)req_get_next_console_request, (req_handler)req_read_directory_changes, (req_handler)req_read_change, @@ -1131,9 +1129,6 @@ C_ASSERT( FIELD_OFFSET(struct create_console_output_request, fd) == 28 ); C_ASSERT( sizeof(struct create_console_output_request) == 32 ); C_ASSERT( FIELD_OFFSET(struct create_console_output_reply, handle_out) == 8 ); C_ASSERT( sizeof(struct create_console_output_reply) == 16 ); -C_ASSERT( FIELD_OFFSET(struct send_console_signal_request, signal) == 12 ); -C_ASSERT( FIELD_OFFSET(struct send_console_signal_request, group_id) == 16 ); -C_ASSERT( sizeof(struct send_console_signal_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct get_next_console_request_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_next_console_request_request, signal) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_next_console_request_request, read) == 20 ); diff --git a/server/trace.c b/server/trace.c index ffb3d37db9..a0174a1bd6 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2089,12 +2089,6 @@ static void dump_create_console_output_reply( const struct create_console_output fprintf( stderr, " handle_out=%04x", req->handle_out ); } -static void dump_send_console_signal_request( const struct send_console_signal_request *req ) -{ - fprintf( stderr, " signal=%d", req->signal ); - fprintf( stderr, ", group_id=%04x", req->group_id ); -} - static void dump_get_next_console_request_request( const struct get_next_console_request_request *req ) { fprintf( stderr, " handle=%04x", req->handle ); @@ -4502,7 +4496,6 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_append_console_input_history_request, (dump_func)dump_get_console_input_history_request, (dump_func)dump_create_console_output_request, - (dump_func)dump_send_console_signal_request, (dump_func)dump_get_next_console_request_request, (dump_func)dump_read_directory_changes_request, (dump_func)dump_read_change_request, @@ -4788,7 +4781,6 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { NULL, (dump_func)dump_get_console_input_history_reply, (dump_func)dump_create_console_output_reply, - NULL, (dump_func)dump_get_next_console_request_reply, NULL, (dump_func)dump_read_change_reply, @@ -5074,7 +5066,6 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "append_console_input_history", "get_console_input_history", "create_console_output", - "send_console_signal", "get_next_console_request", "read_directory_changes", "read_change",

1 0

Jacek Caban : server: Support IOCTL_CONDRV_CTRL_EVENT on console server handles.
by Alexandre Julliard 01 Sep '20

01 Sep '20

Module: wine Branch: master Commit: b23ef1d836bada90df71ce9730f68088e0124226 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b23ef1d836bada90df71ce97… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 1 15:36:23 2020 +0200 server: Support IOCTL_CONDRV_CTRL_EVENT on console server handles. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 64 insertions(+), 1 deletion(-) diff --git a/server/console.c b/server/console.c index 15c764f3b5..3ea8a0fe53 100644 --- a/server/console.c +++ b/server/console.c @@ -192,6 +192,7 @@ struct console_host_ioctl struct console_server { struct object obj; /* object header */ + struct fd *fd; /* pseudo-fd for ioctls */ struct console_input *console; /* attached console */ struct list queue; /* ioctl queue */ struct list read_queue; /* blocking read queue */ @@ -201,6 +202,7 @@ struct console_server static void console_server_dump( struct object *obj, int verbose ); static void console_server_destroy( struct object *obj ); static int console_server_signaled( struct object *obj, struct wait_queue_entry *entry ); +static struct fd *console_server_get_fd( struct object *obj ); static struct object *console_server_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ); static struct object *console_server_open_file( struct object *obj, unsigned int access, unsigned int sharing, unsigned int options ); @@ -215,7 +217,7 @@ static const struct object_ops console_server_ops = console_server_signaled, /* signaled */ no_satisfied, /* satisfied */ no_signal, /* signal */ - no_get_fd, /* get_fd */ + console_server_get_fd, /* get_fd */ default_fd_map_access, /* map_access */ default_get_sd, /* get_sd */ default_set_sd, /* set_sd */ @@ -228,6 +230,23 @@ static const struct object_ops console_server_ops = console_server_destroy /* destroy */ }; +static int console_server_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); + +static const struct fd_ops console_server_fd_ops = +{ + default_fd_get_poll_events, /* get_poll_events */ + default_poll_event, /* poll_event */ + console_get_fd_type, /* get_fd_type */ + no_fd_read, /* read */ + no_fd_write, /* write */ + no_fd_flush, /* flush */ + no_fd_get_file_info, /* get_file_info */ + no_fd_get_volume_info, /* get_volume_info */ + console_server_ioctl, /* ioctl */ + default_fd_queue_async, /* queue_async */ + default_fd_reselect_async /* reselect_async */ +}; + struct font_info { short int width; @@ -1598,6 +1617,7 @@ static void console_server_destroy( struct object *obj ) struct console_server *server = (struct console_server *)obj; assert( obj->ops == &console_server_ops ); disconnect_console_server( server ); + if (server->fd) release_object( server->fd ); } static struct object *console_server_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ) @@ -1638,6 +1658,13 @@ static int console_server_signaled( struct object *obj, struct wait_queue_entry return !server->console || !list_empty( &server->queue ); } +static struct fd *console_server_get_fd( struct object* obj ) +{ + struct console_server *server = (struct console_server*)obj; + assert( obj->ops == &console_server_ops ); + return (struct fd *)grab_object( server->fd ); +} + static struct object *console_server_open_file( struct object *obj, unsigned int access, unsigned int sharing, unsigned int options ) { @@ -1653,6 +1680,13 @@ static struct object *create_console_server( void ) server->busy = 0; list_init( &server->queue ); list_init( &server->read_queue ); + server->fd = alloc_pseudo_fd( &console_server_fd_ops, &server->obj, FILE_SYNCHRONOUS_IO_NONALERT ); + if (!server->fd) + { + release_object( server ); + return NULL; + } + allow_fd_caching(server->fd); return &server->obj; } @@ -2137,6 +2171,35 @@ static int console_input_events_ioctl( struct fd *fd, ioctl_code_t code, struct } } +static int console_server_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) +{ + struct console_server *server = get_fd_user( fd ); + + switch (code) + { + case IOCTL_CONDRV_CTRL_EVENT: + { + const struct condrv_ctrl_event *event = get_req_data(); + if (get_req_data_size() != sizeof(*event)) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + if (!server->console) + { + set_error( STATUS_INVALID_HANDLE ); + return 0; + } + propagate_console_signal( server->console, event->event, event->group_id ); + return !get_error(); + } + + default: + set_error( STATUS_INVALID_HANDLE ); + return 0; + } +} + static struct object_type *console_device_get_type( struct object *obj ) { static const WCHAR name[] = {'D','e','v','i','c','e'};

1 0

Jacek Caban : conhost: Support CTRL_C_EVENT in write_console_input.
by Alexandre Julliard 01 Sep '20

01 Sep '20

Module: wine Branch: master Commit: 9864f9c024ad6e45d2e4369dca7418bc9121d727 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9864f9c024ad6e45d2e4369d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 1 15:36:45 2020 +0200 conhost: Support CTRL_C_EVENT in write_console_input. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 0050f4d1ad..aef9b8e199 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -250,7 +250,14 @@ static NTSTATUS write_console_input( struct console *console, const INPUT_RECORD count--; if (records[i].Event.KeyEvent.bKeyDown) { - FIXME("CTRL C\n"); + struct condrv_ctrl_event ctrl_event; + IO_STATUS_BLOCK io; + + ctrl_event.event = CTRL_C_EVENT; + ctrl_event.group_id = 0; + NtDeviceIoControlFile( console->server, NULL, NULL, NULL, &io, IOCTL_CONDRV_CTRL_EVENT, + &ctrl_event, sizeof(ctrl_event), NULL, 0 ); + } } else i++;

1 0

Nikolay Sivov : combase: Move stub manager.
by Alexandre Julliard 01 Sep '20

01 Sep '20

Module: wine Branch: master Commit: 6074eeda838a8dc5eb48dff9fe2540af76916e55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6074eeda838a8dc5eb48dff9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 1 15:16:29 2020 +0100 combase: Move stub manager. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/Makefile.in | 2 + dlls/combase/apartment.c | 5 +- dlls/combase/combase.c | 84 ++++++++++++++++++++++ dlls/combase/combase.spec | 17 ++++- dlls/combase/combase_private.h | 101 ++++++++++++++++++-------- dlls/combase/dcom.idl | 62 ++++++++++++++++ dlls/{ole32 => combase}/stubmanager.c | 131 ++++++++++++++++++---------------- dlls/ole32/Makefile.in | 1 - dlls/ole32/compobj.c | 121 ------------------------------- dlls/ole32/compobj_private.h | 23 +----- dlls/ole32/marshal.c | 12 +++- dlls/ole32/ole32.spec | 9 ++- dlls/ole32/rpc.c | 8 ++- 13 files changed, 330 insertions(+), 246 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6074eeda838a8dc5eb48…

1 0