- wine-devel - winehq.org

[PATCH 3/4] wined3d: Introduce WINED3DFMT_FLAG_NORMALISED.
by Henri Verbeet 09 Sep '18

09 Sep '18

Derived from the component info. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 7 ++-- dlls/wined3d/utils.c | 73 +++++++++++++++++++++--------------------- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 42 insertions(+), 40 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 83e35638bc6..34376efe3c7 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -5376,6 +5376,8 @@ static void context_load_numbered_arrays(struct wined3d_context *context, if (element->stride) { + DWORD format_flags = element->format->flags[WINED3D_GL_RES_TYPE_BUFFER]; + if (current_bo != element->data.buffer_object) { GL_EXTCALL(glBindBuffer(GL_ARRAY_BUFFER, element->data.buffer_object)); @@ -5386,8 +5388,7 @@ static void context_load_numbered_arrays(struct wined3d_context *context, * pointer. vb can point to a user pointer data blob. In that case * current_bo will be 0. If there is a vertex buffer but no vbo we * won't be load converted attributes anyway. */ - if (vs && vs->reg_maps.shader_version.major >= 4 - && (element->format->flags[WINED3D_GL_RES_TYPE_BUFFER] & WINED3DFMT_FLAG_INTEGER)) + if (vs && vs->reg_maps.shader_version.major >= 4 && (format_flags & WINED3DFMT_FLAG_INTEGER)) { GL_EXTCALL(glVertexAttribIPointer(i, element->format->gl_vtx_format, element->format->gl_vtx_type, element->stride, element->data.addr + state->load_base_vertex_index * element->stride)); @@ -5395,7 +5396,7 @@ static void context_load_numbered_arrays(struct wined3d_context *context, else { GL_EXTCALL(glVertexAttribPointer(i, element->format->gl_vtx_format, element->format->gl_vtx_type, - element->format->gl_normalized, element->stride, + !!(format_flags & WINED3DFMT_FLAG_NORMALISED), element->stride, element->data.addr + state->load_base_vertex_index * element->stride)); } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 84410af5dcc..1b13c99265c 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -602,47 +602,46 @@ struct wined3d_format_vertex_info enum wined3d_ffp_emit_idx emit_idx; unsigned int component_count; GLenum gl_vtx_type; - GLboolean gl_normalized; enum wined3d_gl_extension extension; }; static const struct wined3d_format_vertex_info format_vertex_info[] = { - {WINED3DFMT_R32_FLOAT, WINED3D_FFP_EMIT_FLOAT1, 1, GL_FLOAT, GL_FALSE}, - {WINED3DFMT_R32G32_FLOAT, WINED3D_FFP_EMIT_FLOAT2, 2, GL_FLOAT, GL_FALSE}, - {WINED3DFMT_R32G32B32_FLOAT, WINED3D_FFP_EMIT_FLOAT3, 3, GL_FLOAT, GL_FALSE}, - {WINED3DFMT_R32G32B32A32_FLOAT, WINED3D_FFP_EMIT_FLOAT4, 4, GL_FLOAT, GL_FALSE}, - {WINED3DFMT_B8G8R8A8_UNORM, WINED3D_FFP_EMIT_D3DCOLOR, 4, GL_UNSIGNED_BYTE, GL_TRUE }, - {WINED3DFMT_R8G8B8A8_UINT, WINED3D_FFP_EMIT_UBYTE4, 4, GL_UNSIGNED_BYTE, GL_FALSE}, - {WINED3DFMT_R16G16_UINT, WINED3D_FFP_EMIT_INVALID, 2, GL_UNSIGNED_SHORT, GL_FALSE}, - {WINED3DFMT_R16G16_SINT, WINED3D_FFP_EMIT_SHORT2, 2, GL_SHORT, GL_FALSE}, - {WINED3DFMT_R16G16B16A16_SINT, WINED3D_FFP_EMIT_SHORT4, 4, GL_SHORT, GL_FALSE}, - {WINED3DFMT_R8G8B8A8_UNORM, WINED3D_FFP_EMIT_UBYTE4N, 4, GL_UNSIGNED_BYTE, GL_TRUE }, - {WINED3DFMT_R16G16_SNORM, WINED3D_FFP_EMIT_SHORT2N, 2, GL_SHORT, GL_TRUE }, - {WINED3DFMT_R16G16B16A16_SNORM, WINED3D_FFP_EMIT_SHORT4N, 4, GL_SHORT, GL_TRUE }, - {WINED3DFMT_R16G16_UNORM, WINED3D_FFP_EMIT_USHORT2N, 2, GL_UNSIGNED_SHORT, GL_TRUE }, - {WINED3DFMT_R16G16B16A16_UNORM, WINED3D_FFP_EMIT_USHORT4N, 4, GL_UNSIGNED_SHORT, GL_TRUE }, - {WINED3DFMT_R10G10B10X2_UINT, WINED3D_FFP_EMIT_UDEC3, 3, GL_UNSIGNED_SHORT, GL_FALSE}, - {WINED3DFMT_R10G10B10X2_SNORM, WINED3D_FFP_EMIT_DEC3N, 3, GL_SHORT, GL_TRUE }, - {WINED3DFMT_R10G10B10A2_UNORM, WINED3D_FFP_EMIT_INVALID, 4, GL_UNSIGNED_INT_2_10_10_10_REV, GL_TRUE, + {WINED3DFMT_R32_FLOAT, WINED3D_FFP_EMIT_FLOAT1, 1, GL_FLOAT}, + {WINED3DFMT_R32G32_FLOAT, WINED3D_FFP_EMIT_FLOAT2, 2, GL_FLOAT}, + {WINED3DFMT_R32G32B32_FLOAT, WINED3D_FFP_EMIT_FLOAT3, 3, GL_FLOAT}, + {WINED3DFMT_R32G32B32A32_FLOAT, WINED3D_FFP_EMIT_FLOAT4, 4, GL_FLOAT}, + {WINED3DFMT_B8G8R8A8_UNORM, WINED3D_FFP_EMIT_D3DCOLOR, 4, GL_UNSIGNED_BYTE}, + {WINED3DFMT_R8G8B8A8_UINT, WINED3D_FFP_EMIT_UBYTE4, 4, GL_UNSIGNED_BYTE}, + {WINED3DFMT_R16G16_UINT, WINED3D_FFP_EMIT_INVALID, 2, GL_UNSIGNED_SHORT}, + {WINED3DFMT_R16G16_SINT, WINED3D_FFP_EMIT_SHORT2, 2, GL_SHORT}, + {WINED3DFMT_R16G16B16A16_SINT, WINED3D_FFP_EMIT_SHORT4, 4, GL_SHORT}, + {WINED3DFMT_R8G8B8A8_UNORM, WINED3D_FFP_EMIT_UBYTE4N, 4, GL_UNSIGNED_BYTE}, + {WINED3DFMT_R16G16_SNORM, WINED3D_FFP_EMIT_SHORT2N, 2, GL_SHORT}, + {WINED3DFMT_R16G16B16A16_SNORM, WINED3D_FFP_EMIT_SHORT4N, 4, GL_SHORT}, + {WINED3DFMT_R16G16_UNORM, WINED3D_FFP_EMIT_USHORT2N, 2, GL_UNSIGNED_SHORT}, + {WINED3DFMT_R16G16B16A16_UNORM, WINED3D_FFP_EMIT_USHORT4N, 4, GL_UNSIGNED_SHORT}, + {WINED3DFMT_R10G10B10X2_UINT, WINED3D_FFP_EMIT_UDEC3, 3, GL_UNSIGNED_SHORT}, + {WINED3DFMT_R10G10B10X2_SNORM, WINED3D_FFP_EMIT_DEC3N, 3, GL_SHORT}, + {WINED3DFMT_R10G10B10A2_UNORM, WINED3D_FFP_EMIT_INVALID, 4, GL_UNSIGNED_INT_2_10_10_10_REV, ARB_VERTEX_TYPE_2_10_10_10_REV}, - {WINED3DFMT_R16G16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_2, 2, GL_HALF_FLOAT, GL_FALSE}, - {WINED3DFMT_R16G16B16A16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_4, 4, GL_HALF_FLOAT, GL_FALSE}, - {WINED3DFMT_R8G8B8A8_SNORM, WINED3D_FFP_EMIT_INVALID, 4, GL_BYTE, GL_TRUE }, - {WINED3DFMT_R8G8B8A8_SINT, WINED3D_FFP_EMIT_INVALID, 4, GL_BYTE, GL_FALSE}, - {WINED3DFMT_R16G16B16A16_UINT, WINED3D_FFP_EMIT_INVALID, 4, GL_UNSIGNED_SHORT, GL_FALSE}, - {WINED3DFMT_R8_UNORM, WINED3D_FFP_EMIT_INVALID, 1, GL_UNSIGNED_BYTE, GL_TRUE}, - {WINED3DFMT_R8_UINT, WINED3D_FFP_EMIT_INVALID, 1, GL_UNSIGNED_BYTE, GL_FALSE}, - {WINED3DFMT_R8_SINT, WINED3D_FFP_EMIT_INVALID, 1, GL_BYTE, GL_FALSE}, - {WINED3DFMT_R16_UINT, WINED3D_FFP_EMIT_INVALID, 1, GL_UNSIGNED_SHORT, GL_FALSE}, - {WINED3DFMT_R16_SINT, WINED3D_FFP_EMIT_INVALID, 1, GL_SHORT, GL_FALSE}, - {WINED3DFMT_R32_UINT, WINED3D_FFP_EMIT_INVALID, 1, GL_UNSIGNED_INT, GL_FALSE}, - {WINED3DFMT_R32_SINT, WINED3D_FFP_EMIT_INVALID, 1, GL_INT, GL_FALSE}, - {WINED3DFMT_R32G32_UINT, WINED3D_FFP_EMIT_INVALID, 2, GL_UNSIGNED_INT, GL_FALSE}, - {WINED3DFMT_R32G32_SINT, WINED3D_FFP_EMIT_INVALID, 2, GL_INT, GL_FALSE}, - {WINED3DFMT_R32G32B32_UINT, WINED3D_FFP_EMIT_INVALID, 3, GL_UNSIGNED_INT, GL_FALSE}, - {WINED3DFMT_R32G32B32A32_UINT, WINED3D_FFP_EMIT_INVALID, 4, GL_UNSIGNED_INT, GL_FALSE}, - {WINED3DFMT_R32G32B32A32_SINT, WINED3D_FFP_EMIT_INVALID, 4, GL_INT, GL_FALSE}, + {WINED3DFMT_R16G16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_2, 2, GL_HALF_FLOAT}, + {WINED3DFMT_R16G16B16A16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_4, 4, GL_HALF_FLOAT}, + {WINED3DFMT_R8G8B8A8_SNORM, WINED3D_FFP_EMIT_INVALID, 4, GL_BYTE}, + {WINED3DFMT_R8G8B8A8_SINT, WINED3D_FFP_EMIT_INVALID, 4, GL_BYTE}, + {WINED3DFMT_R16G16B16A16_UINT, WINED3D_FFP_EMIT_INVALID, 4, GL_UNSIGNED_SHORT}, + {WINED3DFMT_R8_UNORM, WINED3D_FFP_EMIT_INVALID, 1, GL_UNSIGNED_BYTE}, + {WINED3DFMT_R8_UINT, WINED3D_FFP_EMIT_INVALID, 1, GL_UNSIGNED_BYTE}, + {WINED3DFMT_R8_SINT, WINED3D_FFP_EMIT_INVALID, 1, GL_BYTE}, + {WINED3DFMT_R16_UINT, WINED3D_FFP_EMIT_INVALID, 1, GL_UNSIGNED_SHORT}, + {WINED3DFMT_R16_SINT, WINED3D_FFP_EMIT_INVALID, 1, GL_SHORT}, + {WINED3DFMT_R32_UINT, WINED3D_FFP_EMIT_INVALID, 1, GL_UNSIGNED_INT}, + {WINED3DFMT_R32_SINT, WINED3D_FFP_EMIT_INVALID, 1, GL_INT}, + {WINED3DFMT_R32G32_UINT, WINED3D_FFP_EMIT_INVALID, 2, GL_UNSIGNED_INT}, + {WINED3DFMT_R32G32_SINT, WINED3D_FFP_EMIT_INVALID, 2, GL_INT}, + {WINED3DFMT_R32G32B32_UINT, WINED3D_FFP_EMIT_INVALID, 3, GL_UNSIGNED_INT}, + {WINED3DFMT_R32G32B32A32_UINT, WINED3D_FFP_EMIT_INVALID, 4, GL_UNSIGNED_INT}, + {WINED3DFMT_R32G32B32A32_SINT, WINED3D_FFP_EMIT_INVALID, 4, GL_INT}, }; struct wined3d_format_texture_info @@ -2067,6 +2066,9 @@ static BOOL init_format_base_info(struct wined3d_adapter *adapter) for (j = 0; j < strlen(typed_formats[i].channels); ++j) { enum wined3d_channel_type channel_type = map_channel_type(typed_formats[i].channels[j]); + + if (channel_type == WINED3D_CHANNEL_TYPE_UNORM || channel_type == WINED3D_CHANNEL_TYPE_SNORM) + flags |= WINED3DFMT_FLAG_NORMALISED; if (channel_type == WINED3D_CHANNEL_TYPE_UINT || channel_type == WINED3D_CHANNEL_TYPE_SINT) flags |= WINED3DFMT_FLAG_INTEGER; if (channel_type == WINED3D_CHANNEL_TYPE_FLOAT) @@ -3684,7 +3686,6 @@ static BOOL init_format_vertex_info(const struct wined3d_adapter *adapter, format->component_count = format_vertex_info[i].component_count; format->gl_vtx_type = format_vertex_info[i].gl_vtx_type; format->gl_vtx_format = format_vertex_info[i].component_count; - format->gl_normalized = format_vertex_info[i].gl_normalized; } return TRUE; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9dd3cd21499..535023fc9f8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4306,6 +4306,7 @@ extern enum wined3d_format_id pixelformat_for_depth(DWORD depth) DECLSPEC_HIDDEN #define WINED3DFMT_FLAG_BLOCKS_NO_VERIFY 0x00100000 #define WINED3DFMT_FLAG_INTEGER 0x00200000 #define WINED3DFMT_FLAG_GEN_MIPMAP 0x00400000 +#define WINED3DFMT_FLAG_NORMALISED 0x00800000 struct wined3d_rational { @@ -4345,7 +4346,6 @@ struct wined3d_format GLint component_count; GLenum gl_vtx_type; GLint gl_vtx_format; - GLboolean gl_normalized; GLint glInternal; GLint glGammaInternal; -- 2.11.0

1 0

[PATCH 2/4] wined3d: Add component info for R10G10B10X2_SNORM and R10G10B10X2_UINT.
by Henri Verbeet 09 Sep '18

09 Sep '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/utils.c | 5 +++-- include/wine/wined3d.h | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 961e3fe7144..84410af5dcc 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -123,8 +123,6 @@ static const struct wined3d_format_channels formats[] = {WINED3DFMT_R5G5_SNORM_L6_UNORM, 5, 5, 0, 0, 0, 5, 0, 0, 2, 0, 0}, {WINED3DFMT_R8G8_SNORM_L8X8_UNORM, 8, 8, 0, 0, 0, 8, 0, 0, 4, 0, 0}, {WINED3DFMT_R10G11B11_SNORM, 10, 11, 11, 0, 0, 10, 21, 0, 4, 0, 0}, - {WINED3DFMT_R10G10B10X2_UINT, 10, 10, 10, 0, 0, 10, 20, 0, 4, 0, 0}, - {WINED3DFMT_R10G10B10X2_SNORM, 10, 10, 10, 0, 0, 10, 20, 0, 4, 0, 0}, {WINED3DFMT_R10G10B10_SNORM_A2_UNORM, 10, 10, 10, 2, 0, 10, 20, 30, 4, 0, 0}, /* Depth stencil formats */ {WINED3DFMT_D16_LOCKABLE, 0, 0, 0, 0, 0, 0, 0, 0, 2, 16, 0}, @@ -155,6 +153,7 @@ static const struct wined3d_format_channels formats[] = {WINED3DFMT_R32G32_TYPELESS, 32, 32, 0, 0, 0, 32, 0, 0, 8, 0, 0}, {WINED3DFMT_R32G8X24_TYPELESS, 0, 0, 0, 0, 0, 0, 0, 0, 8, 32, 8}, {WINED3DFMT_R10G10B10A2_TYPELESS, 10, 10, 10, 2, 0, 10, 20, 30, 4, 0, 0}, + {WINED3DFMT_R10G10B10X2_TYPELESS, 10, 10, 10, 0, 0, 10, 20, 0, 4, 0, 0}, {WINED3DFMT_R8G8B8A8_TYPELESS, 8, 8, 8, 8, 0, 8, 16, 24, 4, 0, 0}, {WINED3DFMT_R16G16_TYPELESS, 16, 16, 0, 0, 0, 16, 0, 0, 4, 0, 0}, {WINED3DFMT_R32_TYPELESS, 32, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0}, @@ -227,6 +226,8 @@ static const struct wined3d_typed_format_info typed_formats[] = {WINED3DFMT_R10G10B10A2_SNORM, WINED3DFMT_R10G10B10A2_TYPELESS, "iiii"}, {WINED3DFMT_R10G10B10A2_UINT, WINED3DFMT_R10G10B10A2_TYPELESS, "UUUU"}, {WINED3DFMT_R10G10B10A2_UNORM, WINED3DFMT_R10G10B10A2_TYPELESS, "uuuu"}, + {WINED3DFMT_R10G10B10X2_SNORM, WINED3DFMT_R10G10B10X2_TYPELESS, "iiiX"}, + {WINED3DFMT_R10G10B10X2_UINT, WINED3DFMT_R10G10B10X2_TYPELESS, "UUUX"}, {WINED3DFMT_R8G8B8A8_UINT, WINED3DFMT_R8G8B8A8_TYPELESS, "UUUU"}, {WINED3DFMT_R8G8B8A8_SINT, WINED3DFMT_R8G8B8A8_TYPELESS, "IIII"}, {WINED3DFMT_R8G8B8A8_SNORM, WINED3DFMT_R8G8B8A8_TYPELESS, "iiii"}, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 239ccd8ec62..ac7e3dd85cb 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -132,6 +132,7 @@ enum wined3d_format_id WINED3DFMT_R5G5_SNORM_L6_UNORM, WINED3DFMT_R8G8_SNORM_L8X8_UNORM, WINED3DFMT_R10G11B11_SNORM, + WINED3DFMT_R10G10B10X2_TYPELESS, WINED3DFMT_R10G10B10X2_UINT, WINED3DFMT_R10G10B10X2_SNORM, WINED3DFMT_R10G10B10_SNORM_A2_UNORM, -- 2.11.0

1 0

[PATCH 1/4] wined3d: Get rid of the "attribute_size" field in struct wined3d_format.
by Henri Verbeet 09 Sep '18

09 Sep '18

Note that "byte_count" is 4 for R10G10B10X2_UINT/R10G10B10X2_SNORM, while "attribute_size" is 6. I think 4 is correct. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/utils.c | 35 ----------------------------------- dlls/wined3d/vertexdeclaration.c | 2 +- dlls/wined3d/wined3d_private.h | 1 - 4 files changed, 2 insertions(+), 38 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index f381b2efb94..e20d66cc880 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -309,7 +309,7 @@ static BOOL buffer_process_converted_attribute(struct wined3d_buffer *buffer, } data = ((DWORD_PTR)attrib->data.addr) % buffer->stride; - for (i = 0; i < format->attribute_size; ++i) + for (i = 0; i < format->byte_count; ++i) { DWORD_PTR idx = (data + i) % buffer->stride; if (buffer->conversion_map[idx] != conversion_type) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 6f13f91353a..961e3fe7144 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3665,34 +3665,6 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ format->flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; } -static unsigned int calculate_vertex_attribute_size(GLenum type, unsigned int component_count) -{ - switch (type) - { - case GL_HALF_FLOAT: - return component_count * sizeof(GLhalfNV); - case GL_FLOAT: - return component_count * sizeof(GLfloat); - case GL_BYTE: - return component_count * sizeof(GLbyte); - case GL_UNSIGNED_BYTE: - return component_count * sizeof(GLubyte); - case GL_SHORT: - return component_count * sizeof(GLshort); - case GL_UNSIGNED_SHORT: - return component_count * sizeof(GLushort); - case GL_INT: - return component_count * sizeof(GLint); - case GL_UNSIGNED_INT: - return component_count * sizeof(GLuint); - case GL_UNSIGNED_INT_2_10_10_10_REV: - return sizeof(GLuint); - default: - FIXME("Unhandled GL type %#x.\n", type); - return 0; - } -} - static BOOL init_format_vertex_info(const struct wined3d_adapter *adapter, struct wined3d_gl_info *gl_info) { @@ -3712,13 +3684,6 @@ static BOOL init_format_vertex_info(const struct wined3d_adapter *adapter, format->gl_vtx_type = format_vertex_info[i].gl_vtx_type; format->gl_vtx_format = format_vertex_info[i].component_count; format->gl_normalized = format_vertex_info[i].gl_normalized; - if (!(format->attribute_size = calculate_vertex_attribute_size(format->gl_vtx_type, - format->component_count))) - { - ERR("Invalid attribute size for vertex format %s (%#x).\n", - debug_d3dformat(format_vertex_info[i].id), format_vertex_info[i].id); - return FALSE; - } } return TRUE; diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index c050a6dda9f..89329d42034 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -315,7 +315,7 @@ static void append_decl_element(struct wined3d_fvf_convert_state *state, elements[idx].usage_idx = usage_idx; format = wined3d_get_format(state->adapter, format_id, 0); - state->offset += format->attribute_size; + state->offset += format->byte_count; ++state->idx; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 70841683e5b..9dd3cd21499 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4346,7 +4346,6 @@ struct wined3d_format GLenum gl_vtx_type; GLint gl_vtx_format; GLboolean gl_normalized; - unsigned int attribute_size; GLint glInternal; GLint glGammaInternal; -- 2.11.0

1 0

[PATCH] ntdll/tests: Add basic tests for NtSetInformationThread(), class ThreadAffinityMask
by Roger Zoellner 09 Sep '18

09 Sep '18

Related to https://source.winehq.org/patches/data/150818 --- dlls/ntdll/tests/Makefile.in | 1 + dlls/ntdll/tests/thread.c | 83 ++++++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+) create mode 100644 dlls/ntdll/tests/thread.c diff --git a/dlls/ntdll/tests/Makefile.in b/dlls/ntdll/tests/Makefile.in index 5c70f3f01a..26b7f8cd09 100644 --- a/dlls/ntdll/tests/Makefile.in +++ b/dlls/ntdll/tests/Makefile.in @@ -22,4 +22,5 @@ C_SRCS = \ rtlstr.c \ string.c \ threadpool.c \ + thread.c \ time.c diff --git a/dlls/ntdll/tests/thread.c b/dlls/ntdll/tests/thread.c new file mode 100644 index 0000000000..740d64fff5 --- /dev/null +++ b/dlls/ntdll/tests/thread.c @@ -0,0 +1,83 @@ +/* + * Unit test suite for ntdll thread functions + * + * Copyright 2018 Roger Zoellner + * + * 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 "ntdll_test.h" + +static NTSTATUS (WINAPI *pNtSetInformationThread)(HANDLE handle, THREADINFOCLASS class, LPCVOID data, ULONG length); + +static DWORD WINAPI thread_main(LPVOID lpParam) +{ + /* Thread is created with CREATE_SUSPENDED flag set and isn't doing anything */ +} + +static void test_NtSetInformationThread(HANDLE thread) +{ + /* class ThreadAffinityMask */ + THREADINFOCLASS class = ThreadAffinityMask; + DWORD_PTR req_aff; + ULONG req_aff_length = sizeof(req_aff); + NTSTATUS status; + + HANDLE process = GetCurrentProcess(); + DWORD_PTR system_aff; + DWORD_PTR process_aff; + BOOL success = GetProcessAffinityMask(process, &process_aff, &system_aff); + ok(success == TRUE, "GetProcessAffinityMask failed. Expected TRUE, got FALSE\n"); + + if (success == FALSE) return; + + /* Test required affinity mask, no bits set */ + req_aff = 0; + status = pNtSetInformationThread(thread, class, &req_aff, req_aff_length); + ok(status == STATUS_INVALID_PARAMETER, "NtSetInformationThread failed. Expected STATUS_INVALID_PARAMETER, got %08x (class=ThreadAffinityMask, case 1, req_aff=%08x, process_aff=%08x)\n", status, req_aff, process_aff); + + /* Test required affinity mask, all bits set */ + req_aff = ~0u; + status = pNtSetInformationThread(thread, class, &req_aff, req_aff_length); + ok(status == STATUS_SUCCESS, "NtSetInformationThread failed. Expected STATUS_SUCCESS, got %08x (class=ThreadAffinityMask, case 2, req_aff=%08x, process_aff=%08x)\n", status, req_aff, process_aff); + + /* Test required affinity mask = process affinity mask */ + req_aff = process_aff; + status = pNtSetInformationThread(thread, class, &req_aff, req_aff_length); + ok(status == STATUS_SUCCESS, "NtSetInformationThread failed. Expected STATUS_SUCCESS, got %08x (class=ThreadAffinityMask, case 3, req_aff=%08x, process_aff=%08x)\n", status, req_aff, process_aff); + + /* Test required affinity mask = process affinity mask with a prepended bit set */ + req_aff = (process_aff << 1) | process_aff; + status = pNtSetInformationThread(thread, class, &req_aff, req_aff_length); + ok(status == STATUS_SUCCESS, "NtSetInformationThread failed. Expected STATUS_SUCCESS, got %08x (class=ThreadAffinityMask, case 4, req_aff=%08x, process_aff=%08x)\n", status, req_aff, process_aff); +} + +START_TEST(thread) +{ + HMODULE mod = GetModuleHandleA("ntdll.dll"); + pNtSetInformationThread = (void *) GetProcAddress(mod ,"NtSetInformationThread"); + HANDLE thread; + + thread = CreateThread(NULL, 0, thread_main, NULL, CREATE_SUSPENDED, NULL); + ok(thread != NULL, "dlls/ntdll/tests/: Could not create new thread\n"); + + if (thread != NULL) + { + test_NtSetInformationThread(thread); + TerminateThread(thread, 0); + CloseHandle(thread); + } +} + -- 2.18.0

4 5

[PATCH] wind3d: Acknowledge additional instruction modifiers
by Tobias Klausmann 09 Sep '18

09 Sep '18

Extended opcodes (modifiers) are primarily used for sign-extension, yet there are some additional modifiers we can parse at least. Information taken from dxvk implementation! There should be no functional change beyond the FIXME -> TRACE change for the newly acknowledge modifiers. Signed-off-by: Tobias Klausmann <tobias.johannes.klausmann(a)mni.thm.de> --- dlls/wined3d/shader_sm4.c | 98 +++++++++++++++++++++++++++------------ 1 file changed, 69 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index b119e8feaa..ad0ac9e80a 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -25,14 +25,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); WINE_DECLARE_DEBUG_CHANNEL(d3d_bytecode); #define WINED3D_SM4_INSTRUCTION_MODIFIER (0x1u << 31) +#define WINED3D_SM4_INSTRUCTION_MODIFIER_BIT 31 -#define WINED3D_SM4_MODIFIER_AOFFIMMI 0x1 -#define WINED3D_SM4_AOFFIMMI_U_SHIFT 9 -#define WINED3D_SM4_AOFFIMMI_U_MASK (0xfu << WINED3D_SM4_AOFFIMMI_U_SHIFT) -#define WINED3D_SM4_AOFFIMMI_V_SHIFT 13 -#define WINED3D_SM4_AOFFIMMI_V_MASK (0xfu << WINED3D_SM4_AOFFIMMI_V_SHIFT) -#define WINED3D_SM4_AOFFIMMI_W_SHIFT 17 -#define WINED3D_SM4_AOFFIMMI_W_MASK (0xfu << WINED3D_SM4_AOFFIMMI_W_SHIFT) +#define WINED3D_SM4_MODIFIER_FIELD_BIT_LOW 0 +#define WINED3D_SM4_MODIFIER_FIELD_BIT_HIGH 5 + +#define WINED3D_SM4_AOFFIMMI_U_BIT_LOW 9 +#define WINED3D_SM4_AOFFIMMI_U_BIT_HIGH 12 + +#define WINED3D_SM4_AOFFIMMI_V_BIT_LOW 13 +#define WINED3D_SM4_AOFFIMMI_V_BIT_HIGH 16 + +#define WINED3D_SM4_AOFFIMMI_W_BIT_LOW 17 +#define WINED3D_SM4_AOFFIMMI_W_BIT_HIGH 20 #define WINED3D_SM4_INSTRUCTION_LENGTH_SHIFT 24 #define WINED3D_SM4_INSTRUCTION_LENGTH_MASK (0x1fu << WINED3D_SM4_INSTRUCTION_LENGTH_SHIFT) @@ -304,6 +309,13 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_DCL_GS_INSTANCES = 0xce, }; +enum wined3d_sm4_ext_opcode { + WINED3D_SM4_EXT_OP_EMPTY = 0, + WINED3D_SM4_EXT_OP_SAMPLE_CONTROLS, + WINED3D_SM4_EXT_OP_RESOURCE_DIM, + WINED3D_SM4_EXT_OP_RESOURCE_RETURN_TYPE, +}; + enum wined3d_sm4_register_type { WINED3D_SM4_RT_TEMP = 0x00, @@ -1222,6 +1234,10 @@ static enum wined3d_data_type map_data_type(char t) } } +inline DWORD bit_extract32(DWORD value, DWORD fst, DWORD lst) { + return (value >> fst) & ~(~0 << (lst - fst + 1)); +} + enum wined3d_shader_type wined3d_get_sm4_shader_type(const DWORD *byte_code, size_t byte_code_size) { DWORD shader_type; @@ -1610,32 +1626,56 @@ static BOOL shader_sm4_read_dst_param(struct wined3d_sm4_data *priv, const DWORD static void shader_sm4_read_instruction_modifier(DWORD modifier, struct wined3d_shader_instruction *ins) { - static const DWORD recognized_bits = WINED3D_SM4_INSTRUCTION_MODIFIER - | WINED3D_SM4_MODIFIER_AOFFIMMI - | WINED3D_SM4_AOFFIMMI_U_MASK - | WINED3D_SM4_AOFFIMMI_V_MASK - | WINED3D_SM4_AOFFIMMI_W_MASK; - - if (modifier & ~recognized_bits) + if (bit_extract32(modifier, + WINED3D_SM4_INSTRUCTION_MODIFIER_BIT, + WINED3D_SM4_INSTRUCTION_MODIFIER_BIT)) { - FIXME("Unhandled modifier 0x%08x.\n", modifier); + const DWORD extOpcode = bit_extract32(modifier, + WINED3D_SM4_MODIFIER_FIELD_BIT_LOW, + WINED3D_SM4_MODIFIER_FIELD_BIT_HIGH); + + switch (extOpcode) + { + case WINED3D_SM4_EXT_OP_SAMPLE_CONTROLS: { + /* Bit fields are used for sign extension */ + struct + { + int u : 4; + int v : 4; + int w : 4; + } + aoffimmi; + + aoffimmi.u = bit_extract32(modifier, + WINED3D_SM4_AOFFIMMI_U_BIT_LOW, + WINED3D_SM4_AOFFIMMI_U_BIT_HIGH); + aoffimmi.v = bit_extract32(modifier, + WINED3D_SM4_AOFFIMMI_V_BIT_LOW, + WINED3D_SM4_AOFFIMMI_V_BIT_HIGH); + aoffimmi.w = bit_extract32(modifier, + WINED3D_SM4_AOFFIMMI_W_BIT_LOW, + WINED3D_SM4_AOFFIMMI_W_BIT_HIGH); + + ins->texel_offset.u = aoffimmi.u; + ins->texel_offset.v = aoffimmi.v; + ins->texel_offset.w = aoffimmi.w; + } + break; + + case WINED3D_SM4_EXT_OP_RESOURCE_DIM: + case WINED3D_SM4_EXT_OP_RESOURCE_RETURN_TYPE: + TRACE("Unhandled opcode extension 0x%08x -> %d\n", modifier, + extOpcode); + break; // part of resource description + + default: + FIXME("Unhandled opcode extension 0x%08x\n", modifier); + break; + } } else { - /* Bit fields are used for sign extension */ - struct - { - int u : 4; - int v : 4; - int w : 4; - } - aoffimmi; - aoffimmi.u = (modifier & WINED3D_SM4_AOFFIMMI_U_MASK) >> WINED3D_SM4_AOFFIMMI_U_SHIFT; - aoffimmi.v = (modifier & WINED3D_SM4_AOFFIMMI_V_MASK) >> WINED3D_SM4_AOFFIMMI_V_SHIFT; - aoffimmi.w = (modifier & WINED3D_SM4_AOFFIMMI_W_MASK) >> WINED3D_SM4_AOFFIMMI_W_SHIFT; - ins->texel_offset.u = aoffimmi.u; - ins->texel_offset.v = aoffimmi.v; - ins->texel_offset.w = aoffimmi.w; + FIXME("Unhandled modifier 0x%08x\n", modifier); } } -- 2.18.0

2 5

[PATCH] ntdll: Workaround for requesting thread affinity mask that isn't a subset of the system's mask
by Roger Zoellner 09 Sep '18

09 Sep '18

This patch is related to the game 'Divinity Original Sin 2' which crashes on startup, if the system only has 4 or less logical cpus. By Microsoft specification, requesting a thread affinity mask requires it be be a subset of the process affiniy mask. However the game requests a mask F...FE (-2) which makes wine to return STATUS_INVALID_PARAMETER, which in turn makes the game hang. This patch will make wine to adjust the mask in this case, which makes the game start correctly. Signed-off-by: Roger Zoellner <zoellner.roger(a)gmail.com> --- dlls/ntdll/thread.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 59d64e174d..6beb8c1a3d 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -1290,6 +1290,7 @@ NTSTATUS WINAPI NtSetInformationThread( HANDLE handle, THREADINFOCLASS class, if (length != sizeof(ULONG_PTR)) return STATUS_INVALID_PARAMETER; req_aff = *(const ULONG_PTR *)data; if ((ULONG)req_aff == ~0u) req_aff = affinity_mask; + else if ((LONG) req_aff < 0) req_aff = affinity_mask & req_aff; else if (req_aff & ~affinity_mask) return STATUS_INVALID_PARAMETER; else if (!req_aff) return STATUS_INVALID_PARAMETER; SERVER_START_REQ( set_thread_info ) -- 2.18.0

3 4

[PATCH] mpr: Implement WNetClearConnections().
by Pierre Schweitzer 09 Sep '18

09 Sep '18

Hi, Please find attached a patch implements an undocumented Windows MPR API that is used on logoff to disconnect any network share connection. Implementation based on: https://git.reactos.org/?p=reactos.git;a=blob;f=base/applications/network/n… Successfully tested in: https://jira.reactos.org/browse/CORE-15012 Cheers, -- Pierre Schweitzer <pierre at reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.

1 0

[PATCH v2] find: First simple implementation and tests
by Fabian Maurer 09 Sep '18

09 Sep '18

The message text is the same as on windows, since the exit code doesn't seem reliable. v2: Read input text line by line Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- configure | 25 ++--- configure.ac | 1 + programs/find/Makefile.in | 5 +- programs/find/find.c | 137 +++++++++++++++++++++++++- programs/find/resources.h | 27 +++++ programs/find/rsrc.rc | 25 +++++ programs/find/tests/Makefile.in | 4 + programs/find/tests/find.c | 169 ++++++++++++++++++++++++++++++++ 8 files changed, 369 insertions(+), 24 deletions(-) create mode 100644 programs/find/resources.h create mode 100644 programs/find/rsrc.rc create mode 100644 programs/find/tests/Makefile.in create mode 100644 programs/find/tests/find.c diff --git a/configure b/configure index 337ce912fe..40f697d60c 100755 --- a/configure +++ b/configure @@ -805,7 +805,6 @@ infodir docdir oldincludedir includedir -runstatedir localstatedir sharedstatedir sysconfdir @@ -1870,7 +1869,6 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -2123,15 +2121,6 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; - -runstatedir | --runstatedir | --runstatedi | --runstated \ - | --runstate | --runstat | --runsta | --runst | --runs \ - | --run | --ru | --r) - ac_prev=runstatedir ;; - -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ - | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ - | --run=* | --ru=* | --r=*) - runstatedir=$ac_optarg ;; - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -2269,7 +2258,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir runstatedir + libdir localedir mandir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -2422,7 +2411,6 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -6803,7 +6791,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -6849,7 +6837,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -6873,7 +6861,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -6918,7 +6906,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -6942,7 +6930,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -20030,6 +20018,7 @@ wine_fn_config_makefile programs/explorer enable_explorer wine_fn_config_makefile programs/extrac32 enable_extrac32 wine_fn_config_makefile programs/fc enable_fc wine_fn_config_makefile programs/find enable_find +wine_fn_config_makefile programs/find/tests enable_tests wine_fn_config_makefile programs/findstr enable_findstr wine_fn_config_makefile programs/fsutil enable_fsutil wine_fn_config_makefile programs/hh enable_hh diff --git a/configure.ac b/configure.ac index be247ea200..e8edcbe522 100644 --- a/configure.ac +++ b/configure.ac @@ -3891,6 +3891,7 @@ WINE_CONFIG_MAKEFILE(programs/explorer) WINE_CONFIG_MAKEFILE(programs/extrac32) WINE_CONFIG_MAKEFILE(programs/fc) WINE_CONFIG_MAKEFILE(programs/find) +WINE_CONFIG_MAKEFILE(programs/find/tests) WINE_CONFIG_MAKEFILE(programs/findstr) WINE_CONFIG_MAKEFILE(programs/fsutil) WINE_CONFIG_MAKEFILE(programs/hh) diff --git a/programs/find/Makefile.in b/programs/find/Makefile.in index ef8d61b7ce..4a90905986 100644 --- a/programs/find/Makefile.in +++ b/programs/find/Makefile.in @@ -1,4 +1,7 @@ MODULE = find.exe -APPMODE = -mconsole -municode +APPMODE = -mconsole +IMPORTS = user32 shlwapi C_SRCS = find.c + +RC_SRCS = rsrc.rc diff --git a/programs/find/find.c b/programs/find/find.c index 9d7aecd402..bbac3eeee0 100644 --- a/programs/find/find.c +++ b/programs/find/find.c @@ -16,18 +16,145 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <windows.h> +#include <stdlib.h> +#include <shlwapi.h> + +#include "wine/heap.h" #include "wine/debug.h" +#include "resources.h" WINE_DEFAULT_DEBUG_CHANNEL(find); -int wmain(int argc, WCHAR *argv[]) +/* Reads a line from a handle, returns TRUE if there is more to be read */ +BOOL read_line_from_handle(HANDLE handle, char **line_out) +{ + int buffer_size = 4096; + char c; + DWORD bytes_read; + int length = 0; + BOOL success; + char *line = heap_alloc(buffer_size); + + for (;;) + { + success = ReadFile(handle, &c, 1, &bytes_read, NULL); + + if (c == '\n') + break; + + /* Check for EOF */ + if (!success || !bytes_read) + { + if (length == 0) + return FALSE; + else + break; + } + + /* Make sure buffer is large enough */ + if (length + bytes_read >= buffer_size) + { + buffer_size *= 2; + line = heap_realloc(line, buffer_size); + } + + line[length++] = c; + } + + line[length] = 0; + if (length - 1 >= 0 && line[length - 1] == '\r') + line[length - 1] = 0; + + *line_out = line; + return TRUE; +} + +void write_to_handle(HANDLE handle, const char *str) +{ + DWORD bytes_written_sum = 0; + DWORD length = lstrlenA(str); + do + { + DWORD bytes_written; + WriteFile(handle, str, length * sizeof(char), &bytes_written, NULL); + bytes_written_sum += bytes_written; + } while (bytes_written_sum < length); +} + +void find_printf(const char *str) +{ + write_to_handle(GetStdHandle(STD_OUTPUT_HANDLE), str); +} + +BOOL run_find_for_line(const char *line, const char *tofind) { + void *found; + + if (lstrlenA(line) == 0) + return FALSE; + + found = StrStrA(line, tofind); + + if (found) + { + find_printf(line); + find_printf("\r\n"); + return TRUE; + } + + return FALSE; +} + +int main(int argc, char *argv[]) +{ + char *line; + char *tofind = NULL; + char message_parameter_invalid[64]; + char message_switch_invalid[64]; int i; + int exitcode; + HANDLE input; - WINE_FIXME("stub:"); + TRACE("running find:"); for (i = 0; i < argc; i++) - WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); - WINE_FIXME("\n"); + { + TRACE(" %s", argv[i]); + } + TRACE("\n"); + + LoadStringA(GetModuleHandleW(NULL), IDS_INVALID_PARAMETER, message_parameter_invalid, sizeof(message_parameter_invalid)); + LoadStringA(GetModuleHandleW(NULL), IDS_INVALID_SWITCH, message_switch_invalid, sizeof(message_switch_invalid)); + + input = GetStdHandle(STD_INPUT_HANDLE); + + for (i = 1; i < argc; i++) + { + if (argv[i][0] == '/') + { + find_printf(message_switch_invalid); + return 2; + } + else if(tofind == NULL) + { + tofind = argv[i]; + } + } + + if (tofind == NULL) + { + find_printf(message_parameter_invalid); + return 2; + } + + exitcode = 1; + while (read_line_from_handle(input, &line)) + { + if (run_find_for_line(line, tofind)) + exitcode = 0; + + heap_free(line); + } - return 0; + return exitcode; } diff --git a/programs/find/resources.h b/programs/find/resources.h new file mode 100644 index 0000000000..8712d91e36 --- /dev/null +++ b/programs/find/resources.h @@ -0,0 +1,27 @@ +/* + * Resource IDs + * + * Copyright 2018 Fabian Maurer + * + * 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 __WINE_FIND_RESOURCES_H +#define __WINE_FIND_RESOURCES_H + +#define IDS_INVALID_PARAMETER 1000 +#define IDS_INVALID_SWITCH 1001 + +#endif /* __WINE_FIND_RESOURCES_H */ diff --git a/programs/find/rsrc.rc b/programs/find/rsrc.rc new file mode 100644 index 0000000000..f10fb6285f --- /dev/null +++ b/programs/find/rsrc.rc @@ -0,0 +1,25 @@ +/* + * Copyright 2018 Fabian Maurer + * + * 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 "resources.h" + +STRINGTABLE +{ + IDS_INVALID_PARAMETER "FIND: Parameter format not correct\r\n" + IDS_INVALID_SWITCH "FIND: Invalid switch\r\n" +} diff --git a/programs/find/tests/Makefile.in b/programs/find/tests/Makefile.in new file mode 100644 index 0000000000..ad88243ede --- /dev/null +++ b/programs/find/tests/Makefile.in @@ -0,0 +1,4 @@ +TESTDLL = find.exe + +C_SRCS = \ + find.c diff --git a/programs/find/tests/find.c b/programs/find/tests/find.c new file mode 100644 index 0000000000..615d99ca59 --- /dev/null +++ b/programs/find/tests/find.c @@ -0,0 +1,169 @@ +/* + * Copyright 2018 Fabian Maurer + * + * 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 <windows.h> +#include <stdio.h> + +#include "wine/heap.h" +#include "wine/test.h" + +char* read_all_from_handle(HANDLE handle) +{ + char buffer[4096]; + DWORD bytes_read; + DWORD length = 0; + BOOL success; + char *ret = heap_alloc_zero(1); + + for (;;) + { + success = ReadFile(handle, buffer, sizeof(buffer), &bytes_read, NULL); + if (!success || !bytes_read) + break; + ret = heap_realloc(ret, length + bytes_read); + memcpy((char *)ret + length, buffer, bytes_read); + length += bytes_read; + } + + ret[length] = 0; + return ret; +} + +/* Copied from find.exe implementation */ +void write_to_handle(HANDLE handle, const char *str) +{ + DWORD bytes_written_sum = 0; + DWORD length = lstrlenA(str); + do + { + DWORD bytes_written; + WriteFile(handle, str, length * sizeof(char), &bytes_written, NULL); + bytes_written_sum += bytes_written; + } while (bytes_written_sum < length); +} + +#define run_find(commandline, input, out_expected, exitcode_expected) \ + run_find_(commandline, input, out_expected, exitcode_expected, __FILE__, __LINE__) + +static void run_find_(const char *commandline, const char *input, const char *out_expected, int exitcode_expected, const char *file, int line) +{ + HANDLE child_stdin_read; + HANDLE child_stdout_write; + HANDLE parent_stdin_write; + HANDLE parent_stdout_read; + STARTUPINFOA startup_info = {0}; + SECURITY_ATTRIBUTES security_attributes; + PROCESS_INFORMATION process_info = {0}; + char *child_output = NULL; + char cmd[4096]; + int comparison; + DWORD exitcode; + + security_attributes.nLength = sizeof(SECURITY_ATTRIBUTES); + security_attributes.bInheritHandle = TRUE; + security_attributes.lpSecurityDescriptor = NULL; + + CreatePipe(&parent_stdout_read, &child_stdout_write, &security_attributes, 0); + CreatePipe(&child_stdin_read, &parent_stdin_write, &security_attributes, 0); + + SetHandleInformation(parent_stdout_read, HANDLE_FLAG_INHERIT, 0); + SetHandleInformation(parent_stdin_write, HANDLE_FLAG_INHERIT, 0); + + startup_info.cb = sizeof(STARTUPINFOW); + startup_info.hStdInput = child_stdin_read; + startup_info.hStdOutput = child_stdout_write; + startup_info.hStdError = NULL; + startup_info.dwFlags |= STARTF_USESTDHANDLES; + + sprintf(cmd, "find.exe %s", commandline); + CreateProcessA(NULL, cmd, NULL, NULL, TRUE, 0, NULL, NULL, &startup_info, &process_info); + CloseHandle(child_stdin_read); + CloseHandle(child_stdout_write); + + write_to_handle(parent_stdin_write, input); + CloseHandle(parent_stdin_write); + + child_output = read_all_from_handle(parent_stdout_read); + CloseHandle(parent_stdout_read); + + GetExitCodeProcess(process_info.hProcess, &exitcode); + CloseHandle(process_info.hProcess); + CloseHandle(process_info.hThread); + + comparison = lstrcmpA(child_output, out_expected); + + ok_(file, line)(comparison == 0, "\n#################### Expected:\n" + "%s\n" + "#################### But got:\n" + "%s\n" + "####################\n", + out_expected, child_output); + ok_(file, line)(exitcode == exitcode_expected, "Expected exitcode %d, got %d\n", exitcode_expected, exitcode); + + heap_free(child_output); +} + +static void test_errors(void) +{ + run_find("", "", "FIND: Parameter format not correct\r\n", 2); + todo_wine + run_find("test", "", "FIND: Parameter format not correct\r\n", 2); + todo_wine + run_find("\"test", "", "FIND: Parameter format not correct\r\n", 2); + run_find("\"test\" /XYZ", "", "FIND: Invalid switch\r\n", 2); +} + +static void test_singleline_without_switches(void) +{ + run_find("\"\"", "test", "", 1); + run_find("\"test\"", "", "", 1); + run_find("\"test\"", "test", "test\r\n", 0); + run_find("\"test\"", "test2", "test2\r\n", 0); + run_find("\"test2\"", "test", "", 1); + +} + +static void test_multiline(void) +{ + /* Newline in input shouldn't work */ + run_find("\"t1\r\nt1\"", "t1\r\nt1", "", 1); + run_find("\"t1\nt1\"", "t1\nt1", "", 1); + + /* Newline should always be displayed as \r\n */ + run_find("\"test1\"", "test1\ntest2", "test1\r\n", 0); + run_find("\"test1\"", "test1\r\ntest2", "test1\r\n", 0); + + /* Test with empty line */ + run_find("\"test1\"", "test1\n\ntest2", "test1\r\n", 0); + + /* Two strings to be found */ + run_find("\"test\"", "junk1\ntest1\ntest2\r\njunk", "test1\r\ntest2\r\n", 0); +} + +START_TEST(find) +{ + if (PRIMARYLANGID(GetUserDefaultUILanguage()) != LANG_ENGLISH) + { + skip("Tests only work with english locale.\n"); + return; + } + + test_errors(); + test_singleline_without_switches(); + test_multiline(); +} -- 2.18.0

2 9

[PATCH] kernel32/tests: Allow ERROR_ACCESS_DENIED for newer Win10
by André Hentschel 09 Sep '18

09 Sep '18

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/kernel32/tests/loader.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index e4d6741b6f..e7a1a4307c 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -3163,7 +3163,8 @@ todo_wine if (!ret) ok(GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_GEN_FAILURE /* win7 64-bit */ || - GetLastError() == ERROR_INVALID_FUNCTION /* vista 64-bit */, + GetLastError() == ERROR_INVALID_FUNCTION /* vista 64-bit */ || + GetLastError() == ERROR_ACCESS_DENIED /* Win10 32-bit */, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); SetLastError(0xdeadbeef); ctx.ContextFlags = CONTEXT_INTEGER; @@ -3186,7 +3187,8 @@ todo_wine if (!ret) ok(GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_GEN_FAILURE /* win7 64-bit */ || - GetLastError() == ERROR_INVALID_FUNCTION /* vista 64-bit */, + GetLastError() == ERROR_INVALID_FUNCTION /* vista 64-bit */ || + GetLastError() == ERROR_ACCESS_DENIED /* Win10 32-bit */, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); SetLastError(0xdeadbeef); ctx.ContextFlags = CONTEXT_INTEGER; -- 2.17.1

1 0

[PATCH] advapi32/tests: Allow ERROR_ACCESS_DENIED for newer Win10
by André Hentschel 09 Sep '18

09 Sep '18

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/advapi32/tests/security.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index aebf3b83cd..3ca151d0fd 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3149,8 +3149,8 @@ static void test_impersonation_level(void) /* can't perform access check when opening object against an identification impersonation token */ error = RegOpenKeyExA(HKEY_CURRENT_USER, "Software", 0, KEY_READ, &hkey); todo_wine { - ok(error == ERROR_INVALID_HANDLE || error == ERROR_BAD_IMPERSONATION_LEVEL, - "RegOpenKeyEx should have failed with ERROR_INVALID_HANDLE or ERROR_BAD_IMPERSONATION_LEVEL instead of %d\n", error); + ok(error == ERROR_INVALID_HANDLE || error == ERROR_BAD_IMPERSONATION_LEVEL || error == ERROR_ACCESS_DENIED, + "RegOpenKeyEx should have failed with ERROR_INVALID_HANDLE, ERROR_BAD_IMPERSONATION_LEVEL or ERROR_ACCESS_DENIED instead of %d\n", error); } ret = PrivilegeCheck(Token, PrivilegeSet, &AccessGranted); ok(ret, "PrivilegeCheck for SecurityIdentification failed with error %d\n", GetLastError()); -- 2.17.1

1 0

[PATCH] oleaut32/tests: Adjust test to a fixed Windows bug
by André Hentschel 09 Sep '18

09 Sep '18

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/oleaut32/tests/safearray.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index 5d541466e3..9cc3793bc7 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -2018,9 +2018,10 @@ static void test_SafeArrayDestroyData (void) ok(hres == S_OK, "got 0x%08x\n", hres); todo_wine ok(sa->fFeatures == FADF_HAVEVARTYPE, "got 0x%x\n", sa->fFeatures); - ok(sa->pvData != NULL, "got %p\n", sa->pvData); - /* There seems to be a bug on windows, especially visible on 64bit systems, - probably double-free of similar issue. */ +todo_wine + ok(sa->pvData == NULL || broken(sa->pvData != NULL), "got %p\n", sa->pvData); + /* There was a bug on windows, especially visible on 64bit systems, + probably double-free or similar issue. */ sa->pvData = NULL; SafeArrayDestroy(sa); } -- 2.17.1

1 0

[PATCH] crypt32: Print Crypt(Un)protectMemory FIXME only once
by André Hentschel 09 Sep '18

09 Sep '18

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/crypt32/main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c index 9ff7592282..79a0ce1fd3 100644 --- a/dlls/crypt32/main.c +++ b/dlls/crypt32/main.c @@ -252,12 +252,14 @@ ASN1encoding_t WINAPI I_CryptGetAsn1Encoder(HCRYPTASN1MODULE x) BOOL WINAPI CryptProtectMemory(void *data, DWORD len, DWORD flags) { - FIXME("(%p %u %08x): stub\n", data, len, flags); + static int fixme_once; + if (!fixme_once++) FIXME("(%p %u %08x): stub\n", data, len, flags); return TRUE; } BOOL WINAPI CryptUnprotectMemory(void *data, DWORD len, DWORD flags) { - FIXME("(%p %u %08x): stub\n", data, len, flags); + static int fixme_once; + if (!fixme_once++) FIXME("(%p %u %08x): stub\n", data, len, flags); return TRUE; } -- 2.17.1

1 0

[PATCH] wind3d: Acknowledge additional instruction modifiers
by Tobias Klausmann 08 Sep '18

08 Sep '18

Extended opcodes (modifiers) are primarily used for sign-extension, yet there are some additional modifiers we can parse at least. Information taken from dxvk implementation! There should be no functional change beyond the FIXME -> TRACE change for the newly acknowledge modifiers. Signed-off-by: Tobias Klausmann <tobias.johannes.klausmann(a)mni.thm.de> --- dlls/wined3d/shader_sm4.c | 98 +++++++++++++++++++++++++++------------ 1 file changed, 69 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index b119e8feaa..ad0ac9e80a 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -25,14 +25,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); WINE_DECLARE_DEBUG_CHANNEL(d3d_bytecode); #define WINED3D_SM4_INSTRUCTION_MODIFIER (0x1u << 31) +#define WINED3D_SM4_INSTRUCTION_MODIFIER_BIT 31 -#define WINED3D_SM4_MODIFIER_AOFFIMMI 0x1 -#define WINED3D_SM4_AOFFIMMI_U_SHIFT 9 -#define WINED3D_SM4_AOFFIMMI_U_MASK (0xfu << WINED3D_SM4_AOFFIMMI_U_SHIFT) -#define WINED3D_SM4_AOFFIMMI_V_SHIFT 13 -#define WINED3D_SM4_AOFFIMMI_V_MASK (0xfu << WINED3D_SM4_AOFFIMMI_V_SHIFT) -#define WINED3D_SM4_AOFFIMMI_W_SHIFT 17 -#define WINED3D_SM4_AOFFIMMI_W_MASK (0xfu << WINED3D_SM4_AOFFIMMI_W_SHIFT) +#define WINED3D_SM4_MODIFIER_FIELD_BIT_LOW 0 +#define WINED3D_SM4_MODIFIER_FIELD_BIT_HIGH 5 + +#define WINED3D_SM4_AOFFIMMI_U_BIT_LOW 9 +#define WINED3D_SM4_AOFFIMMI_U_BIT_HIGH 12 + +#define WINED3D_SM4_AOFFIMMI_V_BIT_LOW 13 +#define WINED3D_SM4_AOFFIMMI_V_BIT_HIGH 16 + +#define WINED3D_SM4_AOFFIMMI_W_BIT_LOW 17 +#define WINED3D_SM4_AOFFIMMI_W_BIT_HIGH 20 #define WINED3D_SM4_INSTRUCTION_LENGTH_SHIFT 24 #define WINED3D_SM4_INSTRUCTION_LENGTH_MASK (0x1fu << WINED3D_SM4_INSTRUCTION_LENGTH_SHIFT) @@ -304,6 +309,13 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_DCL_GS_INSTANCES = 0xce, }; +enum wined3d_sm4_ext_opcode { + WINED3D_SM4_EXT_OP_EMPTY = 0, + WINED3D_SM4_EXT_OP_SAMPLE_CONTROLS, + WINED3D_SM4_EXT_OP_RESOURCE_DIM, + WINED3D_SM4_EXT_OP_RESOURCE_RETURN_TYPE, +}; + enum wined3d_sm4_register_type { WINED3D_SM4_RT_TEMP = 0x00, @@ -1222,6 +1234,10 @@ static enum wined3d_data_type map_data_type(char t) } } +inline DWORD bit_extract32(DWORD value, DWORD fst, DWORD lst) { + return (value >> fst) & ~(~0 << (lst - fst + 1)); +} + enum wined3d_shader_type wined3d_get_sm4_shader_type(const DWORD *byte_code, size_t byte_code_size) { DWORD shader_type; @@ -1610,32 +1626,56 @@ static BOOL shader_sm4_read_dst_param(struct wined3d_sm4_data *priv, const DWORD static void shader_sm4_read_instruction_modifier(DWORD modifier, struct wined3d_shader_instruction *ins) { - static const DWORD recognized_bits = WINED3D_SM4_INSTRUCTION_MODIFIER - | WINED3D_SM4_MODIFIER_AOFFIMMI - | WINED3D_SM4_AOFFIMMI_U_MASK - | WINED3D_SM4_AOFFIMMI_V_MASK - | WINED3D_SM4_AOFFIMMI_W_MASK; - - if (modifier & ~recognized_bits) + if (bit_extract32(modifier, + WINED3D_SM4_INSTRUCTION_MODIFIER_BIT, + WINED3D_SM4_INSTRUCTION_MODIFIER_BIT)) { - FIXME("Unhandled modifier 0x%08x.\n", modifier); + const DWORD extOpcode = bit_extract32(modifier, + WINED3D_SM4_MODIFIER_FIELD_BIT_LOW, + WINED3D_SM4_MODIFIER_FIELD_BIT_HIGH); + + switch (extOpcode) + { + case WINED3D_SM4_EXT_OP_SAMPLE_CONTROLS: { + /* Bit fields are used for sign extension */ + struct + { + int u : 4; + int v : 4; + int w : 4; + } + aoffimmi; + + aoffimmi.u = bit_extract32(modifier, + WINED3D_SM4_AOFFIMMI_U_BIT_LOW, + WINED3D_SM4_AOFFIMMI_U_BIT_HIGH); + aoffimmi.v = bit_extract32(modifier, + WINED3D_SM4_AOFFIMMI_V_BIT_LOW, + WINED3D_SM4_AOFFIMMI_V_BIT_HIGH); + aoffimmi.w = bit_extract32(modifier, + WINED3D_SM4_AOFFIMMI_W_BIT_LOW, + WINED3D_SM4_AOFFIMMI_W_BIT_HIGH); + + ins->texel_offset.u = aoffimmi.u; + ins->texel_offset.v = aoffimmi.v; + ins->texel_offset.w = aoffimmi.w; + } + break; + + case WINED3D_SM4_EXT_OP_RESOURCE_DIM: + case WINED3D_SM4_EXT_OP_RESOURCE_RETURN_TYPE: + TRACE("Unhandled opcode extension 0x%08x -> %d\n", modifier, + extOpcode); + break; // part of resource description + + default: + FIXME("Unhandled opcode extension 0x%08x\n", modifier); + break; + } } else { - /* Bit fields are used for sign extension */ - struct - { - int u : 4; - int v : 4; - int w : 4; - } - aoffimmi; - aoffimmi.u = (modifier & WINED3D_SM4_AOFFIMMI_U_MASK) >> WINED3D_SM4_AOFFIMMI_U_SHIFT; - aoffimmi.v = (modifier & WINED3D_SM4_AOFFIMMI_V_MASK) >> WINED3D_SM4_AOFFIMMI_V_SHIFT; - aoffimmi.w = (modifier & WINED3D_SM4_AOFFIMMI_W_MASK) >> WINED3D_SM4_AOFFIMMI_W_SHIFT; - ins->texel_offset.u = aoffimmi.u; - ins->texel_offset.v = aoffimmi.v; - ins->texel_offset.w = aoffimmi.w; + FIXME("Unhandled modifier 0x%08x\n", modifier); } } -- 2.18.0

1 0

[PATCH v2 3/3] comdlg32/tests: Fix failures on newer Windows 10.
by Zhiyi Zhang 08 Sep '18

08 Sep '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comdlg32/tests/itemdlg.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index 6b63063e29..c9ba23d045 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -1069,7 +1069,7 @@ static void test_advise_helper(IFileDialog *pfd) for(i = 0; i < 10; i++) { hr = IFileDialog_Advise(pfd, pfde, &cookie[i]); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(cookie[i] == i+1, "Got cookie: %d\n", cookie[i]); + ok(cookie[i] == i+cookie[0], "Got cookie: %d\n", cookie[i]); } ok(pfdeimpl->ref == 10+1, "got ref %d\n", pfdeimpl->ref); ensure_zero_events(pfdeimpl); @@ -1102,7 +1102,8 @@ static void test_advise_helper(IFileDialog *pfd) hr = IFileDialog_Advise(pfd, pfde, &cookie[0]); ok(hr == S_OK, "got 0x%08x\n", hr); - todo_wine ok(cookie[0] == 1, "got cookie: %d\n", cookie[0]); + /* cookie[0] is 4 on Windows 10 17134 */ + todo_wine ok(cookie[0] == 1 || cookie[0] == 4, "got cookie: %d\n", cookie[0]); ok(pfdeimpl->ref == 1+1, "got ref %d\n", pfdeimpl->ref); ensure_zero_events(pfdeimpl); -- 2.18.0

1 0

[PATCH v2 2/3] comdlg32: Check invalid options in IFileDialog::SetOptions.
by Zhiyi Zhang 08 Sep '18

08 Sep '18

Fix Steam chat unable to select files. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Use bitmask of known values to check invalid options. dlls/comdlg32/itemdlg.c | 10 ++++++++++ dlls/comdlg32/tests/itemdlg.c | 19 +++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index c8eff3438d..5f4c593ed7 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -2505,6 +2505,16 @@ static HRESULT WINAPI IFileDialog2_fnSetOptions(IFileDialog2 *iface, FILEOPENDIA FileDialogImpl *This = impl_from_IFileDialog2(iface); TRACE("%p (0x%x)\n", This, fos); + if (fos & ~(FOS_OVERWRITEPROMPT | FOS_STRICTFILETYPES | FOS_NOCHANGEDIR | FOS_PICKFOLDERS | FOS_FORCEFILESYSTEM + | FOS_ALLNONSTORAGEITEMS | FOS_NOVALIDATE | FOS_ALLOWMULTISELECT | FOS_PATHMUSTEXIST | FOS_FILEMUSTEXIST + | FOS_CREATEPROMPT | FOS_SHAREAWARE | FOS_NOREADONLYRETURN | FOS_NOTESTFILECREATE | FOS_HIDEMRUPLACES + | FOS_HIDEPINNEDPLACES | FOS_NODEREFERENCELINKS | FOS_DONTADDTORECENT | FOS_FORCESHOWHIDDEN + | FOS_DEFAULTNOMINIMODE | FOS_FORCEPREVIEWPANEON | FOS_SUPPORTSTREAMABLEITEMS)) + { + WARN("FILEOPENDIALOGOPTIONS 0x%08x contains unknown enums\n", fos); + return E_INVALIDARG; + } + if( !(This->options & FOS_PICKFOLDERS) && (fos & FOS_PICKFOLDERS) ) { WCHAR buf[30]; diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index d3be8c8d29..6b63063e29 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -536,6 +536,8 @@ static void test_basics(void) const WCHAR fname2[] = {'f','n','a','m','e','2', 0}; const WCHAR fspec2[] = {'*','.','e','x','e',0}; COMDLG_FILTERSPEC filterspec[2] = {{fname1, fspec1}, {fname2, fspec2}}; + const DWORD invalid_fos[] = {0x1, 0x10, 0x400, 0x80000, 0x400000, 0x800000, 0x1000000, 0x4000000, 0x8000000}; + INT i; /* This should work on every platform with IFileDialog */ SHGetDesktopFolder(&psfdesktop); @@ -586,6 +588,23 @@ static void test_basics(void) ok(fdoptions == (FOS_OVERWRITEPROMPT | FOS_NOREADONLYRETURN | FOS_PATHMUSTEXIST | FOS_NOCHANGEDIR), "Unexpected default options: 0x%08x\n", fdoptions); + /* Check SetOptions invalid options handling */ + for (i = 0; i < ARRAY_SIZE(invalid_fos); i++) + { + hr = IFileOpenDialog_SetOptions(pfod, invalid_fos[i]); + ok(hr == E_INVALIDARG, "got 0x%08x.\n", hr); + hr = IFileOpenDialog_GetOptions(pfod, &fdoptions); + ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(fdoptions == (FOS_PATHMUSTEXIST | FOS_FILEMUSTEXIST | FOS_NOCHANGEDIR), "got %08x\n", fdoptions); + + hr = IFileSaveDialog_SetOptions(pfsd, invalid_fos[i]); + ok(hr == E_INVALIDARG, "got 0x%08x.\n", hr); + hr = IFileSaveDialog_GetOptions(pfsd, &fdoptions); + ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(fdoptions == (FOS_OVERWRITEPROMPT | FOS_NOREADONLYRETURN | FOS_PATHMUSTEXIST | FOS_NOCHANGEDIR), + "got %08x\n", fdoptions); + } + /* GetResult */ hr = IFileOpenDialog_GetResult(pfod, NULL); ok(hr == E_INVALIDARG, "got 0x%08x.\n", hr); -- 2.18.0

1 0

[PATCH v2 1/3] comdlg32/tests: Fix crashes.
by Zhiyi Zhang 08 Sep '18

08 Sep '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comdlg32/tests/itemdlg.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index d28e682b49..d3be8c8d29 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -1032,10 +1032,14 @@ static void test_advise_helper(IFileDialog *pfd) pfde = IFileDialogEvents_Constructor(); pfdeimpl = impl_from_IFileDialogEvents(pfde); - hr = IFileDialog_Advise(pfd, NULL, NULL); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); - hr = IFileDialog_Advise(pfd, pfde, NULL); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + /* Null pointer tests crashed on Windows 10 16299 or newer */ + if (0) + { + hr = IFileDialog_Advise(pfd, NULL, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + hr = IFileDialog_Advise(pfd, pfde, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + } hr = IFileDialog_Advise(pfd, NULL, &cookie[0]); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); ok(pfdeimpl->ref == 1, "got ref %d\n", pfdeimpl->ref); -- 2.18.0

1 0

[PATCH v5] kernel32: Correct ReplaceFileW behaviour
by Brock York 08 Sep '18

08 Sep '18

ReplaceFileW should fail with ERROR_ACCESS_DENIED when either the replaced or replacement file is set to read only using SetFileAttributes. Testing for the return values of ReplaceFileW was performed on a Windows XP SP3 and Windows 10 vm. Remove GENERIC_WRITE flag when opening replaced file. ReplaceFileW will fail when called to replace the current executable. This is not the same behaviour as tested on Windows 7, 10 and XP this is because the "replaced" file is opened with the GENERIC_WRITE flag. The MSDN also mentions that the replaced file is only opened with GENERIC_READ, DELETE and SYNCHRONIZE. This patch will fix the following bug once it is merged into Wine-Staging as the WarFrame launcher requires patches from Wine-Staging to work. Wine-Bug:https://bugs.winehq.org/show_bug.cgi?id=33845 Signed-off-by: Brock York <twunknown(a)gmail.com> --- dlls/kernel32/file.c | 29 ++++++++++++++++++++++++++++- dlls/kernel32/tests/file.c | 4 ++-- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 081f0760a5..b31b054f35 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1738,6 +1738,7 @@ BOOL WINAPI ReplaceFileW(LPCWSTR lpReplacedFileName, LPCWSTR lpReplacementFileNa NTSTATUS status; IO_STATUS_BLOCK io; OBJECT_ATTRIBUTES attr; + BY_HANDLE_FILE_INFORMATION file_info; TRACE("%s %s %s 0x%08x %p %p\n", debugstr_w(lpReplacedFileName), debugstr_w(lpReplacementFileName), debugstr_w(lpBackupFileName), @@ -1772,7 +1773,7 @@ BOOL WINAPI ReplaceFileW(LPCWSTR lpReplacedFileName, LPCWSTR lpReplacementFileNa } replaced_flags = lpBackupFileName ? FILE_OPEN : FILE_OPEN_IF; attr.ObjectName = &nt_replaced_name; - status = NtOpenFile(&hReplaced, GENERIC_READ|GENERIC_WRITE|DELETE|SYNCHRONIZE, + status = NtOpenFile(&hReplaced, GENERIC_READ|DELETE|SYNCHRONIZE, &attr, &io, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_SYNCHRONOUS_IO_NONALERT|FILE_NON_DIRECTORY_FILE); @@ -1788,6 +1789,19 @@ BOOL WINAPI ReplaceFileW(LPCWSTR lpReplacedFileName, LPCWSTR lpReplacementFileNa goto fail; } + /* Replacement should fail if replaced is READ_ONLY */ + if (!GetFileInformationByHandle(hReplaced, &file_info)) + { + error = GetLastError(); + goto fail; + } + + if (file_info.dwFileAttributes & FILE_ATTRIBUTE_READONLY) + { + error = ERROR_ACCESS_DENIED; + goto fail; + } + /* * Open the replacement file for reading, writing, and deleting * (writing and deleting are needed when finished) @@ -1811,6 +1825,19 @@ BOOL WINAPI ReplaceFileW(LPCWSTR lpReplacedFileName, LPCWSTR lpReplacementFileNa goto fail; } + /* Replacement should fail if replacement is READ_ONLY */ + if (!GetFileInformationByHandle(hReplacement, &file_info)) + { + error = GetLastError(); + goto fail; + } + + if (file_info.dwFileAttributes & FILE_ATTRIBUTE_READONLY) + { + error = ERROR_ACCESS_DENIED; + goto fail; + } + /* If the user wants a backup then that needs to be performed first */ if (lpBackupFileName) { diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 33cae4b7c4..8e4a994142 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3666,7 +3666,7 @@ static void test_ReplaceFileA(void) */ SetLastError(0xdeadbeef); ret = pReplaceFileA(replaced, replacement, backup, 0, 0, 0); - todo_wine ok(ret == 0 && GetLastError() == ERROR_ACCESS_DENIED, "ReplaceFileA: unexpected error %d\n", GetLastError()); + ok(ret == 0 && GetLastError() == ERROR_ACCESS_DENIED, "ReplaceFileA: unexpected error %d\n", GetLastError()); /* make sure that the replacement file still exists */ hReplacementFile = CreateFileA(replacement, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); ok(hReplacementFile != INVALID_HANDLE_VALUE || @@ -3698,7 +3698,7 @@ static void test_ReplaceFileA(void) "unexpected error, replaced file should be able to be opened %d\n", GetLastError()); /*Calling ReplaceFileA on an exe should succeed*/ ret = pReplaceFileA(replaced, replacement, NULL, 0, 0, 0); - todo_wine ok(ret, "ReplaceFileA: unexpected error %d\n", GetLastError()); + ok(ret, "ReplaceFileA: unexpected error %d\n", GetLastError()); CloseHandle(hReplacedFile); /* replacement file still exists, make pass w/o "replaced" */ -- 2.18.0

2 2

[PATCH 2/3] comdlg32: Check invalid options in IFileDialog::SetOptions.
by Zhiyi Zhang 07 Sep '18

07 Sep '18

Fix Steam chat unable to select files. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comdlg32/itemdlg.c | 8 ++++++++ dlls/comdlg32/tests/itemdlg.c | 19 +++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index c8eff3438d..c3454c92cd 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -2505,6 +2505,14 @@ static HRESULT WINAPI IFileDialog2_fnSetOptions(IFileDialog2 *iface, FILEOPENDIA FileDialogImpl *This = impl_from_IFileDialog2(iface); TRACE("%p (0x%x)\n", This, fos); + /* 0xDC80411 = Invalid FILEOPENDIALOGOPTIONS enums OR result = + * 0x1 | 0x10 | 0x400 | 0x80000 | 0x400000 | 0x800000 | 0x1000000 | 0x4000000 | 0x8000000 */ + if(fos & 0xDC80411) + { + FIXME("FILEOPENDIALOGOPTIONS 0x%08x contains unknown enums\n", fos); + return E_INVALIDARG; + } + if( !(This->options & FOS_PICKFOLDERS) && (fos & FOS_PICKFOLDERS) ) { WCHAR buf[30]; diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index d3be8c8d29..6b63063e29 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -536,6 +536,8 @@ static void test_basics(void) const WCHAR fname2[] = {'f','n','a','m','e','2', 0}; const WCHAR fspec2[] = {'*','.','e','x','e',0}; COMDLG_FILTERSPEC filterspec[2] = {{fname1, fspec1}, {fname2, fspec2}}; + const DWORD invalid_fos[] = {0x1, 0x10, 0x400, 0x80000, 0x400000, 0x800000, 0x1000000, 0x4000000, 0x8000000}; + INT i; /* This should work on every platform with IFileDialog */ SHGetDesktopFolder(&psfdesktop); @@ -586,6 +588,23 @@ static void test_basics(void) ok(fdoptions == (FOS_OVERWRITEPROMPT | FOS_NOREADONLYRETURN | FOS_PATHMUSTEXIST | FOS_NOCHANGEDIR), "Unexpected default options: 0x%08x\n", fdoptions); + /* Check SetOptions invalid options handling */ + for (i = 0; i < ARRAY_SIZE(invalid_fos); i++) + { + hr = IFileOpenDialog_SetOptions(pfod, invalid_fos[i]); + ok(hr == E_INVALIDARG, "got 0x%08x.\n", hr); + hr = IFileOpenDialog_GetOptions(pfod, &fdoptions); + ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(fdoptions == (FOS_PATHMUSTEXIST | FOS_FILEMUSTEXIST | FOS_NOCHANGEDIR), "got %08x\n", fdoptions); + + hr = IFileSaveDialog_SetOptions(pfsd, invalid_fos[i]); + ok(hr == E_INVALIDARG, "got 0x%08x.\n", hr); + hr = IFileSaveDialog_GetOptions(pfsd, &fdoptions); + ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(fdoptions == (FOS_OVERWRITEPROMPT | FOS_NOREADONLYRETURN | FOS_PATHMUSTEXIST | FOS_NOCHANGEDIR), + "got %08x\n", fdoptions); + } + /* GetResult */ hr = IFileOpenDialog_GetResult(pfod, NULL); ok(hr == E_INVALIDARG, "got 0x%08x.\n", hr); -- 2.18.0

2 1

[PATCH 8/8] wined3d: Add support for A8_UNORM render targets.
by Józef Kucia 07 Sep '18

07 Sep '18

Not supported in core contexts yet. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44655 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/utils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index d75cbc1a1645..6f13f91353a9 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1531,7 +1531,8 @@ static const struct wined3d_format_texture_info format_texture_info[] = ARB_TEXTURE_RG, NULL}, {WINED3DFMT_A8_UNORM, GL_ALPHA8, GL_ALPHA8, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0, - WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING + | WINED3DFMT_FLAG_RENDERTARGET, WINED3D_GL_LEGACY_CONTEXT, NULL}, {WINED3DFMT_B4G4R4X4_UNORM, GL_RGB4, GL_RGB4, 0, GL_BGRA, GL_UNSIGNED_SHORT_4_4_4_4_REV, 0, -- 2.16.4

2 1

[PATCH 7/8] wined3d: Try to avoid allocating sysmem for GPU buffers with initial data.
by Józef Kucia 07 Sep '18

07 Sep '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/buffer.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 639a145f881b..f381b2efb941 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1379,9 +1379,6 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device buffer->bind_flags = bind_flags; buffer->locations = data ? WINED3D_LOCATION_DISCARDED : WINED3D_LOCATION_SYSMEM; - if (!wined3d_resource_allocate_sysmem(&buffer->resource)) - return E_OUTOFMEMORY; - TRACE("buffer %p, size %#x, usage %#x, format %s, memory @ %p.\n", buffer, buffer->resource.size, buffer->resource.usage, debug_d3dformat(buffer->resource.format->id), buffer->resource.heap_memory); @@ -1394,6 +1391,7 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device * the buffer to provide the same behavior to the application. */ TRACE("Pinning system memory.\n"); buffer->flags |= WINED3D_BUFFER_PIN_SYSMEM; + buffer->locations = WINED3D_LOCATION_SYSMEM; } /* Observations show that draw_primitive_immediate_mode() is faster on @@ -1418,6 +1416,12 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device buffer->flags |= WINED3D_BUFFER_USE_BO; } + if (buffer->locations & WINED3D_LOCATION_SYSMEM || !(buffer->flags & WINED3D_BUFFER_USE_BO)) + { + if (!wined3d_resource_allocate_sysmem(&buffer->resource)) + return E_OUTOFMEMORY; + } + if (!(buffer->maps = heap_alloc(sizeof(*buffer->maps)))) { ERR("Out of memory.\n"); -- 2.16.4

2 1

[PATCH 6/8] d3d11/tests: Add test for staging buffers.
by Józef Kucia 07 Sep '18

07 Sep '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index e43b2f34f3b4..c470e24f646f 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -28102,6 +28102,72 @@ static void test_depth_clip(void) release_test_context(&test_context); } +static void test_staging_buffers(void) +{ + struct d3d11_test_context test_context; + ID3D11Buffer *dst_buffer, *src_buffer; + D3D11_SUBRESOURCE_DATA resource_data; + D3D11_BUFFER_DESC buffer_desc; + ID3D11DeviceContext *context; + struct resource_readback rb; + float data[16], value; + ID3D11Device *device; + unsigned int i; + HRESULT hr; + + if (!init_test_context(&test_context, NULL)) + return; + device = test_context.device; + context = test_context.immediate_context; + + buffer_desc.ByteWidth = sizeof(data); + buffer_desc.Usage = D3D11_USAGE_STAGING; + buffer_desc.BindFlags = 0; + buffer_desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE; + buffer_desc.MiscFlags = 0; + buffer_desc.StructureByteStride = 0; + + for (i = 0; i < ARRAY_SIZE(data); ++i) + data[i] = i; + resource_data.pSysMem = data; + resource_data.SysMemPitch = 0; + resource_data.SysMemSlicePitch = 0; + + hr = ID3D11Device_CreateBuffer(device, &buffer_desc, &resource_data, &src_buffer); + ok(hr == S_OK, "Failed to create buffer, hr %#x.\n", hr); + + buffer_desc.Usage = D3D11_USAGE_DEFAULT; + buffer_desc.BindFlags = D3D11_BIND_CONSTANT_BUFFER; + buffer_desc.CPUAccessFlags = 0; + hr = ID3D11Device_CreateBuffer(device, &buffer_desc, NULL, &dst_buffer); + ok(hr == S_OK, "Failed to create buffer, hr %#x.\n", hr); + + ID3D11DeviceContext_CopyResource(context, (ID3D11Resource *)dst_buffer, (ID3D11Resource *)src_buffer); + get_buffer_readback(dst_buffer, &rb); + for (i = 0; i < ARRAY_SIZE(data); ++i) + { + value = get_readback_float(&rb, i, 0); + ok(value == data[i], "Got unexpected value %.8e at %u.\n", value, i); + } + release_resource_readback(&rb); + + for (i = 0; i < ARRAY_SIZE(data); ++i) + data[i] = 2 * i; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)src_buffer, 0, NULL, data, 0, 0); + ID3D11DeviceContext_CopyResource(context, (ID3D11Resource *)dst_buffer, (ID3D11Resource *)src_buffer); + get_buffer_readback(dst_buffer, &rb); + for (i = 0; i < ARRAY_SIZE(data); ++i) + { + value = get_readback_float(&rb, i, 0); + ok(value == i, "Got unexpected value %.8e at %u.\n", value, i); + } + release_resource_readback(&rb); + + ID3D11Buffer_Release(dst_buffer); + ID3D11Buffer_Release(src_buffer); + release_test_context(&test_context); +} + START_TEST(d3d11) { unsigned int argc, i; @@ -28249,6 +28315,7 @@ START_TEST(d3d11) queue_test(test_sample_shading); queue_test(test_sample_mask); queue_test(test_depth_clip); + queue_test(test_staging_buffers); run_queued_tests(); } -- 2.16.4

3 2

[PATCH 5/8] wined3d: Fix initial data for non-GPU buffers.
by Józef Kucia 07 Sep '18

07 Sep '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44655 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/buffer.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index a824d940bf19..639a145f881b 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1230,6 +1230,28 @@ void wined3d_buffer_upload_data(struct wined3d_buffer *buffer, struct wined3d_co wined3d_buffer_upload_ranges(buffer, context, data, range.offset, 1, &range); } +static void wined3d_buffer_init_data(struct wined3d_buffer *buffer, + struct wined3d_device *device, const struct wined3d_sub_resource_data *data) +{ + struct wined3d_resource *resource = &buffer->resource; + struct wined3d_bo_address bo; + struct wined3d_box box; + + if (buffer->flags & WINED3D_BUFFER_USE_BO) + { + wined3d_box_set(&box, 0, 0, resource->size, 1, 0, 1); + wined3d_cs_emit_update_sub_resource(device->cs, resource, + 0, &box, data->data, data->row_pitch, data->slice_pitch); + } + else + { + wined3d_buffer_get_memory(buffer, &bo, WINED3D_LOCATION_SYSMEM); + memcpy(bo.addr, data->data, resource->size); + wined3d_buffer_validate_location(buffer, WINED3D_LOCATION_SYSMEM); + wined3d_buffer_invalidate_location(buffer, ~WINED3D_LOCATION_SYSMEM); + } +} + static ULONG buffer_resource_incref(struct wined3d_resource *resource) { return wined3d_buffer_incref(buffer_from_resource(resource)); @@ -1326,7 +1348,6 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device const struct wined3d_format *format = wined3d_get_format(device->adapter, format_id, usage); const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; struct wined3d_resource *resource = &buffer->resource; - struct wined3d_box box; BOOL dynamic_buffer_ok; HRESULT hr; @@ -1408,11 +1429,7 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device buffer->maps_size = 1; if (data) - { - wined3d_box_set(&box, 0, 0, resource->size, 1, 0, 1); - wined3d_cs_emit_update_sub_resource(device->cs, resource, - 0, &box, data->data, data->row_pitch, data->slice_pitch); - } + wined3d_buffer_init_data(buffer, device, data); return WINED3D_OK; } -- 2.16.4

2 1

[PATCH 1/8] dxgi: Fix dxgi_output_QueryInterface().
by Józef Kucia 07 Sep '18

07 Sep '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44655 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/output.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index 2b168fb627bb..868a36845863 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -41,20 +41,24 @@ static inline struct dxgi_output *impl_from_IDXGIOutput4(IDXGIOutput4 *iface) /* IUnknown methods */ -static HRESULT STDMETHODCALLTYPE dxgi_output_QueryInterface(IDXGIOutput4 *iface, REFIID riid, void **object) +static HRESULT STDMETHODCALLTYPE dxgi_output_QueryInterface(IDXGIOutput4 *iface, REFIID iid, void **object) { - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); - - if (IsEqualGUID(riid, &IID_IDXGIOutput) - || IsEqualGUID(riid, &IID_IDXGIObject) - || IsEqualGUID(riid, &IID_IUnknown)) + TRACE("iface %p, iid %s, object %p.\n", iface, debugstr_guid(iid), object); + + if (IsEqualGUID(iid, &IID_IDXGIOutput4) + || IsEqualGUID(iid, &IID_IDXGIOutput3) + || IsEqualGUID(iid, &IID_IDXGIOutput2) + || IsEqualGUID(iid, &IID_IDXGIOutput1) + || IsEqualGUID(iid, &IID_IDXGIOutput) + || IsEqualGUID(iid, &IID_IDXGIObject) + || IsEqualGUID(iid, &IID_IUnknown)) { IUnknown_AddRef(iface); *object = iface; return S_OK; } - WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); *object = NULL; return E_NOINTERFACE; -- 2.16.4

2 1

[PATCH 4/8] wined3d: Allow wined3d_device_update_sub_resource() only on GPU accessible resources.
by Józef Kucia 07 Sep '18

07 Sep '18

wined3d_device_update_sub_resource() should work only on D3D11_USAGE_DEFAULT resources. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/device.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 96b8d3c247d6..f6a0b39cecd6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4229,6 +4229,12 @@ void CDECL wined3d_device_update_sub_resource(struct wined3d_device *device, str if (flags) FIXME("Ignoring flags %#x.\n", flags); + if (!(resource->access & WINED3D_RESOURCE_ACCESS_GPU)) + { + WARN("Resource %p is not GPU accessible.\n", resource); + return; + } + if (resource->type == WINED3D_RTYPE_BUFFER) { if (sub_resource_idx > 0) -- 2.16.4

2 1

[PATCH 3/8] d3d11: Pass normalized D3D11_DEPTH_STENCIL_DESC to wine_rb_put().
by Józef Kucia 07 Sep '18

07 Sep '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 9848690d5fed..c36b87fbbd39 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -762,7 +762,7 @@ HRESULT d3d_depthstencil_state_create(struct d3d_device *device, const D3D11_DEP return hr; } - if (wine_rb_put(&device->depthstencil_states, desc, &object->entry) == -1) + if (wine_rb_put(&device->depthstencil_states, &tmp_desc, &object->entry) == -1) { ERR("Failed to insert depthstencil state entry.\n"); d3d_depthstencil_state_cleanup(object); -- 2.16.4

2 1

[PATCH 2/8] d3d11: Normalize D3D11_BLEND_DESC.
by Józef Kucia 07 Sep '18

07 Sep '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/state.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index d4c3befd2696..9848690d5fed 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -328,12 +328,24 @@ HRESULT d3d_blend_state_create(struct d3d_device *device, const D3D11_BLEND_DESC { j = desc->IndependentBlendEnable ? i : 0; tmp_desc.RenderTarget[i].BlendEnable = desc->RenderTarget[j].BlendEnable; - tmp_desc.RenderTarget[i].SrcBlend = desc->RenderTarget[j].SrcBlend; - tmp_desc.RenderTarget[i].DestBlend = desc->RenderTarget[j].DestBlend; - tmp_desc.RenderTarget[i].BlendOp = desc->RenderTarget[j].BlendOp; - tmp_desc.RenderTarget[i].SrcBlendAlpha = desc->RenderTarget[j].SrcBlendAlpha; - tmp_desc.RenderTarget[i].DestBlendAlpha = desc->RenderTarget[j].DestBlendAlpha; - tmp_desc.RenderTarget[i].BlendOpAlpha = desc->RenderTarget[j].BlendOpAlpha; + if (tmp_desc.RenderTarget[i].BlendEnable) + { + tmp_desc.RenderTarget[i].SrcBlend = desc->RenderTarget[j].SrcBlend; + tmp_desc.RenderTarget[i].DestBlend = desc->RenderTarget[j].DestBlend; + tmp_desc.RenderTarget[i].BlendOp = desc->RenderTarget[j].BlendOp; + tmp_desc.RenderTarget[i].SrcBlendAlpha = desc->RenderTarget[j].SrcBlendAlpha; + tmp_desc.RenderTarget[i].DestBlendAlpha = desc->RenderTarget[j].DestBlendAlpha; + tmp_desc.RenderTarget[i].BlendOpAlpha = desc->RenderTarget[j].BlendOpAlpha; + } + else + { + tmp_desc.RenderTarget[i].SrcBlend = D3D11_BLEND_ONE; + tmp_desc.RenderTarget[i].DestBlend = D3D11_BLEND_ZERO; + tmp_desc.RenderTarget[i].BlendOp = D3D11_BLEND_OP_ADD; + tmp_desc.RenderTarget[i].SrcBlendAlpha = D3D11_BLEND_ONE; + tmp_desc.RenderTarget[i].DestBlendAlpha = D3D11_BLEND_ZERO; + tmp_desc.RenderTarget[i].BlendOpAlpha = D3D11_BLEND_OP_ADD; + } tmp_desc.RenderTarget[i].RenderTargetWriteMask = desc->RenderTarget[j].RenderTargetWriteMask; if (i > 3 && tmp_desc.RenderTarget[i].RenderTargetWriteMask != D3D11_COLOR_WRITE_ENABLE_ALL) -- 2.16.4

2 1

[PATCH 3/3] comdlg32/tests: Fix failures on newer Windows 10.
by Zhiyi Zhang 07 Sep '18

07 Sep '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comdlg32/tests/itemdlg.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index 6b63063e29..c9ba23d045 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -1069,7 +1069,7 @@ static void test_advise_helper(IFileDialog *pfd) for(i = 0; i < 10; i++) { hr = IFileDialog_Advise(pfd, pfde, &cookie[i]); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(cookie[i] == i+1, "Got cookie: %d\n", cookie[i]); + ok(cookie[i] == i+cookie[0], "Got cookie: %d\n", cookie[i]); } ok(pfdeimpl->ref == 10+1, "got ref %d\n", pfdeimpl->ref); ensure_zero_events(pfdeimpl); @@ -1102,7 +1102,8 @@ static void test_advise_helper(IFileDialog *pfd) hr = IFileDialog_Advise(pfd, pfde, &cookie[0]); ok(hr == S_OK, "got 0x%08x\n", hr); - todo_wine ok(cookie[0] == 1, "got cookie: %d\n", cookie[0]); + /* cookie[0] is 4 on Windows 10 17134 */ + todo_wine ok(cookie[0] == 1 || cookie[0] == 4, "got cookie: %d\n", cookie[0]); ok(pfdeimpl->ref == 1+1, "got ref %d\n", pfdeimpl->ref); ensure_zero_events(pfdeimpl); -- 2.18.0

1 0

[PATCH 1/3] comdlg32/tests: Fix crashes.
by Zhiyi Zhang 07 Sep '18

07 Sep '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comdlg32/tests/itemdlg.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index d28e682b49..d3be8c8d29 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -1032,10 +1032,14 @@ static void test_advise_helper(IFileDialog *pfd) pfde = IFileDialogEvents_Constructor(); pfdeimpl = impl_from_IFileDialogEvents(pfde); - hr = IFileDialog_Advise(pfd, NULL, NULL); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); - hr = IFileDialog_Advise(pfd, pfde, NULL); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + /* Null pointer tests crashed on Windows 10 16299 or newer */ + if (0) + { + hr = IFileDialog_Advise(pfd, NULL, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + hr = IFileDialog_Advise(pfd, pfde, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + } hr = IFileDialog_Advise(pfd, NULL, &cookie[0]); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); ok(pfdeimpl->ref == 1, "got ref %d\n", pfdeimpl->ref); -- 2.18.0

1 0

[PATCH] wininet: Resize buffer when call to InternetCanonicalizeUrlW fails in InternetCrackUrlW.
by Alistair Leslie-Hughes 07 Sep '18

07 Sep '18

From: Michael Müller <michael(a)fds-team.de> Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=40598 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wininet/internet.c | 21 ++++++++++++++++++--- dlls/wininet/tests/url.c | 6 +++--- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 6d0d35c..b407e85 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1664,7 +1664,7 @@ BOOL WINAPI InternetCrackUrlW(const WCHAR *lpszUrl, DWORD dwUrlLength, DWORD dwF if (dwFlags & ICU_DECODE) { - WCHAR *url_tmp; + WCHAR *url_tmp, *buffer; DWORD len = dwUrlLength + 1; BOOL ret; @@ -1673,9 +1673,24 @@ BOOL WINAPI InternetCrackUrlW(const WCHAR *lpszUrl, DWORD dwUrlLength, DWORD dwF SetLastError(ERROR_OUTOFMEMORY); return FALSE; } - ret = InternetCanonicalizeUrlW(url_tmp, url_tmp, &len, ICU_DECODE | ICU_NO_ENCODE); + + buffer = url_tmp; + ret = InternetCanonicalizeUrlW(url_tmp, buffer, &len, ICU_DECODE | ICU_NO_ENCODE); + if (!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + buffer = heap_alloc(len * sizeof(WCHAR)); + if (!buffer) + { + SetLastError(ERROR_OUTOFMEMORY); + heap_free(url_tmp); + return FALSE; + } + ret = InternetCanonicalizeUrlW(url_tmp, buffer, &len, ICU_DECODE | ICU_NO_ENCODE); + } if (ret) - ret = InternetCrackUrlW(url_tmp, len, dwFlags & ~ICU_DECODE, lpUC); + ret = InternetCrackUrlW(buffer, len, dwFlags & ~ICU_DECODE, lpUC); + + if (buffer != url_tmp) heap_free(buffer); heap_free(url_tmp); return ret; } diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index 18c77b6..19ae7c3 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -816,9 +816,9 @@ static void InternetCrackUrlW_test(void) comp.lpszUrlPath = urlpart; comp.dwUrlPathLength = ARRAY_SIZE(urlpart); r = InternetCrackUrlW(url3, 0, ICU_DECODE, &comp); - todo_wine ok(r, "InternetCrackUrlW failed unexpectedly\n"); - todo_wine ok(!strcmp_wa(host, "x.org"), "host is %s, should be x.org\n", wine_dbgstr_w(host)); - ok(urlpart[0] == 0, "urlpart should be empty\n"); + ok(r, "InternetCrackUrlW failed unexpectedly\n"); + ok(!strcmp_wa(host, "x.org"), "host is %s, should be x.org\n", wine_dbgstr_w(host)); + todo_wine ok(urlpart[0] == 0, "urlpart should be empty\n"); } static void fill_url_components(URL_COMPONENTSA *lpUrlComponents) -- 1.9.1

2 1

[PATCH] wininet: Remove unused parameter from create_netconn().
by Dmitry Timoshkov 07 Sep '18

07 Sep '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wininet/http.c | 3 +-- dlls/wininet/internet.h | 2 +- dlls/wininet/netconnection.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 75784dac62..b7be9939a1 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4739,7 +4739,6 @@ static void http_process_keep_alive(http_request_t *req) static DWORD open_http_connection(http_request_t *request, BOOL *reusing) { - const BOOL is_https = (request->hdr.dwFlags & INTERNET_FLAG_SECURE) != 0; netconn_t *netconn = NULL; DWORD res; @@ -4794,7 +4793,7 @@ static DWORD open_http_connection(http_request_t *request, BOOL *reusing) request->server->addr_str, strlen(request->server->addr_str)+1); - res = create_netconn(is_https, request->proxy ? request->proxy : request->server, request->security_flags, + res = create_netconn(request->proxy ? request->proxy : request->server, request->security_flags, (request->hdr.ErrorMask & INTERNET_ERROR_MASK_COMBINED_SEC_CERT) != 0, request->connect_timeout, &netconn); if(res != ERROR_SUCCESS) { diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 498a79b080..8d4266a9be 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -428,7 +428,7 @@ VOID INTERNET_SendCallback(object_header_t *hdr, DWORD_PTR dwContext, DWORD dwStatusInfoLength) DECLSPEC_HIDDEN; WCHAR *INTERNET_FindProxyForProtocol(LPCWSTR szProxy, LPCWSTR proto) DECLSPEC_HIDDEN; -DWORD create_netconn(BOOL,server_t*,DWORD,BOOL,DWORD,netconn_t**) DECLSPEC_HIDDEN; +DWORD create_netconn(server_t*,DWORD,BOOL,DWORD,netconn_t**) DECLSPEC_HIDDEN; void free_netconn(netconn_t*) DECLSPEC_HIDDEN; void NETCON_unload(void) DECLSPEC_HIDDEN; DWORD NETCON_secure_connect(netconn_t*,server_t*) DECLSPEC_HIDDEN; diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index bab046f579..ccdb8818d7 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -340,7 +340,7 @@ static DWORD create_netconn_socket(server_t *server, netconn_t *netconn, DWORD t return ERROR_SUCCESS; } -DWORD create_netconn(BOOL useSSL, server_t *server, DWORD security_flags, BOOL mask_errors, DWORD timeout, netconn_t **ret) +DWORD create_netconn(server_t *server, DWORD security_flags, BOOL mask_errors, DWORD timeout, netconn_t **ret) { netconn_t *netconn; int result; -- 2.17.1

2 1

[PATCH 4/4 v2] mshtml: Added IHTMLCSSStyleDeclaration::removeProperty implementation.
by Jacek Caban 07 Sep '18

07 Sep '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: Fixed typo in commit message. dlls/mshtml/htmlstyle.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)

1 0

[PATCH 4/4] mshtml: Added :HTMLCSSStyleDeclaration::removeProperty implementation.
by Jacek Caban 07 Sep '18

07 Sep '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)

1 0

[PATCH 3/4] mshtml: Added IHTMLCSSStyleDeclaration::get_cssText implementation.
by Jacek Caban 07 Sep '18

07 Sep '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 29 ++++++++++------------------- dlls/mshtml/tests/style.c | 9 ++++++++- 2 files changed, 18 insertions(+), 20 deletions(-)

1 0

[PATCH 2/4] mshtml: Added IHTMLCSSStyleDeclaration::put_cssStyle implementation.
by Jacek Caban 07 Sep '18

07 Sep '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 28 +++++++++++++++------------- dlls/mshtml/tests/style.c | 23 +++++++++++++++++++++++ 2 files changed, 38 insertions(+), 13 deletions(-)

1 0

[PATCH 1/4] mshtml: Added IHTMLCSSStyleDeclaration::cssFloat property implementation.
by Jacek Caban 07 Sep '18

07 Sep '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 8 ++++---- dlls/mshtml/tests/style.c | 20 ++++++++++++++++++++ 2 files changed, 24 insertions(+), 4 deletions(-)

1 0

[PATCH] wined3d: Use query buffer objects for occlusion queries.
by Andrew Wesie 07 Sep '18

07 Sep '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45723 Signed-off-by: Andrew Wesie <awesie(a)gmail.com> --- dlls/wined3d/adapter_gl.c | 6 ++ dlls/wined3d/query.c | 159 ++++++++++++++++++++++++++++++++++++----- dlls/wined3d/wined3d_gl.h | 2 + dlls/wined3d/wined3d_private.h | 3 + 4 files changed, 151 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index af17df8..0ac72ba 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -58,6 +58,7 @@ static const struct wined3d_extension_map gl_extension_map[] = /* ARB */ {"GL_ARB_base_instance", ARB_BASE_INSTANCE }, {"GL_ARB_blend_func_extended", ARB_BLEND_FUNC_EXTENDED }, + {"GL_ARB_buffer_storage", ARB_BUFFER_STORAGE }, {"GL_ARB_clear_buffer_object", ARB_CLEAR_BUFFER_OBJECT }, {"GL_ARB_clear_texture", ARB_CLEAR_TEXTURE }, {"GL_ARB_clip_control", ARB_CLIP_CONTROL }, @@ -103,6 +104,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_point_parameters", ARB_POINT_PARAMETERS }, {"GL_ARB_point_sprite", ARB_POINT_SPRITE }, {"GL_ARB_provoking_vertex", ARB_PROVOKING_VERTEX }, + {"GL_ARB_query_buffer_object", ARB_QUERY_BUFFER_OBJECT }, {"GL_ARB_sample_shading", ARB_SAMPLE_SHADING }, {"GL_ARB_sampler_objects", ARB_SAMPLER_OBJECTS }, {"GL_ARB_seamless_cube_map", ARB_SEAMLESS_CUBE_MAP }, @@ -2063,6 +2065,8 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) /* GL_ARB_blend_func_extended */ USE_GL_FUNC(glBindFragDataLocationIndexed) USE_GL_FUNC(glGetFragDataIndex) + /* GL_ARB_buffer_storage */ + USE_GL_FUNC(glBufferStorage) /* GL_ARB_clear_buffer_object */ USE_GL_FUNC(glClearBufferData) USE_GL_FUNC(glClearBufferSubData) @@ -3304,7 +3308,9 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, {ARB_TEXTURE_STORAGE_MULTISAMPLE, MAKEDWORD_VERSION(4, 2)}, {ARB_TEXTURE_VIEW, MAKEDWORD_VERSION(4, 3)}, + {ARB_BUFFER_STORAGE, MAKEDWORD_VERSION(4, 4)}, {ARB_CLEAR_TEXTURE, MAKEDWORD_VERSION(4, 4)}, + {ARB_QUERY_BUFFER_OBJECT, MAKEDWORD_VERSION(4, 4)}, {ARB_CLIP_CONTROL, MAKEDWORD_VERSION(4, 5)}, {ARB_CULL_DISTANCE, MAKEDWORD_VERSION(4, 5)}, diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 01e6bcb..d364216 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -25,6 +25,108 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); +#define INVALID_QUERY_RESULT ((UINT64)-1) + +static void wined3d_query_create_buffer_object(struct wined3d_context *context, struct wined3d_query *query) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + const GLuint map_flags = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT; + GLuint buffer_object; + + if (!gl_info->supported[ARB_BUFFER_STORAGE]) + return; + + GL_EXTCALL(glGenBuffers(1, &buffer_object)); + checkGLcall("glGenBuffers"); + + GL_EXTCALL(glBindBuffer(GL_QUERY_BUFFER, buffer_object)); + checkGLcall("glBindBuffer"); + + GL_EXTCALL(glBufferStorage(GL_QUERY_BUFFER, 16, NULL, map_flags)); + checkGLcall("glBufferStorage"); + + query->map_ptr = GL_EXTCALL(glMapBufferRange(GL_QUERY_BUFFER, 0, 16, map_flags)); + checkGLcall("glMapBufferRange"); + + GL_EXTCALL(glBindBuffer(GL_QUERY_BUFFER, 0)); + + *query->map_ptr = INVALID_QUERY_RESULT; + query->buffer_object = buffer_object; +} + +static void wined3d_query_destroy_buffer_object(struct wined3d_context *context, struct wined3d_query *query) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + + GL_EXTCALL(glDeleteBuffers(1, &query->buffer_object)); + checkGLcall("glDeleteBuffers"); + + query->buffer_object = 0; + query->map_ptr = NULL; +} + +static void wined3d_query_buffer_begin(struct wined3d_query *query) +{ + if (query->buffer_object) + *query->map_ptr = INVALID_QUERY_RESULT; +} + +static void wined3d_query_buffer_begin_cs(struct wined3d_context *context, struct wined3d_query *query) +{ + if (!context->gl_info->supported[ARB_QUERY_BUFFER_OBJECT]) + return; + + if (!query->buffer_object) + wined3d_query_create_buffer_object(context, query); +} + +static BOOL wined3d_query_buffer_end_cs(struct wined3d_context *context, struct wined3d_query *query, GLuint id) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + + if (!query->buffer_object) + return FALSE; + + GL_EXTCALL(glBindBuffer(GL_QUERY_BUFFER, query->buffer_object)); + checkGLcall("glBindBuffer"); + + GL_EXTCALL(glGetQueryObjectui64v(id, GL_QUERY_RESULT, NULL)); + checkGLcall("glGetQueryObjectui64v"); + + GL_EXTCALL(glBindBuffer(GL_QUERY_BUFFER, 0)); + return TRUE; +} + +static BOOL wined3d_query_buffer_poll(struct wined3d_query *query, GLuint *available, UINT64 *result) +{ + if (!query->buffer_object) + return FALSE; + + if (query->map_ptr && *query->map_ptr != INVALID_QUERY_RESULT) + { + if (available) + *available = GL_TRUE; + if (result) + *result = *query->map_ptr; + } + else + { + if (available) + *available = GL_FALSE; + } + return TRUE; +} + +static BOOL wined3d_query_buffer_get_data(struct wined3d_query *query, DWORD flags) +{ + if (!query->buffer_object) + return FALSE; + + if (flags & WINED3DGETDATA_FLUSH && query->device->cs->thread && !query->device->cs->queries_flushed) + wined3d_cs_emit_flush(query->device->cs); + return TRUE; +} + static UINT64 get_query_result64(GLuint id, const struct wined3d_gl_info *gl_info) { if (gl_info->supported[ARB_TIMER_QUERY]) @@ -339,6 +441,14 @@ static void wined3d_query_destroy_object(void *object) if (!list_empty(&query->poll_list_entry)) list_remove(&query->poll_list_entry); + if (query->buffer_object) + { + struct wined3d_context *context; + context = context_acquire(query->device, NULL, 0); + wined3d_query_destroy_buffer_object(context, query); + context_release(context); + } + /* Queries are specific to the GL context that created them. Not * deleting the query will obviously leak it, but that's still better * than potentially deleting a different query with the same id in this @@ -382,7 +492,7 @@ HRESULT CDECL wined3d_query_get_data(struct wined3d_query *query, return WINED3DERR_INVALIDCALL; } - if (!query->device->cs->thread) + if (!query->device->cs->thread || wined3d_query_buffer_get_data(query, flags)) { if (!query->query_ops->query_poll(query, flags)) return S_FALSE; @@ -411,6 +521,9 @@ HRESULT CDECL wined3d_query_issue(struct wined3d_query *query, DWORD flags) { TRACE("query %p, flags %#x.\n", query, flags); + if (flags & WINED3DISSUE_BEGIN) + wined3d_query_buffer_begin(query); + if (flags & WINED3DISSUE_END) ++query->counter_main; @@ -428,31 +541,35 @@ static BOOL wined3d_occlusion_query_ops_poll(struct wined3d_query *query, DWORD { struct wined3d_occlusion_query *oq = wined3d_occlusion_query_from_query(query); struct wined3d_device *device = query->device; - const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; - GLuint available; + GLuint available = FALSE; TRACE("query %p, flags %#x.\n", query, flags); - if (!(context = context_reacquire(device, oq->context))) + if (!wined3d_query_buffer_poll(query, &available, &oq->samples)) { - FIXME("%p Wrong thread, returning 1.\n", query); - oq->samples = 1; - return TRUE; - } - gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info; + struct wined3d_context *context; - GL_EXTCALL(glGetQueryObjectuiv(oq->id, GL_QUERY_RESULT_AVAILABLE, &available)); - TRACE("Available %#x.\n", available); + if (!(context = context_reacquire(device, oq->context))) + { + FIXME("%p Wrong thread, returning 1.\n", query); + oq->samples = 1; + return TRUE; + } + gl_info = context->gl_info; - if (available) - { - oq->samples = get_query_result64(oq->id, gl_info); - TRACE("Returning 0x%s samples.\n", wine_dbgstr_longlong(oq->samples)); + GL_EXTCALL(glGetQueryObjectuiv(oq->id, GL_QUERY_RESULT_AVAILABLE, &available)); + TRACE("Available %#x.\n", available); + + if (available) + oq->samples = get_query_result64(oq->id, gl_info); + + checkGLcall("poll occlusion query"); + context_release(context); } - checkGLcall("poll occlusion query"); - context_release(context); + if (available) + TRACE("Returning 0x%s samples.\n", wine_dbgstr_longlong(oq->samples)); return available; } @@ -564,6 +681,8 @@ static BOOL wined3d_occlusion_query_ops_issue(struct wined3d_query *query, DWORD GL_EXTCALL(glBeginQuery(GL_SAMPLES_PASSED, oq->id)); checkGLcall("glBeginQuery()"); + wined3d_query_buffer_begin_cs(context, query); + context_release(context); oq->started = TRUE; } @@ -580,8 +699,10 @@ static BOOL wined3d_occlusion_query_ops_issue(struct wined3d_query *query, DWORD GL_EXTCALL(glEndQuery(GL_SAMPLES_PASSED)); checkGLcall("glEndQuery()"); + /* If we cannot use query buffers, poll instead. */ + poll = !wined3d_query_buffer_end_cs(context, query, oq->id); + context_release(context); - poll = TRUE; } else { diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 525c298..0bc9309 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -44,6 +44,7 @@ enum wined3d_gl_extension /* ARB */ ARB_BASE_INSTANCE, ARB_BLEND_FUNC_EXTENDED, + ARB_BUFFER_STORAGE, ARB_CLEAR_BUFFER_OBJECT, ARB_CLEAR_TEXTURE, ARB_CLIP_CONTROL, @@ -89,6 +90,7 @@ enum wined3d_gl_extension ARB_POINT_PARAMETERS, ARB_POINT_SPRITE, ARB_PROVOKING_VERTEX, + ARB_QUERY_BUFFER_OBJECT, ARB_SAMPLE_SHADING, ARB_SAMPLER_OBJECTS, ARB_SEAMLESS_CUBE_MAP, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7084168..db7c772 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1741,6 +1741,9 @@ struct wined3d_query LONG counter_main, counter_retrieved; struct list poll_list_entry; + + GLuint buffer_object; + UINT64 *map_ptr; }; struct wined3d_event_query -- 2.7.4

2 3

[PATCH 3/3] api-ms-win-security-cryptoapi-l1-1-0: Add dll
by André Hentschel 07 Sep '18

07 Sep '18

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- configure.ac | 1 + .../Makefile.in | 1 + .../api-ms-win-security-cryptoapi-l1-1-0.spec | 39 +++++++++++++++++++ tools/make_specfiles | 1 + 4 files changed, 42 insertions(+) create mode 100644 dlls/api-ms-win-security-cryptoapi-l1-1-0/Makefile.in create mode 100644 dlls/api-ms-win-security-cryptoapi-l1-1-0/api-ms-win-security-cryptoapi-l1-1-0.spec diff --git a/configure.ac b/configure.ac index f8af8a3057..006f7d9fc2 100644 --- a/configure.ac +++ b/configure.ac @@ -3042,6 +3042,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-base-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-base-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-base-private-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-credentials-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-cryptoapi-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-grouppolicy-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-lsalookup-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-lsalookup-l1-1-1) diff --git a/dlls/api-ms-win-security-cryptoapi-l1-1-0/Makefile.in b/dlls/api-ms-win-security-cryptoapi-l1-1-0/Makefile.in new file mode 100644 index 0000000000..48c0d8213d --- /dev/null +++ b/dlls/api-ms-win-security-cryptoapi-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-security-cryptoapi-l1-1-0.dll diff --git a/dlls/api-ms-win-security-cryptoapi-l1-1-0/api-ms-win-security-cryptoapi-l1-1-0.spec b/dlls/api-ms-win-security-cryptoapi-l1-1-0/api-ms-win-security-cryptoapi-l1-1-0.spec new file mode 100644 index 0000000000..357af4c79d --- /dev/null +++ b/dlls/api-ms-win-security-cryptoapi-l1-1-0/api-ms-win-security-cryptoapi-l1-1-0.spec @@ -0,0 +1,39 @@ +@ stdcall CryptAcquireContextA(ptr str str long long) advapi32.CryptAcquireContextA +@ stdcall CryptAcquireContextW(ptr wstr wstr long long) advapi32.CryptAcquireContextW +@ stdcall CryptContextAddRef(long ptr long) advapi32.CryptContextAddRef +@ stdcall CryptCreateHash(long long long long ptr) advapi32.CryptCreateHash +@ stdcall CryptDecrypt(long long long long ptr ptr) advapi32.CryptDecrypt +@ stdcall CryptDeriveKey(long long long long ptr) advapi32.CryptDeriveKey +@ stdcall CryptDestroyHash(long) advapi32.CryptDestroyHash +@ stdcall CryptDestroyKey(long) advapi32.CryptDestroyKey +@ stdcall CryptDuplicateHash(long ptr long ptr) advapi32.CryptDuplicateHash +@ stdcall CryptDuplicateKey(long ptr long ptr) advapi32.CryptDuplicateKey +@ stdcall CryptEncrypt(long long long long ptr ptr long) advapi32.CryptEncrypt +@ stdcall CryptEnumProviderTypesA(long ptr long ptr ptr ptr) advapi32.CryptEnumProviderTypesA +@ stdcall CryptEnumProviderTypesW(long ptr long ptr ptr ptr) advapi32.CryptEnumProviderTypesW +@ stdcall CryptEnumProvidersA(long ptr long ptr ptr ptr) advapi32.CryptEnumProvidersA +@ stdcall CryptEnumProvidersW(long ptr long ptr ptr ptr) advapi32.CryptEnumProvidersW +@ stdcall CryptExportKey(long long long long ptr ptr) advapi32.CryptExportKey +@ stdcall CryptGenKey(long long long ptr) advapi32.CryptGenKey +@ stdcall CryptGenRandom(long long ptr) advapi32.CryptGenRandom +@ stdcall CryptGetDefaultProviderA(long ptr long ptr ptr) advapi32.CryptGetDefaultProviderA +@ stdcall CryptGetDefaultProviderW(long ptr long ptr ptr) advapi32.CryptGetDefaultProviderW +@ stdcall CryptGetHashParam(long long ptr ptr long) advapi32.CryptGetHashParam +@ stdcall CryptGetKeyParam(long long ptr ptr long) advapi32.CryptGetKeyParam +@ stdcall CryptGetProvParam(long long ptr ptr long) advapi32.CryptGetProvParam +@ stdcall CryptGetUserKey(long long ptr) advapi32.CryptGetUserKey +@ stdcall CryptHashData(long ptr long long) advapi32.CryptHashData +@ stdcall CryptHashSessionKey(long long long) advapi32.CryptHashSessionKey +@ stdcall CryptImportKey(long ptr long long long ptr) advapi32.CryptImportKey +@ stdcall CryptReleaseContext(long long) advapi32.CryptReleaseContext +@ stdcall CryptSetHashParam(long long ptr long) advapi32.CryptSetHashParam +@ stdcall CryptSetKeyParam(long long ptr long) advapi32.CryptSetKeyParam +@ stdcall CryptSetProvParam(long long ptr long) advapi32.CryptSetProvParam +@ stdcall CryptSetProviderA(str long) advapi32.CryptSetProviderA +@ stdcall CryptSetProviderExA(str long ptr long) advapi32.CryptSetProviderExA +@ stdcall CryptSetProviderExW(wstr long ptr long) advapi32.CryptSetProviderExW +@ stdcall CryptSetProviderW(wstr long) advapi32.CryptSetProviderW +@ stdcall CryptSignHashA(long long str long ptr ptr) advapi32.CryptSignHashA +@ stdcall CryptSignHashW(long long wstr long ptr ptr) advapi32.CryptSignHashW +@ stdcall CryptVerifySignatureA(long ptr long long str long) advapi32.CryptVerifySignatureA +@ stdcall CryptVerifySignatureW(long ptr long long wstr long) advapi32.CryptVerifySignatureW diff --git a/tools/make_specfiles b/tools/make_specfiles index d69563b052..7d4a85bdc3 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -137,6 +137,7 @@ my @dll_groups = "api-ms-win-security-base-l1-2-0", "api-ms-win-security-base-private-l1-1-1", "api-ms-win-security-credentials-l1-1-0", + "api-ms-win-security-cryptoapi-l1-1-0", "api-ms-win-security-lsalookup-l1-1-0", "api-ms-win-security-lsalookup-l1-1-1", "api-ms-win-security-lsalookup-l2-1-0", -- 2.17.1

1 0

[PATCH 2/3] api-ms-win-core-stringloader-l1-1-1: Add dll
by André Hentschel 07 Sep '18

07 Sep '18

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- configure.ac | 1 + dlls/api-ms-win-core-stringloader-l1-1-1/Makefile.in | 1 + .../api-ms-win-core-stringloader-l1-1-1.spec | 2 ++ tools/make_specfiles | 1 + 4 files changed, 5 insertions(+) create mode 100644 dlls/api-ms-win-core-stringloader-l1-1-1/Makefile.in create mode 100644 dlls/api-ms-win-core-stringloader-l1-1-1/api-ms-win-core-stringloader-l1-1-1.spec diff --git a/configure.ac b/configure.ac index 69f641ddd9..f8af8a3057 100644 --- a/configure.ac +++ b/configure.ac @@ -2953,6 +2953,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-string-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-string-l2-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-string-obsolete-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-stringansi-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-stringloader-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-synch-ansi-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-synch-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-synch-l1-2-0) diff --git a/dlls/api-ms-win-core-stringloader-l1-1-1/Makefile.in b/dlls/api-ms-win-core-stringloader-l1-1-1/Makefile.in new file mode 100644 index 0000000000..a390a74940 --- /dev/null +++ b/dlls/api-ms-win-core-stringloader-l1-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-stringloader-l1-1-1.dll diff --git a/dlls/api-ms-win-core-stringloader-l1-1-1/api-ms-win-core-stringloader-l1-1-1.spec b/dlls/api-ms-win-core-stringloader-l1-1-1/api-ms-win-core-stringloader-l1-1-1.spec new file mode 100644 index 0000000000..a60736e055 --- /dev/null +++ b/dlls/api-ms-win-core-stringloader-l1-1-1/api-ms-win-core-stringloader-l1-1-1.spec @@ -0,0 +1,2 @@ +@ stdcall LoadStringA(long long ptr long) user32.LoadStringA +@ stdcall LoadStringW(long long ptr long) user32.LoadStringW diff --git a/tools/make_specfiles b/tools/make_specfiles index 24514fcbdd..d69563b052 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -366,6 +366,7 @@ my @dll_groups = [ "user32", "api-ms-win-core-stringansi-l1-1-0", + "api-ms-win-core-stringloader-l1-1-1", "api-ms-win-core-string-l2-1-0", "api-ms-win-downlevel-user32-l1-1-0", "api-ms-win-ntuser-dc-access-l1-1-0", -- 2.17.1

1 0

[PATCH 1/3] api-ms-win-core-comm-l1-1-0: Add dll
by André Hentschel 07 Sep '18

07 Sep '18

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- configure.ac | 1 + dlls/api-ms-win-core-comm-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-comm-l1-1-0.spec | 18 ++++++++++++++++++ tools/make_specfiles | 1 + 4 files changed, 21 insertions(+) create mode 100644 dlls/api-ms-win-core-comm-l1-1-0/Makefile.in create mode 100644 dlls/api-ms-win-core-comm-l1-1-0/api-ms-win-core-comm-l1-1-0.spec diff --git a/configure.ac b/configure.ac index d7d5e8e6ae..69f641ddd9 100644 --- a/configure.ac +++ b/configure.ac @@ -2864,6 +2864,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-bem-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-com-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-com-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-com-private-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-comm-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-console-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-console-l2-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-crt-l1-1-0) diff --git a/dlls/api-ms-win-core-comm-l1-1-0/Makefile.in b/dlls/api-ms-win-core-comm-l1-1-0/Makefile.in new file mode 100644 index 0000000000..1780e2418d --- /dev/null +++ b/dlls/api-ms-win-core-comm-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-comm-l1-1-0.dll diff --git a/dlls/api-ms-win-core-comm-l1-1-0/api-ms-win-core-comm-l1-1-0.spec b/dlls/api-ms-win-core-comm-l1-1-0/api-ms-win-core-comm-l1-1-0.spec new file mode 100644 index 0000000000..4842c98f10 --- /dev/null +++ b/dlls/api-ms-win-core-comm-l1-1-0/api-ms-win-core-comm-l1-1-0.spec @@ -0,0 +1,18 @@ +@ stdcall ClearCommBreak(long) kernel32.ClearCommBreak +@ stdcall ClearCommError(long ptr ptr) kernel32.ClearCommError +@ stdcall EscapeCommFunction(long long) kernel32.EscapeCommFunction +@ stdcall GetCommConfig(long ptr ptr) kernel32.GetCommConfig +@ stdcall GetCommMask(long ptr) kernel32.GetCommMask +@ stdcall GetCommModemStatus(long ptr) kernel32.GetCommModemStatus +@ stdcall GetCommProperties(long ptr) kernel32.GetCommProperties +@ stdcall GetCommState(long ptr) kernel32.GetCommState +@ stdcall GetCommTimeouts(long ptr) kernel32.GetCommTimeouts +@ stdcall PurgeComm(long long) kernel32.PurgeComm +@ stdcall SetCommBreak(long) kernel32.SetCommBreak +@ stdcall SetCommConfig(long ptr long) kernel32.SetCommConfig +@ stdcall SetCommMask(long long) kernel32.SetCommMask +@ stdcall SetCommState(long ptr) kernel32.SetCommState +@ stdcall SetCommTimeouts(long ptr) kernel32.SetCommTimeouts +@ stdcall SetupComm(long long long) kernel32.SetupComm +@ stdcall TransmitCommChar(long long) kernel32.TransmitCommChar +@ stdcall WaitCommEvent(long ptr ptr) kernel32.WaitCommEvent diff --git a/tools/make_specfiles b/tools/make_specfiles index cd3af877bb..24514fcbdd 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -198,6 +198,7 @@ my @dll_groups = "api-ms-win-downlevel-normaliz-l1-1-0", "api-ms-win-core-appcompat-l1-1-1", "api-ms-win-core-atoms-l1-1-0", + "api-ms-win-core-comm-l1-1-0", "api-ms-win-core-debug-l1-1-0", "api-ms-win-core-debug-l1-1-1", "api-ms-win-core-delayload-l1-1-0", -- 2.17.1

1 0

[PATCH] shlwapi/tests: Add some tests for memory stream.
by Nikolay Sivov 07 Sep '18

07 Sep '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shlwapi/tests/istream.c | 38 ++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/dlls/shlwapi/tests/istream.c b/dlls/shlwapi/tests/istream.c index 7d0cd617dd..560a822e2c 100644 --- a/dlls/shlwapi/tests/istream.c +++ b/dlls/shlwapi/tests/istream.c @@ -733,6 +733,43 @@ static void test_SHCreateStreamOnFileEx_CopyTo(void) DeleteFileW( dstFileName ); } +static void test_SHCreateMemStream(void) +{ + static const BYTE initial[10]; + IStream *stream, *stream2; + IUnknown *unk; + char buff[10]; + HRESULT hr; + + stream = SHCreateMemStream(initial, 0); + ok(stream != NULL, "Failed to create a stream.\n"); + IStream_Release(stream); + + stream = SHCreateMemStream(NULL, 10); + ok(stream != NULL, "Failed to create a stream.\n"); + IStream_Release(stream); + + stream = SHCreateMemStream(NULL, 0); + ok(stream != NULL, "Failed to create a stream.\n"); + + hr = IStream_QueryInterface(stream, &IID_ISequentialStream, (void **)&unk); +todo_wine + ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* WinXP */, "Failed to QI, hr %#x.\n", hr); + if (unk) + IUnknown_Release(unk); + + hr = IStream_Read(stream, buff, sizeof(buff), NULL); +todo_wine + ok(hr == S_FALSE || broken(hr == S_OK) /* WinXP */, "Unexpected hr %#x.\n", hr); + + hr = IStream_Clone(stream, &stream2); +todo_wine + ok(hr == S_OK || broken(hr == E_NOTIMPL) /* < Win8 */, "Failed to clone a stream, hr %#x.\n", hr); + if (hr == S_OK) + IStream_Release(stream2); + + IStream_Release(stream); +} START_TEST(istream) { @@ -773,4 +810,5 @@ START_TEST(istream) } test_SHCreateStreamOnFileEx_CopyTo(); + test_SHCreateMemStream(); } -- 2.18.0

1 0

[PATCH v2 1/2] comctl32/listbox: Update the size in SetColumnWidth before calling UpdatePage
by Gabriel Ivăncescu 07 Sep '18

07 Sep '18

Some applications don't forward WM_SIZE from DefWindowProc to the control, but instead only send a LB_SETCOLUMNWIDTH message, even when the column width doesn't change (but the listbox size does). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22440 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v2: Don't call UpdateSize, just update the width & height, and also call UpdateScroll. dlls/comctl32/listbox.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 252844e..2137ef8 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -1257,12 +1257,19 @@ static LRESULT LISTBOX_SetHorizontalExtent( LB_DESCR *descr, INT extent ) /*********************************************************************** * LISTBOX_SetColumnWidth */ -static LRESULT LISTBOX_SetColumnWidth( LB_DESCR *descr, INT width) +static LRESULT LISTBOX_SetColumnWidth( LB_DESCR *descr, INT column_width) { - if (width == descr->column_width) return LB_OKAY; - TRACE("[%p]: new column width = %d\n", descr->self, width ); - descr->column_width = width; - LISTBOX_UpdatePage( descr ); + RECT rect; + + TRACE("[%p]: new column width = %d\n", descr->self, column_width); + + GetClientRect(descr->self, &rect); + descr->width = rect.right - rect.left; + descr->height = rect.bottom - rect.top; + descr->column_width = column_width; + + LISTBOX_UpdatePage(descr); + LISTBOX_UpdateScroll(descr); return LB_OKAY; } -- 1.9.1

2 3

[PATCH 1/3] opcservices: Implement relationships parts uri support.
by Nikolay Sivov 07 Sep '18

07 Sep '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/opcservices/Makefile.in | 2 +- dlls/opcservices/factory.c | 19 ++- dlls/opcservices/opc_private.h | 15 ++- dlls/opcservices/tests/opcservices.c | 167 +++++++++++++++++++++++++ dlls/opcservices/uri.c | 179 ++++++++++++++++++++++----- include/opcbase.idl | 2 + 6 files changed, 347 insertions(+), 37 deletions(-) diff --git a/dlls/opcservices/Makefile.in b/dlls/opcservices/Makefile.in index bdc4c80ba8..42b64b3ba9 100644 --- a/dlls/opcservices/Makefile.in +++ b/dlls/opcservices/Makefile.in @@ -1,5 +1,5 @@ MODULE = opcservices.dll -IMPORTS = uuid ole32 advapi32 urlmon xmllite +IMPORTS = uuid ole32 advapi32 urlmon xmllite oleaut32 EXTRALIBS = $(Z_LIBS) C_SRCS = \ diff --git a/dlls/opcservices/factory.c b/dlls/opcservices/factory.c index 13fa702293..2ecd5adca9 100644 --- a/dlls/opcservices/factory.c +++ b/dlls/opcservices/factory.c @@ -310,18 +310,25 @@ static ULONG WINAPI opc_factory_Release(IOpcFactory *iface) static HRESULT WINAPI opc_factory_CreatePackageRootUri(IOpcFactory *iface, IOpcUri **uri) { - static const WCHAR rootW[] = {'/',0}; - TRACE("iface %p, uri %p.\n", iface, uri); - return opc_uri_create(rootW, uri); + return opc_root_uri_create(uri); } -static HRESULT WINAPI opc_factory_CreatePartUri(IOpcFactory *iface, LPCWSTR uri, IOpcPartUri **part_uri) +static HRESULT WINAPI opc_factory_CreatePartUri(IOpcFactory *iface, LPCWSTR uri, IOpcPartUri **out) { - TRACE("iface %p, uri %s, part_uri %p.\n", iface, debugstr_w(uri), part_uri); + IUri *part_uri; + HRESULT hr; + + TRACE("iface %p, uri %s, out %p.\n", iface, debugstr_w(uri), out); + + if (FAILED(hr = CreateUri(uri, Uri_CREATE_ALLOW_RELATIVE, 0, &part_uri))) + { + WARN("Failed to create uri, hr %#x.\n", hr); + return hr; + } - return opc_part_uri_create(uri, part_uri); + return opc_part_uri_create(part_uri, NULL, out); } static HRESULT WINAPI opc_factory_CreateStreamOnFile(IOpcFactory *iface, LPCWSTR filename, diff --git a/dlls/opcservices/opc_private.h b/dlls/opcservices/opc_private.h index afe5c68561..c7b1d0cab3 100644 --- a/dlls/opcservices/opc_private.h +++ b/dlls/opcservices/opc_private.h @@ -45,9 +45,20 @@ static inline BOOL opc_array_reserve(void **elements, size_t *capacity, size_t c return TRUE; } +struct opc_uri +{ + IOpcPartUri IOpcPartUri_iface; + LONG refcount; + BOOL is_part_uri; + + IUri *uri; + IUri *rels_part_uri; + struct opc_uri *source_uri; +}; + extern HRESULT opc_package_create(IOpcFactory *factory, IOpcPackage **package) DECLSPEC_HIDDEN; -extern HRESULT opc_part_uri_create(const WCHAR *uri, IOpcPartUri **part_uri) DECLSPEC_HIDDEN; -extern HRESULT opc_uri_create(const WCHAR *uri, IOpcUri **opc_uri) DECLSPEC_HIDDEN; +extern HRESULT opc_part_uri_create(IUri *uri, struct opc_uri *source_uri, IOpcPartUri **part_uri) DECLSPEC_HIDDEN; +extern HRESULT opc_root_uri_create(IOpcUri **opc_uri) DECLSPEC_HIDDEN; extern HRESULT opc_package_write(IOpcPackage *package, OPC_WRITE_FLAGS flags, IStream *stream) DECLSPEC_HIDDEN; diff --git a/dlls/opcservices/tests/opcservices.c b/dlls/opcservices/tests/opcservices.c index 4bb3d6407a..63932fe832 100644 --- a/dlls/opcservices/tests/opcservices.c +++ b/dlls/opcservices/tests/opcservices.c @@ -26,6 +26,7 @@ #include "msopc.h" #include "urlmon.h" +#include "wine/heap.h" #include "wine/test.h" static IOpcFactory *create_factory(void) @@ -373,6 +374,171 @@ todo_wine IOpcFactory_Release(factory); } +static WCHAR *strdupAtoW(const char *str) +{ + WCHAR *ret = NULL; + DWORD len; + + if (!str) return ret; + len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + ret = heap_alloc(len * sizeof(WCHAR)); + if (ret) + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + return ret; +} + +static void test_rel_part_uri(void) +{ + static const struct + { + const char *uri; + const char *rel_uri; + HRESULT hr; + } rel_part_uri_tests[] = + { + { "/uri", "/_rels/uri.rels" }, + { "/uri.ext", "/_rels/uri.ext.rels" }, + { "/", "/_rels/.rels" }, + { "/_rels/uri.ext.rels", "", OPC_E_NONCONFORMING_URI }, + }; + static const struct + { + const char *uri; + BOOL ret; + } is_rel_part_tests[] = + { + { "/uri", FALSE }, + { "/_rels/uri", FALSE }, + { "/_rels/uri/uri", FALSE }, + { "/_rels/uri/uri.rels", FALSE }, + { "/uri/uri.rels", FALSE }, + { "/uri/_rels/uri.rels", TRUE }, + { "/_rels/.rels", TRUE }, + }; + static const WCHAR testuriW[] = {'/','u','r','i',0}; + IOpcPartUri *part_uri; + IOpcFactory *factory; + IOpcUri *source_uri; + unsigned int i; + WCHAR *uriW; + HRESULT hr; + + factory = create_factory(); + + hr = IOpcFactory_CreatePartUri(factory, testuriW, &part_uri); + ok(SUCCEEDED(hr), "Failed to create part uri, hr %#x.\n", hr); + + hr = IOpcPartUri_GetRelationshipsPartUri(part_uri, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IOpcPartUri_IsRelationshipsPartUri(part_uri, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IOpcPartUri_GetSourceUri(part_uri, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + source_uri = (void *)0xdeadbeef; + hr = IOpcPartUri_GetSourceUri(part_uri, &source_uri); + ok(hr == OPC_E_RELATIONSHIP_URI_REQUIRED, "Unexpected hr %#x.\n", hr); + ok(source_uri == NULL, "Expected null uri.\n"); + + IOpcPartUri_Release(part_uri); + + for (i = 0; i < ARRAY_SIZE(rel_part_uri_tests); ++i) + { + BOOL is_root = FALSE; + IOpcPartUri *rel_uri; + IOpcUri *part_uri; + WCHAR *rel_uriW; + + uriW = strdupAtoW(rel_part_uri_tests[i].uri); + rel_uriW = strdupAtoW(rel_part_uri_tests[i].rel_uri); + + if (!strcmp(rel_part_uri_tests[i].uri, "/")) + { + hr = IOpcFactory_CreatePackageRootUri(factory, &part_uri); + is_root = TRUE; + } + else + hr = IOpcFactory_CreatePartUri(factory, uriW, (IOpcPartUri **)&part_uri); + ok(SUCCEEDED(hr), "Failed to create part uri, hr %#x.\n", hr); + + rel_uri = (void *)0xdeadbeef; + hr = IOpcUri_GetRelationshipsPartUri(part_uri, &rel_uri); + if (SUCCEEDED(hr)) + { + IOpcPartUri *rel_uri2; + IOpcUri *source_uri2; + IUnknown *unk = NULL; + BOOL ret; + BSTR str; + + hr = IOpcPartUri_GetSourceUri(rel_uri, &source_uri); + ok(SUCCEEDED(hr), "Failed to get source uri, hr %#x.\n", hr); + hr = IOpcPartUri_GetSourceUri(rel_uri, &source_uri2); + ok(SUCCEEDED(hr), "Failed to get source uri, hr %#x.\n", hr); + ok(source_uri != source_uri2, "Unexpected instance.\n"); + hr = IOpcUri_IsEqual(source_uri, (IUri *)source_uri2, &ret); + todo_wine { + ok(SUCCEEDED(hr), "IsEqual failed, hr %#x.\n", hr); + ok(ret, "Expected equal uris.\n"); + } + hr = IOpcUri_QueryInterface(source_uri, &IID_IOpcPartUri, (void **)&unk); + ok(hr == (is_root ? E_NOINTERFACE : S_OK), "Unexpected hr %#x, %s.\n", hr, rel_part_uri_tests[i].uri); + if (unk) + IUnknown_Release(unk); + + IOpcUri_Release(source_uri2); + IOpcUri_Release(source_uri); + + hr = IOpcUri_GetRelationshipsPartUri(part_uri, &rel_uri2); + ok(SUCCEEDED(hr), "Failed to get rels part uri, hr %#x.\n", hr); + ok(rel_uri2 != rel_uri, "Unexpected instance.\n"); + IOpcPartUri_Release(rel_uri2); + + hr = IOpcPartUri_GetRawUri(rel_uri, &str); + ok(SUCCEEDED(hr), "Failed to get rel uri, hr %#x.\n", hr); + ok(!lstrcmpW(str, rel_uriW), "%u: unexpected rel uri %s, expected %s.\n", i, wine_dbgstr_w(str), + wine_dbgstr_w(rel_uriW)); + SysFreeString(str); + + IOpcPartUri_Release(rel_uri); + } + else + { + ok(hr == rel_part_uri_tests[i].hr, "%u: unexpected hr %#x.\n", i, hr); + ok(rel_uri == NULL, "%u: unexpected out pointer.\n", i); + } + + heap_free(uriW); + heap_free(rel_uriW); + + IOpcUri_Release(part_uri); + } + + for (i = 0; i < ARRAY_SIZE(is_rel_part_tests); ++i) + { + IOpcPartUri *part_uri; + BOOL ret; + + uriW = strdupAtoW(is_rel_part_tests[i].uri); + + hr = IOpcFactory_CreatePartUri(factory, uriW, &part_uri); + ok(SUCCEEDED(hr), "Failed to create part uri, hr %#x.\n", hr); + + ret = 123; + hr = IOpcPartUri_IsRelationshipsPartUri(part_uri, &ret); + ok(SUCCEEDED(hr), "Unexpected hr %#x.\n", hr); + ok(ret == is_rel_part_tests[i].ret, "%u: unexpected result %d.\n", i, ret); + + heap_free(uriW); + + IOpcPartUri_Release(part_uri); + } + + IOpcFactory_Release(factory); +} + START_TEST(opcservices) { IOpcFactory *factory; @@ -390,6 +556,7 @@ START_TEST(opcservices) test_package(); test_file_stream(); test_relationship(); + test_rel_part_uri(); IOpcFactory_Release(factory); diff --git a/dlls/opcservices/uri.c b/dlls/opcservices/uri.c index 594abc36f1..0c5afa9b29 100644 --- a/dlls/opcservices/uri.c +++ b/dlls/opcservices/uri.c @@ -23,25 +23,19 @@ #include "winbase.h" #include "wine/debug.h" +#include "wine/unicode.h" #include "opc_private.h" WINE_DEFAULT_DEBUG_CHANNEL(msopc); -struct opc_uri -{ - IOpcPartUri IOpcPartUri_iface; - LONG refcount; - BOOL is_part_uri; - - IUri *uri; -}; - static inline struct opc_uri *impl_from_IOpcPartUri(IOpcPartUri *iface) { return CONTAINING_RECORD(iface, struct opc_uri, IOpcPartUri_iface); } +static HRESULT opc_source_uri_create(struct opc_uri *uri, IOpcUri **out); + static HRESULT WINAPI opc_uri_QueryInterface(IOpcPartUri *iface, REFIID iid, void **out) { struct opc_uri *uri = impl_from_IOpcPartUri(iface); @@ -81,6 +75,10 @@ static ULONG WINAPI opc_uri_Release(IOpcPartUri *iface) if (!refcount) { + if (uri->rels_part_uri) + IUri_Release(uri->rels_part_uri); + if (uri->source_uri) + IOpcPartUri_Release(&uri->source_uri->IOpcPartUri_iface); IUri_Release(uri->uri); heap_free(uri); } @@ -319,9 +317,20 @@ static HRESULT WINAPI opc_uri_IsEqual(IOpcPartUri *iface, IUri *comparand, BOOL static HRESULT WINAPI opc_uri_GetRelationshipsPartUri(IOpcPartUri *iface, IOpcPartUri **part_uri) { - FIXME("iface %p, part_uri %p stub!\n", iface, part_uri); + struct opc_uri *uri = impl_from_IOpcPartUri(iface); - return E_NOTIMPL; + TRACE("iface %p, part_uri %p.\n", iface, part_uri); + + if (!part_uri) + return E_POINTER; + + if (!uri->rels_part_uri) + { + *part_uri = NULL; + return OPC_E_NONCONFORMING_URI; + } + + return opc_part_uri_create(uri->rels_part_uri, uri, part_uri); } static HRESULT WINAPI opc_uri_GetRelativeUri(IOpcPartUri *iface, IOpcPartUri *part_uri, @@ -349,16 +358,25 @@ static HRESULT WINAPI opc_uri_ComparePartUri(IOpcPartUri *iface, IOpcPartUri *pa static HRESULT WINAPI opc_uri_GetSourceUri(IOpcPartUri *iface, IOpcUri **source_uri) { - FIXME("iface %p, source_uri %p stub!\n", iface, source_uri); + struct opc_uri *uri = impl_from_IOpcPartUri(iface); - return E_NOTIMPL; + TRACE("iface %p, source_uri %p.\n", iface, source_uri); + + return opc_source_uri_create(uri, source_uri); } static HRESULT WINAPI opc_uri_IsRelationshipsPartUri(IOpcPartUri *iface, BOOL *result) { - FIXME("iface %p, result %p stub!\n", iface, result); + struct opc_uri *uri = impl_from_IOpcPartUri(iface); - return E_NOTIMPL; + TRACE("iface %p, result %p.\n", iface, result); + + if (!result) + return E_POINTER; + + *result = !uri->rels_part_uri; + + return S_OK; } static const IOpcPartUriVtbl opc_part_uri_vtbl = @@ -399,56 +417,161 @@ static const IOpcPartUriVtbl opc_part_uri_vtbl = opc_uri_IsRelationshipsPartUri, }; -static HRESULT opc_part_uri_init(struct opc_uri *object, BOOL is_part_uri, const WCHAR *uri) +static IUri *opc_part_uri_get_rels_uri(IUri *uri) { + static const WCHAR relsdirW[] = {'/','_','r','e','l','s',0}; + static const WCHAR relsextW[] = {'.','r','e','l','s',0}; + WCHAR *start = NULL, *end, *ret; + IUri *rels_uri; HRESULT hr; + DWORD len; + BSTR path; + + if (FAILED(IUri_GetPath(uri, &path))) + return NULL; + + if (FAILED(IUri_GetPropertyLength(uri, Uri_PROPERTY_PATH, &len, 0))) + { + SysFreeString(path); + return NULL; + } + + end = strrchrW(path, '/'); + if (end && end >= path + ARRAY_SIZE(relsdirW) - 1) + start = end - ARRAY_SIZE(relsdirW) + 1; + if (!start) + start = end; + + /* Test if it's already relationships uri. */ + if (len > ARRAY_SIZE(relsextW)) + { + if (!strcmpW(path + len - ARRAY_SIZE(relsextW) + 1, relsextW)) + { + if (start && !memcmp(start, relsdirW, ARRAY_SIZE(relsdirW) - sizeof(WCHAR))) + { + SysFreeString(path); + return NULL; + } + } + } + ret = heap_alloc((len + ARRAY_SIZE(relsextW) + ARRAY_SIZE(relsdirW)) * sizeof(WCHAR)); + if (!ret) + { + SysFreeString(path); + return NULL; + } + ret[0] = 0; + + if (start != path) + { + memcpy(ret, path, (start - path) * sizeof(WCHAR)); + ret[start - path] = 0; + } + + strcatW(ret, relsdirW); + strcatW(ret, end); + strcatW(ret, relsextW); + + if (FAILED(hr = CreateUri(ret, Uri_CREATE_ALLOW_RELATIVE, 0, &rels_uri))) + WARN("Failed to create rels uri, hr %#x.\n", hr); + heap_free(ret); + + return rels_uri; +} + +static HRESULT opc_part_uri_init(struct opc_uri *object, struct opc_uri *source_uri, BOOL is_part_uri, IUri *uri) +{ object->IOpcPartUri_iface.lpVtbl = &opc_part_uri_vtbl; object->refcount = 1; object->is_part_uri = is_part_uri; + object->uri = uri; + IUri_AddRef(object->uri); + object->rels_part_uri = opc_part_uri_get_rels_uri(object->uri); + object->source_uri = source_uri; + if (object->source_uri) + IOpcPartUri_AddRef(&object->source_uri->IOpcPartUri_iface); + + return S_OK; +} + +static HRESULT opc_source_uri_create(struct opc_uri *uri, IOpcUri **out) +{ + struct opc_uri *obj; + HRESULT hr; + + if (!out) + return E_POINTER; - if (FAILED(hr = CreateUri(uri, Uri_CREATE_ALLOW_RELATIVE, 0, &object->uri))) + *out = NULL; + + if (!uri->source_uri) + return OPC_E_RELATIONSHIP_URI_REQUIRED; + + if (!(obj = heap_alloc_zero(sizeof(*obj)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = opc_part_uri_init(obj, NULL, uri->source_uri->is_part_uri, uri->source_uri->uri))) + { + WARN("Failed to init part uri, hr %#x.\n", hr); + heap_free(obj); return hr; + } + + *out = (IOpcUri *)&obj->IOpcPartUri_iface; + + TRACE("Created source uri %p.\n", *out); return S_OK; } -HRESULT opc_part_uri_create(const WCHAR *str, IOpcPartUri **out) +HRESULT opc_part_uri_create(IUri *uri, struct opc_uri *source_uri, IOpcPartUri **out) { - struct opc_uri *uri; + struct opc_uri *obj; HRESULT hr; - if (!(uri = heap_alloc_zero(sizeof(*uri)))) + if (!(obj = heap_alloc_zero(sizeof(*obj)))) return E_OUTOFMEMORY; - if (FAILED(hr = opc_part_uri_init(uri, TRUE, str))) + if (FAILED(hr = opc_part_uri_init(obj, source_uri, TRUE, uri))) { WARN("Failed to init part uri, hr %#x.\n", hr); - heap_free(uri); + heap_free(obj); return hr; } - *out = &uri->IOpcPartUri_iface; + *out = &obj->IOpcPartUri_iface; TRACE("Created part uri %p.\n", *out); return S_OK; } -HRESULT opc_uri_create(const WCHAR *str, IOpcUri **out) +HRESULT opc_root_uri_create(IOpcUri **out) { - struct opc_uri *uri; + static const WCHAR rootW[] = {'/',0}; + struct opc_uri *obj; HRESULT hr; + IUri *uri; - if (!(uri = heap_alloc_zero(sizeof(*uri)))) + if (!(obj = heap_alloc_zero(sizeof(*obj)))) return E_OUTOFMEMORY; - if (FAILED(hr = opc_part_uri_init(uri, FALSE, str))) + if (FAILED(hr = CreateUri(rootW, Uri_CREATE_ALLOW_RELATIVE, 0, &uri))) + { + WARN("Failed to create rels uri, hr %#x.\n", hr); + heap_free(obj); + return hr; + } + + hr = opc_part_uri_init(obj, NULL, FALSE, uri); + IUri_Release(uri); + if (FAILED(hr)) { WARN("Failed to init uri, hr %#x.\n", hr); heap_free(uri); return hr; } - *out = (IOpcUri *)&uri->IOpcPartUri_iface; + *out = (IOpcUri *)&obj->IOpcPartUri_iface; TRACE("Created part uri %p.\n", *out); return S_OK; } diff --git a/include/opcbase.idl b/include/opcbase.idl index ca42ceb4e3..fae5858ed6 100644 --- a/include/opcbase.idl +++ b/include/opcbase.idl @@ -41,5 +41,7 @@ typedef [v1_enum] enum OPC_URI_TARGET_MODE_EXTERNAL = 1, } OPC_URI_TARGET_MODE; +cpp_quote("#define OPC_E_NONCONFORMING_URI MAKE_HRESULT(SEVERITY_ERROR, FACILITY_OPC, 0x1)") +cpp_quote("#define OPC_E_RELATIONSHIP_URI_REQUIRED MAKE_HRESULT(SEVERITY_ERROR, FACILITY_OPC, 0x3)") cpp_quote("#define OPC_E_INVALID_RELATIONSHIP_TARGET MAKE_HRESULT(SEVERITY_ERROR, FACILITY_OPC, 0x12)") cpp_quote("#define OPC_E_NO_SUCH_RELATIONSHIP MAKE_HRESULT(SEVERITY_ERROR, FACILITY_OPC, 0x48)") -- 2.18.0

1 2

[PATCH] ntdll: Bump Win 10 version to 17134
by André Hentschel 07 Sep '18

07 Sep '18

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/ntdll/version.c | 2 +- programs/winecfg/appdefaults.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 1674261507..9c9f2cc8cd 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -185,7 +185,7 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] = }, /* WIN10 */ { - sizeof(RTL_OSVERSIONINFOEXW), 10, 0, 0x3AD7, VER_PLATFORM_WIN32_NT, + sizeof(RTL_OSVERSIONINFOEXW), 10, 0, 0x42EE, VER_PLATFORM_WIN32_NT, {0}, 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 }, diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index d598fd4f21..6c4e6a49f2 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -48,7 +48,7 @@ static const struct const char *szProductType; } win_versions[] = { - { "win10", "Windows 10", 10, 0, 0x3AD7,VER_PLATFORM_WIN32_NT, "", 0, 0, "WinNT"}, + { "win10", "Windows 10", 10, 0, 0x42EE,VER_PLATFORM_WIN32_NT, "", 0, 0, "WinNT"}, { "win81", "Windows 8.1", 6, 3, 0x2580,VER_PLATFORM_WIN32_NT, "", 0, 0, "WinNT"}, { "win8", "Windows 8", 6, 2, 0x23F0,VER_PLATFORM_WIN32_NT, "", 0, 0, "WinNT"}, { "win2008r2", "Windows 2008 R2", 6, 1, 0x1DB1,VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "ServerNT"}, -- 2.17.1

1 0

[PATCH] riched20: Handle NULL in ITextServices::{TxGetHScroll, TxGetVScroll}.
by Jactry Zeng 07 Sep '18

07 Sep '18

Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=43488 Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/riched20/tests/txtsrv.c | 20 ++++++++++++++++++++ dlls/riched20/txtsrv.c | 30 ++++++++++++++++++++---------- 2 files changed, 40 insertions(+), 10 deletions(-) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 4dee5fd269..a8cf6ff1ad 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -990,6 +990,25 @@ static void test_default_format(void) ITextHost_Release(host); } +static void test_TxGetScroll(void) +{ + ITextServices *txtserv; + ITextHost *host; + HRESULT ret; + + if (!init_texthost(&txtserv, &host)) + return; + + ret = ITextServices_TxGetHScroll(txtserv, NULL, NULL, NULL, NULL, NULL); + ok(ret == S_OK, "ITextSerHices_GetVScroll failed: 0x%08x.\n", ret); + + ret = ITextServices_TxGetVScroll(txtserv, NULL, NULL, NULL, NULL, NULL); + ok(ret == S_OK, "ITextServices_GetVScroll failed: 0x%08x.\n", ret); + + ITextServices_Release(txtserv); + ITextHost_Release(host); +} + START_TEST( txtsrv ) { ITextServices *txtserv; @@ -1021,6 +1040,7 @@ START_TEST( txtsrv ) test_TxDraw(); test_QueryInterface(); test_default_format(); + test_TxGetScroll(); } if (wrapperCodeMem) VirtualFree(wrapperCodeMem, 0, MEM_RELEASE); } diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index eb61e4eff6..ee65621b1d 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -182,11 +182,16 @@ DECLSPEC_HIDDEN HRESULT WINAPI fnTextSrv_TxGetHScroll(ITextServices *iface, LONG { ITextServicesImpl *This = impl_from_ITextServices(iface); - *plMin = This->editor->horz_si.nMin; - *plMax = This->editor->horz_si.nMax; - *plPos = This->editor->horz_si.nPos; - *plPage = This->editor->horz_si.nPage; - *pfEnabled = (This->editor->styleFlags & WS_HSCROLL) != 0; + if (plMin) + *plMin = This->editor->horz_si.nMin; + if (plMax) + *plMax = This->editor->horz_si.nMax; + if (plPos) + *plPos = This->editor->horz_si.nPos; + if (plPage) + *plPage = This->editor->horz_si.nPage; + if (pfEnabled) + *pfEnabled = (This->editor->styleFlags & WS_HSCROLL) != 0; return S_OK; } @@ -195,11 +200,16 @@ DECLSPEC_HIDDEN HRESULT WINAPI fnTextSrv_TxGetVScroll(ITextServices *iface, LONG { ITextServicesImpl *This = impl_from_ITextServices(iface); - *plMin = This->editor->vert_si.nMin; - *plMax = This->editor->vert_si.nMax; - *plPos = This->editor->vert_si.nPos; - *plPage = This->editor->vert_si.nPage; - *pfEnabled = (This->editor->styleFlags & WS_VSCROLL) != 0; + if (plMin) + *plMin = This->editor->vert_si.nMin; + if (plMax) + *plMax = This->editor->vert_si.nMax; + if (plPos) + *plPos = This->editor->vert_si.nPos; + if (plPage) + *plPage = This->editor->vert_si.nPage; + if (pfEnabled) + *pfEnabled = (This->editor->styleFlags & WS_VSCROLL) != 0; return S_OK; } -- 2.18.0

2 1

[PATCH v2 4/4] mfplat: Implement MFCreateMemoryBuffer
by Alistair Leslie-Hughes 07 Sep '18

07 Sep '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45715 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/mfplat/main.c | 176 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 90 +++++++++++++++++++++++ include/mfapi.h | 1 + 4 files changed, 268 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 2d87429..9f381ef 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -2347,3 +2347,179 @@ HRESULT WINAPI MFCreateStreamDescriptor(DWORD identifier, DWORD count, *descriptor = &object->IMFStreamDescriptor_iface; return S_OK; } + + +typedef struct _mfbuffer +{ + IMFMediaBuffer IMFMediaBuffer_iface; + LONG ref; + + BYTE *buffer; + DWORD max_length; + DWORD current; +} mfbuffer; + +static inline mfbuffer *impl_from_IMFMediaBuffer(IMFMediaBuffer *iface) +{ + return CONTAINING_RECORD(iface, mfbuffer, IMFMediaBuffer_iface); +} + +static HRESULT WINAPI mfbuffer_QueryInterface(IMFMediaBuffer *iface, REFIID riid, void **out) +{ + mfbuffer *This = impl_from_IMFMediaBuffer(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), out); + + if(IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IMFMediaBuffer)) + { + *out = &This->IMFMediaBuffer_iface; + } + else + { + FIXME("(%s, %p)\n", debugstr_guid(riid), out); + *out = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*out); + return S_OK; +} + +static ULONG WINAPI mfbuffer_AddRef(IMFMediaBuffer *iface) +{ + mfbuffer *This = impl_from_IMFMediaBuffer(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + return ref; +} + +static ULONG WINAPI mfbuffer_Release(IMFMediaBuffer *iface) +{ + mfbuffer *This = impl_from_IMFMediaBuffer(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + if (!ref) + { + heap_free(This->buffer); + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI mfbuffer_Lock(IMFMediaBuffer *iface, BYTE **buffer, DWORD *max, DWORD *current) +{ + mfbuffer *This = impl_from_IMFMediaBuffer(iface); + + TRACE("%p, %p %p, %p\n", This, buffer, max, current); + + if(!buffer) + return E_INVALIDARG; + + *buffer = This->buffer; + if(max) + *max = This->max_length; + if(current) + *current = This->current; + + return S_OK; +} + +static HRESULT WINAPI mfbuffer_Unlock(IMFMediaBuffer *iface) +{ + mfbuffer *This = impl_from_IMFMediaBuffer(iface); + + TRACE("%p\n", This); + + return S_OK; +} + +static HRESULT WINAPI mfbuffer_GetCurrentLength(IMFMediaBuffer *iface, DWORD *current) +{ + mfbuffer *This = impl_from_IMFMediaBuffer(iface); + + TRACE("%p\n", This); + + if(!current) + return E_INVALIDARG; + + *current = This->current; + + return S_OK; +} + +static HRESULT WINAPI mfbuffer_SetCurrentLength(IMFMediaBuffer *iface, DWORD current) +{ + mfbuffer *This = impl_from_IMFMediaBuffer(iface); + + TRACE("%p, %u\n", This, current); + + if(current > This->max_length) + return E_INVALIDARG; + + This->current = current; + + return S_OK; +} + +static HRESULT WINAPI mfbuffer_GetMaxLength(IMFMediaBuffer *iface, DWORD *max) +{ + mfbuffer *This = impl_from_IMFMediaBuffer(iface); + + TRACE("%p, %p\n", This, max); + + if(!max) + return E_INVALIDARG; + + *max = This->max_length; + + return S_OK; +} + +static const IMFMediaBufferVtbl mfbuffer_vtbl = +{ + mfbuffer_QueryInterface, + mfbuffer_AddRef, + mfbuffer_Release, + mfbuffer_Lock, + mfbuffer_Unlock, + mfbuffer_GetCurrentLength, + mfbuffer_SetCurrentLength, + mfbuffer_GetMaxLength +}; + +HRESULT WINAPI MFCreateMemoryBuffer(DWORD max_length, IMFMediaBuffer **buffer) +{ + mfbuffer *object; + BYTE *bytes; + + TRACE("%u, %p\n", max_length, buffer); + + if(!buffer) + return E_INVALIDARG; + + object = heap_alloc( sizeof(*object) ); + if(!object) + return E_OUTOFMEMORY; + + bytes = heap_alloc( max_length ); + if(!bytes) + { + heap_free(object); + return E_OUTOFMEMORY; + } + + object->ref = 1; + object->max_length = max_length; + object->current = 0; + object->buffer = bytes; + object->IMFMediaBuffer_iface.lpVtbl = &mfbuffer_vtbl; + *buffer = &object->IMFMediaBuffer_iface; + + return S_OK; +} diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 1d64420..42b0b86 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -51,7 +51,7 @@ @ stub MFCreateMediaEvent @ stdcall MFCreateMediaType(ptr) @ stub MFCreateMediaTypeFromRepresentation -@ stub MFCreateMemoryBuffer +@ stdcall MFCreateMemoryBuffer(long ptr) @ stub MFCreateMemoryStream @ stub MFCreatePathFromURL @ stub MFCreatePresentationDescriptor diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index f4b5014..ccbbfb7 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -38,6 +38,8 @@ static HRESULT (WINAPI *pMFCreateSourceResolver)(IMFSourceResolver **resolver); static HRESULT (WINAPI *pMFCreateMFByteStreamOnStream)(IStream *stream, IMFByteStream **bytestream); +static HRESULT (WINAPI *pMFCreateMemoryBuffer)(DWORD max_length, IMFMediaBuffer **buffer); + DEFINE_GUID(MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, 0xa634a91c, 0x822b, 0x41b9, 0xa4, 0x94, 0x4d, 0xe4, 0x64, 0x36, 0x12, 0xb0); @@ -196,6 +198,7 @@ static void init_functions(void) #define X(f) if (!(p##f = (void*)GetProcAddress(mod, #f))) return; X(MFCreateSourceResolver); X(MFCreateMFByteStreamOnStream); + X(MFCreateMemoryBuffer); #undef X } @@ -274,6 +277,92 @@ static void test_MFCreateMFByteStreamOnStream(void) IMFByteStream_Release(bytestream); } +static void test_MFCreateMemoryBuffer(void) +{ + IMFMediaBuffer *buffer; + HRESULT hr; + DWORD length, max; + BYTE *data, *data2; + + if(!pMFCreateMemoryBuffer) + { + win_skip("MFCreateMemoryBuffer() not found\n"); + return; + } + + hr = pMFCreateMemoryBuffer(1024, NULL); + ok(hr == E_INVALIDARG || hr == E_POINTER, "got 0x%08x\n", hr); + + hr = pMFCreateMemoryBuffer(0, &buffer); + ok(hr == S_OK, "got 0x%08x\n", hr); + if(buffer) + { + hr = IMFMediaBuffer_GetMaxLength(buffer, &length); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(length == 0, "got %u\n", length); + + IMFMediaBuffer_Release(buffer); + } + + hr = pMFCreateMemoryBuffer(1024, &buffer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IMFMediaBuffer_GetMaxLength(buffer, NULL); + ok(hr == E_INVALIDARG || hr == E_POINTER, "got 0x%08x\n", hr); + + hr = IMFMediaBuffer_GetMaxLength(buffer, &length); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(length == 1024, "got %u\n", length); + + hr = IMFMediaBuffer_SetCurrentLength(buffer, 1025); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IMFMediaBuffer_SetCurrentLength(buffer, 10); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IMFMediaBuffer_GetCurrentLength(buffer, NULL); + ok(hr == E_INVALIDARG || hr == E_POINTER, "got 0x%08x\n", hr); + + hr = IMFMediaBuffer_GetCurrentLength(buffer, &length); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(length == 10, "got %u\n", length); + + length = 0; + max = 0; + hr = IMFMediaBuffer_Lock(buffer, NULL, &length, &max); + ok(hr == E_INVALIDARG || hr == E_POINTER, "got 0x%08x\n", hr); + ok(length == 0, "got %u\n", length); + ok(max == 0, "got %u\n", length); + + hr = IMFMediaBuffer_Lock(buffer, &data, &max, &length); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(length == 10, "got %u\n", length); + ok(max == 1024, "got %u\n", max); + + /* Attempt to lock the bufer twice */ + hr = IMFMediaBuffer_Lock(buffer, &data2, &max, &length); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(data == data2, "got 0x%08x\n", hr); + + hr = IMFMediaBuffer_Unlock(buffer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IMFMediaBuffer_Unlock(buffer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IMFMediaBuffer_Lock(buffer, &data, NULL, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IMFMediaBuffer_Unlock(buffer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* Extra Unlock */ + hr = IMFMediaBuffer_Unlock(buffer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IMFMediaBuffer_Release(buffer); +} + START_TEST(mfplat) { CoInitialize(NULL); @@ -285,6 +374,7 @@ START_TEST(mfplat) test_MFCreateMediaType(); test_MFCreateAttributes(); test_MFCreateMFByteStreamOnStream(); + test_MFCreateMemoryBuffer(); CoUninitialize(); } diff --git a/include/mfapi.h b/include/mfapi.h index 890d7bd..5b98187 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -67,6 +67,7 @@ HRESULT WINAPI MFCancelWorkItem(MFWORKITEM_KEY key); HRESULT WINAPI MFCreateAttributes(IMFAttributes **attributes, UINT32 size); HRESULT WINAPI MFCreateEventQueue(IMFMediaEventQueue **queue); HRESULT WINAPI MFCreateMediaType(IMFMediaType **type); +HRESULT WINAPI MFCreateMemoryBuffer(DWORD max_length, IMFMediaBuffer **buffer); HRESULT WINAPI MFGetTimerPeriodicity(DWORD *periodicity); HRESULT WINAPI MFTEnum(GUID category, UINT32 flags, MFT_REGISTER_TYPE_INFO *input_type, MFT_REGISTER_TYPE_INFO *output_type, IMFAttributes *attributes, -- 1.9.1

2 3

[PATCH v2 3/4] mfplat: Implement MFCreateMFByteStreamOnStream
by Alistair Leslie-Hughes 07 Sep '18

07 Sep '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45372 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/mfplat/main.c | 241 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 24 +++++ include/mfidl.idl | 1 + 4 files changed, 267 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index c36a5ef..2d87429 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -32,6 +32,7 @@ #include "mfidl.h" #include "mferror.h" +#include "wine/heap.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -441,6 +442,246 @@ HRESULT WINAPI MFShutdown(void) return S_OK; } + +typedef struct _mfbytestream +{ + IMFByteStream IMFByteStream_iface; + LONG ref; +} mfbytestream; + +static inline mfbytestream *impl_from_IMFByteStream(IMFByteStream *iface) +{ + return CONTAINING_RECORD(iface, mfbytestream, IMFByteStream_iface); +} + +static HRESULT WINAPI mfbytestream_QueryInterface(IMFByteStream *iface, REFIID riid, void **out) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), out); + + if(IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IMFByteStream)) + { + *out = &This->IMFByteStream_iface; + } + else + { + FIXME("(%s, %p)\n", debugstr_guid(riid), out); + *out = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*out); + return S_OK; +} + +static ULONG WINAPI mfbytestream_AddRef(IMFByteStream *iface) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + return ref; +} + +static ULONG WINAPI mfbytestream_Release(IMFByteStream *iface) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + if (!ref) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI mfbytestream_GetCapabilities(IMFByteStream *iface, DWORD *capabilities) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p\n", This, capabilities); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_GetLength(IMFByteStream *iface, QWORD *length) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p\n", This, length); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_SetLength(IMFByteStream *iface, QWORD length) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %s\n", This, wine_dbgstr_longlong(length)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_GetCurrentPosition(IMFByteStream *iface, QWORD *position) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p\n", This, position); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_SetCurrentPosition(IMFByteStream *iface, QWORD position) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %s\n", This, wine_dbgstr_longlong(position)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_IsEndOfStream(IMFByteStream *iface, BOOL *endstream) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p\n", This, endstream); + + if(endstream) + *endstream = TRUE; + + return S_OK; +} + +static HRESULT WINAPI mfbytestream_Read(IMFByteStream *iface, BYTE *data, ULONG count, ULONG *byte_read) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %u, %p\n", This, data, count, byte_read); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_BeginRead(IMFByteStream *iface, BYTE *data, ULONG count, + IMFAsyncCallback *callback, IUnknown *state) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %u, %p, %p\n", This, data, count, callback, state); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_EndRead(IMFByteStream *iface, IMFAsyncResult *result, ULONG *byte_read) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %p\n", This, result, byte_read); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_Write(IMFByteStream *iface, const BYTE *data, ULONG count, ULONG *written) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %u, %p\n", This, data, count, written); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_BeginWrite(IMFByteStream *iface, const BYTE *data, ULONG count, + IMFAsyncCallback *callback, IUnknown *state) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %u, %p, %p\n", This, data, count, callback, state); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_EndWrite(IMFByteStream *iface, IMFAsyncResult *result, ULONG *written) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %p\n", This, result, written); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_Seek(IMFByteStream *iface, MFBYTESTREAM_SEEK_ORIGIN seek, LONGLONG offset, + DWORD flags, QWORD *current) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %u, %s, 0x%08x, %p\n", This, seek, wine_dbgstr_longlong(offset), flags, current); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_Flush(IMFByteStream *iface) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_Close(IMFByteStream *iface) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p\n", This); + + return E_NOTIMPL; +} + +static const IMFByteStreamVtbl mfbytesteam_vtbl = +{ + mfbytestream_QueryInterface, + mfbytestream_AddRef, + mfbytestream_Release, + mfbytestream_GetCapabilities, + mfbytestream_GetLength, + mfbytestream_SetLength, + mfbytestream_GetCurrentPosition, + mfbytestream_SetCurrentPosition, + mfbytestream_IsEndOfStream, + mfbytestream_Read, + mfbytestream_BeginRead, + mfbytestream_EndRead, + mfbytestream_Write, + mfbytestream_BeginWrite, + mfbytestream_EndWrite, + mfbytestream_Seek, + mfbytestream_Flush, + mfbytestream_Close +}; + +HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **bytestream) +{ + mfbytestream *object; + + TRACE("(%p, %p): stub\n", stream, bytestream); + + object = heap_alloc( sizeof(*object) ); + if(!object) + return E_OUTOFMEMORY; + + object->ref = 1; + object->IMFByteStream_iface.lpVtbl = &mfbytesteam_vtbl; + + *bytestream = &object->IMFByteStream_iface; + + return S_OK; +} + static HRESULT WINAPI MFPluginControl_QueryInterface(IMFPluginControl *iface, REFIID riid, void **ppv) { if(IsEqualGUID(riid, &IID_IUnknown)) { diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 1b33e2d..1d64420 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -45,7 +45,7 @@ @ stdcall MFCreateEventQueue(ptr) @ stub MFCreateFile @ stub MFCreateLegacyMediaBufferOnMFMediaBuffer -@ stub MFCreateMFByteStreamOnStream +@ stdcall MFCreateMFByteStreamOnStream(ptr ptr) @ stub MFCreateMFVideoFormatFromMFMediaType @ stub MFCreateMediaBufferWrapper @ stub MFCreateMediaEvent diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index f3a4521..f4b5014 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -37,6 +37,7 @@ #include "wine/test.h" static HRESULT (WINAPI *pMFCreateSourceResolver)(IMFSourceResolver **resolver); +static HRESULT (WINAPI *pMFCreateMFByteStreamOnStream)(IStream *stream, IMFByteStream **bytestream); DEFINE_GUID(MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, 0xa634a91c, 0x822b, 0x41b9, 0xa4, 0x94, 0x4d, 0xe4, 0x64, 0x36, 0x12, 0xb0); @@ -194,6 +195,7 @@ static void init_functions(void) #define X(f) if (!(p##f = (void*)GetProcAddress(mod, #f))) return; X(MFCreateSourceResolver); + X(MFCreateMFByteStreamOnStream); #undef X } @@ -250,6 +252,27 @@ static void test_MFCreateAttributes(void) IMFAttributes_Release(attributes); } +static void test_MFCreateMFByteStreamOnStream(void) +{ + IMFByteStream *bytestream; + IStream *stream; + HRESULT hr; + + if(!pMFCreateMFByteStreamOnStream) + { + win_skip("MFCreateMFByteStreamOnStream() not found\n"); + return; + } + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = pMFCreateMFByteStreamOnStream(stream, &bytestream ); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IStream_Release(stream); + IMFByteStream_Release(bytestream); +} START_TEST(mfplat) { @@ -261,6 +284,7 @@ START_TEST(mfplat) test_source_resolver(); test_MFCreateMediaType(); test_MFCreateAttributes(); + test_MFCreateMFByteStreamOnStream(); CoUninitialize(); } diff --git a/include/mfidl.idl b/include/mfidl.idl index 12b351d..84be055 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -251,6 +251,7 @@ interface IMFGetService : IUnknown } cpp_quote("HRESULT WINAPI MFCreateMediaSession(IMFAttributes *config, IMFMediaSession **session);") +cpp_quote("HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **bytestream);" ) cpp_quote("HRESULT WINAPI MFCreateSourceResolver(IMFSourceResolver **resolver);") cpp_quote("HRESULT WINAPI MFCreateStreamDescriptor(DWORD identifier, DWORD cMediaTypes,") cpp_quote(" IMFMediaType **types, IMFStreamDescriptor **descriptor);") -- 1.9.1

1 0

[PATCH v2 2/4] mfplat: Add MFTUnregisterLocal stub
by Alistair Leslie-Hughes 07 Sep '18

07 Sep '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/mfplat/main.c | 7 +++++++ dlls/mfplat/mfplat.spec | 2 +- include/mfapi.h | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index c5c8ad8..c36a5ef 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -240,6 +240,13 @@ HRESULT WINAPI MFTRegisterLocal(IClassFactory *factory, REFGUID category, LPCWST return S_OK; } +HRESULT WINAPI MFTUnregisterLocal(IClassFactory *factory) +{ + FIXME("(%p)\n", factory); + + return S_OK; +} + static BOOL match_type(const WCHAR *clsid_str, const WCHAR *type_str, MFT_REGISTER_TYPE_INFO *type) { HKEY htransform, hfilter; diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index c143814..1b33e2d 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -141,7 +141,7 @@ @ stub MFTRegisterLocal(ptr ptr wstr long long ptr long ptr) @ stub MFTRegisterLocalByCLSID @ stdcall MFTUnregister(int128) -@ stub MFTUnregisterLocal +@ stdcall MFTUnregisterLocal(ptr) @ stub MFTUnregisterLocalByCLSID @ stub MFTraceError @ stub MFTraceFuncEnter diff --git a/include/mfapi.h b/include/mfapi.h index f889840..890d7bd 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -85,6 +85,7 @@ HRESULT WINAPI MFShutdown(void); HRESULT WINAPI MFStartup(ULONG version, DWORD flags); HRESULT WINAPI MFUnlockPlatform(void); HRESULT WINAPI MFTUnregister(CLSID clsid); +HRESULT WINAPI MFTUnregisterLocal(IClassFactory *factory); HRESULT WINAPI MFGetPluginControl(IMFPluginControl**); #endif /* __WINE_MFAPI_H */ -- 1.9.1

1 0

[PATCH v2 1/4] mfplat: Add MFTRegisterLocal stub
by Alistair Leslie-Hughes 07 Sep '18

07 Sep '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45622 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/mfplat/main.c | 10 ++++++++++ dlls/mfplat/mfplat.spec | 2 +- include/mfapi.h | 3 +++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index df61f3c..c5c8ad8 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -230,6 +230,16 @@ HRESULT WINAPI MFTRegister(CLSID clsid, GUID category, LPWSTR name, UINT32 flags return hr; } +HRESULT WINAPI MFTRegisterLocal(IClassFactory *factory, REFGUID category, LPCWSTR name, + UINT32 flags, UINT32 cinput, const MFT_REGISTER_TYPE_INFO *input_types, + UINT32 coutput, const MFT_REGISTER_TYPE_INFO* output_types) +{ + FIXME("(%p, %s, %s, %x, %u, %p, %u, %p)\n", factory, debugstr_guid(category), debugstr_w(name), + flags, cinput, input_types, coutput, output_types); + + return S_OK; +} + static BOOL match_type(const WCHAR *clsid_str, const WCHAR *type_str, MFT_REGISTER_TYPE_INFO *type) { HKEY htransform, hfilter; diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index a66f4d1..c143814 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -138,7 +138,7 @@ @ stdcall MFTEnumEx(int128 long ptr ptr ptr ptr) @ stub MFTGetInfo @ stdcall MFTRegister(int128 int128 wstr long long ptr long ptr ptr) -@ stub MFTRegisterLocal +@ stub MFTRegisterLocal(ptr ptr wstr long long ptr long ptr) @ stub MFTRegisterLocalByCLSID @ stdcall MFTUnregister(int128) @ stub MFTUnregisterLocal diff --git a/include/mfapi.h b/include/mfapi.h index 5aead1e..f889840 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -78,6 +78,9 @@ HRESULT WINAPI MFLockPlatform(void); HRESULT WINAPI MFTRegister(CLSID clsid, GUID category, LPWSTR name, UINT32 flags, UINT32 cinput, MFT_REGISTER_TYPE_INFO *input_types, UINT32 coutput, MFT_REGISTER_TYPE_INFO *output_types, IMFAttributes *attributes); +HRESULT WINAPI MFTRegisterLocal(IClassFactory *factory, REFGUID category, LPCWSTR name, + UINT32 flags, UINT32 cinput, const MFT_REGISTER_TYPE_INFO *input_types, + UINT32 coutput, const MFT_REGISTER_TYPE_INFO* output_types); HRESULT WINAPI MFShutdown(void); HRESULT WINAPI MFStartup(ULONG version, DWORD flags); HRESULT WINAPI MFUnlockPlatform(void); -- 1.9.1

1 0

[PATCH 4/4] mfplat: Implement MFCreateMemoryBuffer
by Alistair Leslie-Hughes 07 Sep '18

07 Sep '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45715 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/mfplat/main.c | 176 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 81 +++++++++++++++++++++ include/mfapi.h | 1 + 4 files changed, 259 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 2d87429..9f381ef 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -2347,3 +2347,179 @@ HRESULT WINAPI MFCreateStreamDescriptor(DWORD identifier, DWORD count, *descriptor = &object->IMFStreamDescriptor_iface; return S_OK; } + + +typedef struct _mfbuffer +{ + IMFMediaBuffer IMFMediaBuffer_iface; + LONG ref; + + BYTE *buffer; + DWORD max_length; + DWORD current; +} mfbuffer; + +static inline mfbuffer *impl_from_IMFMediaBuffer(IMFMediaBuffer *iface) +{ + return CONTAINING_RECORD(iface, mfbuffer, IMFMediaBuffer_iface); +} + +static HRESULT WINAPI mfbuffer_QueryInterface(IMFMediaBuffer *iface, REFIID riid, void **out) +{ + mfbuffer *This = impl_from_IMFMediaBuffer(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), out); + + if(IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IMFMediaBuffer)) + { + *out = &This->IMFMediaBuffer_iface; + } + else + { + FIXME("(%s, %p)\n", debugstr_guid(riid), out); + *out = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*out); + return S_OK; +} + +static ULONG WINAPI mfbuffer_AddRef(IMFMediaBuffer *iface) +{ + mfbuffer *This = impl_from_IMFMediaBuffer(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + return ref; +} + +static ULONG WINAPI mfbuffer_Release(IMFMediaBuffer *iface) +{ + mfbuffer *This = impl_from_IMFMediaBuffer(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + if (!ref) + { + heap_free(This->buffer); + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI mfbuffer_Lock(IMFMediaBuffer *iface, BYTE **buffer, DWORD *max, DWORD *current) +{ + mfbuffer *This = impl_from_IMFMediaBuffer(iface); + + TRACE("%p, %p %p, %p\n", This, buffer, max, current); + + if(!buffer) + return E_INVALIDARG; + + *buffer = This->buffer; + if(max) + *max = This->max_length; + if(current) + *current = This->current; + + return S_OK; +} + +static HRESULT WINAPI mfbuffer_Unlock(IMFMediaBuffer *iface) +{ + mfbuffer *This = impl_from_IMFMediaBuffer(iface); + + TRACE("%p\n", This); + + return S_OK; +} + +static HRESULT WINAPI mfbuffer_GetCurrentLength(IMFMediaBuffer *iface, DWORD *current) +{ + mfbuffer *This = impl_from_IMFMediaBuffer(iface); + + TRACE("%p\n", This); + + if(!current) + return E_INVALIDARG; + + *current = This->current; + + return S_OK; +} + +static HRESULT WINAPI mfbuffer_SetCurrentLength(IMFMediaBuffer *iface, DWORD current) +{ + mfbuffer *This = impl_from_IMFMediaBuffer(iface); + + TRACE("%p, %u\n", This, current); + + if(current > This->max_length) + return E_INVALIDARG; + + This->current = current; + + return S_OK; +} + +static HRESULT WINAPI mfbuffer_GetMaxLength(IMFMediaBuffer *iface, DWORD *max) +{ + mfbuffer *This = impl_from_IMFMediaBuffer(iface); + + TRACE("%p, %p\n", This, max); + + if(!max) + return E_INVALIDARG; + + *max = This->max_length; + + return S_OK; +} + +static const IMFMediaBufferVtbl mfbuffer_vtbl = +{ + mfbuffer_QueryInterface, + mfbuffer_AddRef, + mfbuffer_Release, + mfbuffer_Lock, + mfbuffer_Unlock, + mfbuffer_GetCurrentLength, + mfbuffer_SetCurrentLength, + mfbuffer_GetMaxLength +}; + +HRESULT WINAPI MFCreateMemoryBuffer(DWORD max_length, IMFMediaBuffer **buffer) +{ + mfbuffer *object; + BYTE *bytes; + + TRACE("%u, %p\n", max_length, buffer); + + if(!buffer) + return E_INVALIDARG; + + object = heap_alloc( sizeof(*object) ); + if(!object) + return E_OUTOFMEMORY; + + bytes = heap_alloc( max_length ); + if(!bytes) + { + heap_free(object); + return E_OUTOFMEMORY; + } + + object->ref = 1; + object->max_length = max_length; + object->current = 0; + object->buffer = bytes; + object->IMFMediaBuffer_iface.lpVtbl = &mfbuffer_vtbl; + *buffer = &object->IMFMediaBuffer_iface; + + return S_OK; +} diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 1d64420..42b0b86 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -51,7 +51,7 @@ @ stub MFCreateMediaEvent @ stdcall MFCreateMediaType(ptr) @ stub MFCreateMediaTypeFromRepresentation -@ stub MFCreateMemoryBuffer +@ stdcall MFCreateMemoryBuffer(long ptr) @ stub MFCreateMemoryStream @ stub MFCreatePathFromURL @ stub MFCreatePresentationDescriptor diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index a4cd9f3..a693117 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -266,6 +266,86 @@ static void test_MFCreateMFByteStreamOnStream(void) IMFByteStream_Release(bytestream); } +static void test_MFCreateMemoryBuffer(void) +{ + IMFMediaBuffer *buffer; + HRESULT hr; + DWORD length, max; + BYTE *data, *data2; + + hr = MFCreateMemoryBuffer(1024, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = MFCreateMemoryBuffer(0, &buffer); + ok(hr == S_OK, "got 0x%08x\n", hr); + if(buffer) + { + hr = IMFMediaBuffer_GetMaxLength(buffer, &length); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(length == 0, "got %u\n", length); + + IMFMediaBuffer_Release(buffer); + } + + hr = MFCreateMemoryBuffer(1024, &buffer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IMFMediaBuffer_GetMaxLength(buffer, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IMFMediaBuffer_GetMaxLength(buffer, &length); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(length == 1024, "got %u\n", length); + + hr = IMFMediaBuffer_SetCurrentLength(buffer, 1025); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IMFMediaBuffer_SetCurrentLength(buffer, 10); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IMFMediaBuffer_GetCurrentLength(buffer, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IMFMediaBuffer_GetCurrentLength(buffer, &length); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(length == 10, "got %u\n", length); + + length = 0; + max = 0; + hr = IMFMediaBuffer_Lock(buffer, NULL, &length, &max); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(length == 0, "got %u\n", length); + ok(max == 0, "got %u\n", length); + + hr = IMFMediaBuffer_Lock(buffer, &data, &max, &length); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(length == 10, "got %u\n", length); + ok(max == 1024, "got %u\n", max); + + /* Attempt to lock the bufer twice */ + hr = IMFMediaBuffer_Lock(buffer, &data2, &max, &length); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(data == data2, "got 0x%08x\n", hr); + + hr = IMFMediaBuffer_Unlock(buffer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IMFMediaBuffer_Unlock(buffer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IMFMediaBuffer_Lock(buffer, &data, NULL, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IMFMediaBuffer_Unlock(buffer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* Extra Unlock */ + hr = IMFMediaBuffer_Unlock(buffer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IMFMediaBuffer_Release(buffer); +} + START_TEST(mfplat) { CoInitialize(NULL); @@ -277,6 +357,7 @@ START_TEST(mfplat) test_MFCreateMediaType(); test_MFCreateAttributes(); test_MFCreateMFByteStreamOnStream(); + test_MFCreateMemoryBuffer(); CoUninitialize(); } diff --git a/include/mfapi.h b/include/mfapi.h index 890d7bd..5b98187 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -67,6 +67,7 @@ HRESULT WINAPI MFCancelWorkItem(MFWORKITEM_KEY key); HRESULT WINAPI MFCreateAttributes(IMFAttributes **attributes, UINT32 size); HRESULT WINAPI MFCreateEventQueue(IMFMediaEventQueue **queue); HRESULT WINAPI MFCreateMediaType(IMFMediaType **type); +HRESULT WINAPI MFCreateMemoryBuffer(DWORD max_length, IMFMediaBuffer **buffer); HRESULT WINAPI MFGetTimerPeriodicity(DWORD *periodicity); HRESULT WINAPI MFTEnum(GUID category, UINT32 flags, MFT_REGISTER_TYPE_INFO *input_type, MFT_REGISTER_TYPE_INFO *output_type, IMFAttributes *attributes, -- 1.9.1

2 1

[PATCH 3/4] mfplat: Implement MFCreateMFByteStreamOnStream
by Alistair Leslie-Hughes 07 Sep '18

07 Sep '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45372 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/mfplat/main.c | 241 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 16 +++ include/mfidl.idl | 1 + 4 files changed, 259 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index c36a5ef..2d87429 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -32,6 +32,7 @@ #include "mfidl.h" #include "mferror.h" +#include "wine/heap.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -441,6 +442,246 @@ HRESULT WINAPI MFShutdown(void) return S_OK; } + +typedef struct _mfbytestream +{ + IMFByteStream IMFByteStream_iface; + LONG ref; +} mfbytestream; + +static inline mfbytestream *impl_from_IMFByteStream(IMFByteStream *iface) +{ + return CONTAINING_RECORD(iface, mfbytestream, IMFByteStream_iface); +} + +static HRESULT WINAPI mfbytestream_QueryInterface(IMFByteStream *iface, REFIID riid, void **out) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), out); + + if(IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IMFByteStream)) + { + *out = &This->IMFByteStream_iface; + } + else + { + FIXME("(%s, %p)\n", debugstr_guid(riid), out); + *out = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*out); + return S_OK; +} + +static ULONG WINAPI mfbytestream_AddRef(IMFByteStream *iface) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + return ref; +} + +static ULONG WINAPI mfbytestream_Release(IMFByteStream *iface) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + if (!ref) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI mfbytestream_GetCapabilities(IMFByteStream *iface, DWORD *capabilities) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p\n", This, capabilities); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_GetLength(IMFByteStream *iface, QWORD *length) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p\n", This, length); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_SetLength(IMFByteStream *iface, QWORD length) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %s\n", This, wine_dbgstr_longlong(length)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_GetCurrentPosition(IMFByteStream *iface, QWORD *position) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p\n", This, position); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_SetCurrentPosition(IMFByteStream *iface, QWORD position) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %s\n", This, wine_dbgstr_longlong(position)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_IsEndOfStream(IMFByteStream *iface, BOOL *endstream) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p\n", This, endstream); + + if(endstream) + *endstream = TRUE; + + return S_OK; +} + +static HRESULT WINAPI mfbytestream_Read(IMFByteStream *iface, BYTE *data, ULONG count, ULONG *byte_read) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %u, %p\n", This, data, count, byte_read); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_BeginRead(IMFByteStream *iface, BYTE *data, ULONG count, + IMFAsyncCallback *callback, IUnknown *state) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %u, %p, %p\n", This, data, count, callback, state); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_EndRead(IMFByteStream *iface, IMFAsyncResult *result, ULONG *byte_read) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %p\n", This, result, byte_read); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_Write(IMFByteStream *iface, const BYTE *data, ULONG count, ULONG *written) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %u, %p\n", This, data, count, written); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_BeginWrite(IMFByteStream *iface, const BYTE *data, ULONG count, + IMFAsyncCallback *callback, IUnknown *state) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %u, %p, %p\n", This, data, count, callback, state); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_EndWrite(IMFByteStream *iface, IMFAsyncResult *result, ULONG *written) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %p\n", This, result, written); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_Seek(IMFByteStream *iface, MFBYTESTREAM_SEEK_ORIGIN seek, LONGLONG offset, + DWORD flags, QWORD *current) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %u, %s, 0x%08x, %p\n", This, seek, wine_dbgstr_longlong(offset), flags, current); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_Flush(IMFByteStream *iface) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_Close(IMFByteStream *iface) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p\n", This); + + return E_NOTIMPL; +} + +static const IMFByteStreamVtbl mfbytesteam_vtbl = +{ + mfbytestream_QueryInterface, + mfbytestream_AddRef, + mfbytestream_Release, + mfbytestream_GetCapabilities, + mfbytestream_GetLength, + mfbytestream_SetLength, + mfbytestream_GetCurrentPosition, + mfbytestream_SetCurrentPosition, + mfbytestream_IsEndOfStream, + mfbytestream_Read, + mfbytestream_BeginRead, + mfbytestream_EndRead, + mfbytestream_Write, + mfbytestream_BeginWrite, + mfbytestream_EndWrite, + mfbytestream_Seek, + mfbytestream_Flush, + mfbytestream_Close +}; + +HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **bytestream) +{ + mfbytestream *object; + + TRACE("(%p, %p): stub\n", stream, bytestream); + + object = heap_alloc( sizeof(*object) ); + if(!object) + return E_OUTOFMEMORY; + + object->ref = 1; + object->IMFByteStream_iface.lpVtbl = &mfbytesteam_vtbl; + + *bytestream = &object->IMFByteStream_iface; + + return S_OK; +} + static HRESULT WINAPI MFPluginControl_QueryInterface(IMFPluginControl *iface, REFIID riid, void **ppv) { if(IsEqualGUID(riid, &IID_IUnknown)) { diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 1b33e2d..1d64420 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -45,7 +45,7 @@ @ stdcall MFCreateEventQueue(ptr) @ stub MFCreateFile @ stub MFCreateLegacyMediaBufferOnMFMediaBuffer -@ stub MFCreateMFByteStreamOnStream +@ stdcall MFCreateMFByteStreamOnStream(ptr ptr) @ stub MFCreateMFVideoFormatFromMFMediaType @ stub MFCreateMediaBufferWrapper @ stub MFCreateMediaEvent diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index f3a4521..a4cd9f3 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -250,6 +250,21 @@ static void test_MFCreateAttributes(void) IMFAttributes_Release(attributes); } +static void test_MFCreateMFByteStreamOnStream(void) +{ + IMFByteStream *bytestream; + IStream *stream; + HRESULT hr; + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = MFCreateMFByteStreamOnStream(stream, &bytestream ); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IStream_Release(stream); + IMFByteStream_Release(bytestream); +} START_TEST(mfplat) { @@ -261,6 +276,7 @@ START_TEST(mfplat) test_source_resolver(); test_MFCreateMediaType(); test_MFCreateAttributes(); + test_MFCreateMFByteStreamOnStream(); CoUninitialize(); } diff --git a/include/mfidl.idl b/include/mfidl.idl index 12b351d..84be055 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -251,6 +251,7 @@ interface IMFGetService : IUnknown } cpp_quote("HRESULT WINAPI MFCreateMediaSession(IMFAttributes *config, IMFMediaSession **session);") +cpp_quote("HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **bytestream);" ) cpp_quote("HRESULT WINAPI MFCreateSourceResolver(IMFSourceResolver **resolver);") cpp_quote("HRESULT WINAPI MFCreateStreamDescriptor(DWORD identifier, DWORD cMediaTypes,") cpp_quote(" IMFMediaType **types, IMFStreamDescriptor **descriptor);") -- 1.9.1

2 1

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-devel