wine-commits August 2017

wine-commits@winehq.org

2 participants
351 discussions

Andrey Gusev : mfplat: Add MFTEnumEx stub.
by Alexandre Julliard 16 Aug '17

16 Aug '17

Module: wine Branch: master Commit: 67bc1db56b2d8db57414190b13ceb41ae1986318 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67bc1db56b2d8db57414190b1… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Aug 14 15:12:23 2017 +0300 mfplat: Add MFTEnumEx stub. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 14 ++++++++++++++ dlls/mfplat/mfplat.spec | 2 +- include/mfapi.h | 3 +++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index f71a595..e6616c8 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -348,6 +348,20 @@ HRESULT WINAPI MFTEnum(GUID category, UINT32 flags, MFT_REGISTER_TYPE_INFO *inpu } /*********************************************************************** + * MFTEnumEx (mfplat.@) + */ +HRESULT WINAPI MFTEnumEx(GUID category, UINT32 flags, const MFT_REGISTER_TYPE_INFO *input_type, + const MFT_REGISTER_TYPE_INFO *output_type, IMFActivate ***activate, + UINT32 *pcount) +{ + FIXME("(%s, %x, %p, %p, %p, %p): stub\n", debugstr_guid(&category), flags, input_type, + output_type, activate, pcount); + + *pcount = 0; + return S_OK; +} + +/*********************************************************************** * MFTUnregister (mfplat.@) */ HRESULT WINAPI MFTUnregister(CLSID clsid) diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 22b7254..efcb143 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -135,7 +135,7 @@ @ stdcall MFStartup(long long) @ stub MFStreamDescriptorProtectMediaType @ stdcall MFTEnum(int128 long ptr ptr ptr ptr ptr) -@ stub MFTEnumEx +@ stdcall MFTEnumEx(int128 long ptr ptr ptr ptr) @ stub MFTGetInfo @ stdcall MFTRegister(int128 int128 wstr long long ptr long ptr ptr) @ stub MFTRegisterLocal diff --git a/include/mfapi.h b/include/mfapi.h index ccea990..2be0638 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -70,6 +70,9 @@ 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, CLSID **pclsids, UINT32 *pcount); +HRESULT WINAPI MFTEnumEx(GUID category, UINT32 flags, const MFT_REGISTER_TYPE_INFO *input_type, + const MFT_REGISTER_TYPE_INFO *output_type, IMFActivate ***activate, + UINT32 *pcount); 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,

1 0

Michael Müller : wined3d: Recognize SM4 nop opcode.
by Alexandre Julliard 16 Aug '17

16 Aug '17

Module: wine Branch: master Commit: 3fd68e5ba5b7f896212f96cf0c8e728433a48930 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fd68e5ba5b7f896212f96cf0… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Aug 14 23:51:02 2017 +0200 wined3d: Recognize SM4 nop opcode. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader_sm4.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 142c0f8..123ecbc 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -171,6 +171,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_MOVC = 0x37, WINED3D_SM4_OP_MUL = 0x38, WINED3D_SM4_OP_NE = 0x39, + WINED3D_SM4_OP_NOP = 0x3a, WINED3D_SM4_OP_NOT = 0x3b, WINED3D_SM4_OP_OR = 0x3c, WINED3D_SM4_OP_RESINFO = 0x3d, @@ -937,6 +938,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_MOVC, WINED3DSIH_MOVC, "f", "uff"}, {WINED3D_SM4_OP_MUL, WINED3DSIH_MUL, "f", "ff"}, {WINED3D_SM4_OP_NE, WINED3DSIH_NE, "u", "ff"}, + {WINED3D_SM4_OP_NOP, WINED3DSIH_NOP, "", ""}, {WINED3D_SM4_OP_NOT, WINED3DSIH_NOT, "u", "u"}, {WINED3D_SM4_OP_OR, WINED3DSIH_OR, "u", "uu"}, {WINED3D_SM4_OP_RESINFO, WINED3DSIH_RESINFO, "f", "iR"},

1 0

Józef Kucia : d3d11/tests: Add test for indirect dispatch.
by Alexandre Julliard 16 Aug '17

16 Aug '17

Module: wine Branch: master Commit: 25e5fd16713ec2c7c7186e299f13ae2a72352de0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25e5fd16713ec2c7c7186e299… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 14 23:47:45 2017 +0200 d3d11/tests: Add test for indirect dispatch. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 193 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 193 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=25e5fd16713ec2c7c7186…

1 0

Józef Kucia : wined3d: Add support for append/ consume structured buffer views.
by Alexandre Julliard 16 Aug '17

16 Aug '17

Module: wine Branch: master Commit: 3513a0c9e7b3ba99fd3f6c7175b71623744458c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3513a0c9e7b3ba99fd3f6c717… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 14 23:47:44 2017 +0200 wined3d: Add support for append/consume structured buffer views. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/view.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index f4f3b35..2ffb718 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -953,7 +953,7 @@ static void wined3d_unordered_access_view_cs_init(void *object) context = context_acquire(resource->device, NULL, 0); gl_info = context->gl_info; create_buffer_view(&view->gl_view, context, desc, buffer, view->format); - if (desc->flags & WINED3D_VIEW_BUFFER_COUNTER) + if (desc->flags & (WINED3D_VIEW_BUFFER_COUNTER | WINED3D_VIEW_BUFFER_APPEND)) { static const GLuint initial_value = 0; GL_EXTCALL(glGenBuffers(1, &view->counter_bo)); @@ -994,9 +994,6 @@ static HRESULT wined3d_unordered_access_view_init(struct wined3d_unordered_acces return E_INVALIDARG; view->desc = *desc; - if (desc->flags & WINED3D_VIEW_BUFFER_APPEND) - FIXME("Unhandled view flags %#x.\n", desc->flags); - wined3d_resource_incref(view->resource = resource); wined3d_cs_init_object(resource->device->cs, wined3d_unordered_access_view_cs_init, view);

1 0

Józef Kucia : d3d11/tests: Extend test for UAV counters.
by Alexandre Julliard 16 Aug '17

16 Aug '17

Module: wine Branch: master Commit: c068e9a47a870bdf3eaf8c45f71d48e591a04a75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c068e9a47a870bdf3eaf8c45f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 14 23:47:43 2017 +0200 d3d11/tests: Extend test for UAV counters. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 3ee36c9..d346f5e 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -17972,6 +17972,13 @@ static void test_uav_counters(void) ID3D11DeviceContext_CSSetUnorderedAccessViews(context, 0, 1, &uav, &data); data = read_uav_counter(context, staging_buffer, uav); ok(data == 8, "Got unexpected value %u.\n", data); + data = ~0u; + ID3D11DeviceContext_CSSetUnorderedAccessViews(context, 0, 1, &uav, &data); + data = read_uav_counter(context, staging_buffer, uav); + ok(data == 8, "Got unexpected value %u.\n", data); + ID3D11DeviceContext_CSSetUnorderedAccessViews(context, 0, 1, &uav, NULL); + data = read_uav_counter(context, staging_buffer, uav); + ok(data == 8, "Got unexpected value %u.\n", data); ID3D11DeviceContext_CSSetShader(context, cs_producer, NULL, 0); data = 0;

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_DispatchIndirect().
by Alexandre Julliard 16 Aug '17

16 Aug '17

Module: wine Branch: master Commit: 59f96ff3a58a14bafc6bbcce194fd5296011c8c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59f96ff3a58a14bafc6bbcce1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 14 23:47:42 2017 +0200 d3d11: Implement d3d11_immediate_context_DispatchIndirect(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 0f268df..ced9a13 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -868,7 +868,17 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_Dispatch(ID3D11DeviceConte static void STDMETHODCALLTYPE d3d11_immediate_context_DispatchIndirect(ID3D11DeviceContext *iface, ID3D11Buffer *buffer, UINT offset) { - FIXME("iface %p, buffer %p, offset %u stub!\n", iface, buffer, offset); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_buffer *buffer_impl; + + TRACE("iface %p, buffer %p, offset %u.\n", iface, buffer, offset); + + buffer_impl = unsafe_impl_from_ID3D11Buffer(buffer); + + wined3d_mutex_lock(); + wined3d_device_dispatch_compute_indirect(device->wined3d_device, + buffer_impl->wined3d_buffer, offset); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceContext *iface,

1 0

Józef Kucia : wined3d: Implement indirect compute dispatch.
by Alexandre Julliard 16 Aug '17

16 Aug '17

Module: wine Branch: master Commit: 2f66f1288fb598710a7f68a4d918ee2565f6ea56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f66f1288fb598710a7f68a4d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 14 23:47:41 2017 +0200 wined3d: Implement indirect compute dispatch. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 46 ++++++++++++++++++++++++++++++++---------- dlls/wined3d/device.c | 8 ++++++++ dlls/wined3d/drawprim.c | 20 +++++++++++++++--- dlls/wined3d/wined3d.spec | 1 + dlls/wined3d/wined3d_private.h | 27 ++++++++++++++++++++++++- include/wine/wined3d.h | 2 ++ 6 files changed, 89 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index a76598f..8961dfe 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -112,9 +112,7 @@ struct wined3d_cs_clear struct wined3d_cs_dispatch { enum wined3d_cs_op opcode; - unsigned int group_count_x; - unsigned int group_count_y; - unsigned int group_count_z; + struct wined3d_dispatch_parameters parameters; }; struct wined3d_cs_draw @@ -705,14 +703,23 @@ static void wined3d_cs_exec_dispatch(struct wined3d_cs *cs, const void *data) const struct wined3d_cs_dispatch *op = data; struct wined3d_state *state = &cs->state; - dispatch_compute(cs->device, state, - op->group_count_x, op->group_count_y, op->group_count_z); + dispatch_compute(cs->device, state, &op->parameters); + + if (op->parameters.indirect) + wined3d_resource_release(&op->parameters.u.indirect.buffer->resource); release_shader_resources(state, 1u << WINED3D_SHADER_TYPE_COMPUTE); release_unordered_access_resources(state->shader[WINED3D_SHADER_TYPE_COMPUTE], state->unordered_access_view[WINED3D_PIPELINE_COMPUTE]); } +static void acquire_compute_pipeline_resources(const struct wined3d_state *state) +{ + acquire_shader_resources(state, 1u << WINED3D_SHADER_TYPE_COMPUTE); + acquire_unordered_access_resources(state->shader[WINED3D_SHADER_TYPE_COMPUTE], + state->unordered_access_view[WINED3D_PIPELINE_COMPUTE]); +} + void wined3d_cs_emit_dispatch(struct wined3d_cs *cs, unsigned int group_count_x, unsigned int group_count_y, unsigned int group_count_z) { @@ -721,13 +728,30 @@ void wined3d_cs_emit_dispatch(struct wined3d_cs *cs, op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_DISPATCH; - op->group_count_x = group_count_x; - op->group_count_y = group_count_y; - op->group_count_z = group_count_z; + op->parameters.indirect = FALSE; + op->parameters.u.direct.group_count_x = group_count_x; + op->parameters.u.direct.group_count_y = group_count_y; + op->parameters.u.direct.group_count_z = group_count_z; - acquire_shader_resources(state, 1u << WINED3D_SHADER_TYPE_COMPUTE); - acquire_unordered_access_resources(state->shader[WINED3D_SHADER_TYPE_COMPUTE], - state->unordered_access_view[WINED3D_PIPELINE_COMPUTE]); + acquire_compute_pipeline_resources(state); + + cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); +} + +void wined3d_cs_emit_dispatch_indirect(struct wined3d_cs *cs, + struct wined3d_buffer *buffer, unsigned int offset) +{ + const struct wined3d_state *state = &cs->device->state; + struct wined3d_cs_dispatch *op; + + op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op->opcode = WINED3D_CS_OP_DISPATCH; + op->parameters.indirect = TRUE; + op->parameters.u.indirect.buffer = buffer; + op->parameters.u.indirect.offset = offset; + + acquire_compute_pipeline_resources(state); + wined3d_resource_acquire(&buffer->resource); cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 30e7fbe..31955ba 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3652,6 +3652,14 @@ void CDECL wined3d_device_dispatch_compute(struct wined3d_device *device, wined3d_cs_emit_dispatch(device->cs, group_count_x, group_count_y, group_count_z); } +void CDECL wined3d_device_dispatch_compute_indirect(struct wined3d_device *device, + struct wined3d_buffer *buffer, unsigned int offset) +{ + TRACE("device %p, buffer %p, offset %u.\n", device, buffer, offset); + + wined3d_cs_emit_dispatch_indirect(device->cs, buffer, offset); +} + void CDECL wined3d_device_set_primitive_type(struct wined3d_device *device, enum wined3d_primitive_type primitive_type, unsigned int patch_vertex_count) { diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index e9bce44..235f87b 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -669,7 +669,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s } void dispatch_compute(struct wined3d_device *device, const struct wined3d_state *state, - unsigned int group_count_x, unsigned int group_count_y, unsigned int group_count_z) + const struct wined3d_dispatch_parameters *parameters) { const struct wined3d_gl_info *gl_info; struct wined3d_context *context; @@ -699,8 +699,22 @@ void dispatch_compute(struct wined3d_device *device, const struct wined3d_state return; } - GL_EXTCALL(glDispatchCompute(group_count_x, group_count_y, group_count_z)); - checkGLcall("glDispatchCompute"); + if (parameters->indirect) + { + const struct wined3d_indirect_dispatch_parameters *indirect = &parameters->u.indirect; + struct wined3d_buffer *buffer = indirect->buffer; + + wined3d_buffer_load(buffer, context, state); + GL_EXTCALL(glBindBuffer(GL_DISPATCH_INDIRECT_BUFFER, buffer->buffer_object)); + GL_EXTCALL(glDispatchComputeIndirect((GLintptr)indirect->offset)); + GL_EXTCALL(glBindBuffer(GL_DISPATCH_INDIRECT_BUFFER, 0)); + } + else + { + const struct wined3d_direct_dispatch_parameters *direct = &parameters->u.direct; + GL_EXTCALL(glDispatchCompute(direct->group_count_x, direct->group_count_y, direct->group_count_z)); + } + checkGLcall("dispatch compute"); GL_EXTCALL(glMemoryBarrier(GL_ALL_BARRIER_BITS)); checkGLcall("glMemoryBarrier"); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index c0724ab..fb8188e 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -42,6 +42,7 @@ @ cdecl wined3d_device_create(ptr long long ptr long long ptr ptr) @ cdecl wined3d_device_decref(ptr) @ cdecl wined3d_device_dispatch_compute(ptr long long long) +@ cdecl wined3d_device_dispatch_compute_indirect(ptr ptr long) @ cdecl wined3d_device_draw_indexed_primitive(ptr long long) @ cdecl wined3d_device_draw_indexed_primitive_instanced(ptr long long long long) @ cdecl wined3d_device_draw_primitive(ptr long long) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f8aeb62..74043d0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1479,11 +1479,34 @@ void wined3d_stream_info_from_declaration(struct wined3d_stream_info *stream_inf const struct wined3d_state *state, const struct wined3d_gl_info *gl_info, const struct wined3d_d3d_info *d3d_info) DECLSPEC_HIDDEN; +struct wined3d_direct_dispatch_parameters +{ + unsigned int group_count_x; + unsigned int group_count_y; + unsigned int group_count_z; +}; + +struct wined3d_indirect_dispatch_parameters +{ + struct wined3d_buffer *buffer; + unsigned int offset; +}; + +struct wined3d_dispatch_parameters +{ + BOOL indirect; + union + { + struct wined3d_direct_dispatch_parameters direct; + struct wined3d_indirect_dispatch_parameters indirect; + } u; +}; + void draw_primitive(struct wined3d_device *device, const struct wined3d_state *state, int base_vertex_idx, unsigned int start_idx, unsigned int index_count, unsigned int start_instance, unsigned int instance_count, BOOL indexed) DECLSPEC_HIDDEN; void dispatch_compute(struct wined3d_device *device, const struct wined3d_state *state, - unsigned int group_count_x, unsigned int group_count_y, unsigned int group_count_z) DECLSPEC_HIDDEN; + const struct wined3d_dispatch_parameters *dispatch_parameters) DECLSPEC_HIDDEN; DWORD get_flexible_vertex_size(DWORD d3dvtVertexType) DECLSPEC_HIDDEN; #define eps 1e-8f @@ -3430,6 +3453,8 @@ void wined3d_cs_emit_copy_uav_counter(struct wined3d_cs *cs, struct wined3d_buff unsigned int offset, struct wined3d_unordered_access_view *uav) DECLSPEC_HIDDEN; void wined3d_cs_emit_dispatch(struct wined3d_cs *cs, unsigned int group_count_x, unsigned int group_count_y, unsigned int group_count_z) DECLSPEC_HIDDEN; +void wined3d_cs_emit_dispatch_indirect(struct wined3d_cs *cs, + struct wined3d_buffer *buffer, unsigned int offset) DECLSPEC_HIDDEN; void wined3d_cs_emit_draw(struct wined3d_cs *cs, GLenum primitive_type, unsigned int patch_vertex_count, int base_vertex_idx, unsigned int start_idx, unsigned int index_count, unsigned int start_instance, unsigned int instance_count, BOOL indexed) DECLSPEC_HIDDEN; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index b92ada0..6fa31e7 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2217,6 +2217,8 @@ HRESULT __cdecl wined3d_device_create(struct wined3d *wined3d, UINT adapter_idx, ULONG __cdecl wined3d_device_decref(struct wined3d_device *device); void __cdecl wined3d_device_dispatch_compute(struct wined3d_device *device, unsigned int group_count_x, unsigned int group_count_y, unsigned int group_count_z); +void __cdecl wined3d_device_dispatch_compute_indirect(struct wined3d_device *device, + struct wined3d_buffer *buffer, unsigned int offset); HRESULT __cdecl wined3d_device_draw_indexed_primitive(struct wined3d_device *device, UINT start_idx, UINT index_count); void __cdecl wined3d_device_draw_indexed_primitive_instanced(struct wined3d_device *device, UINT start_idx, UINT index_count, UINT start_instance, UINT instance_count);

1 0

Vincent Povirk : windowscodecs: Fix 32bppGrayFloat to 8bppGray conversion.
by Alexandre Julliard 16 Aug '17

16 Aug '17

Module: wine Branch: master Commit: 8bae21302f88bd6b3360334355d9d7a5c6a1ad38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bae21302f88bd6b336033435… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Aug 14 14:58:59 2017 -0500 windowscodecs: Fix 32bppGrayFloat to 8bppGray conversion. Based on Dmitry Timoshkov's patch. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/converter.c | 37 ++++++++++++++++++++++++++++++++++++ dlls/windowscodecs/tests/converter.c | 1 + 2 files changed, 38 insertions(+) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index e5d61e1..42ba260 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -1149,6 +1149,43 @@ static HRESULT copypixels_to_8bppGray(struct FormatConverter *This, const WICRec return S_OK; } + if (source_format == format_32bppGrayFloat) + { + hr = S_OK; + + if (prc) + { + srcstride = 4 * prc->Width; + srcdatasize = srcstride * prc->Height; + + srcdata = HeapAlloc(GetProcessHeap(), 0, srcdatasize); + if (!srcdata) return E_OUTOFMEMORY; + + hr = IWICBitmapSource_CopyPixels(This->source, prc, srcstride, srcdatasize, srcdata); + if (SUCCEEDED(hr)) + { + INT x, y; + BYTE *src = srcdata, *dst = pbBuffer; + + for (y=0; y < prc->Height; y++) + { + float *srcpixel = (float*)src; + BYTE *dstpixel = dst; + + for (x=0; x < prc->Width; x++) + *dstpixel++ = (BYTE)floorf(to_sRGB_component(*srcpixel++) * 255.0f + 0.51f); + + src += srcstride; + dst += cbStride; + } + } + + HeapFree(GetProcessHeap(), 0, srcdata); + } + + return hr; + } + srcstride = 3 * prc->Width; srcdatasize = srcstride * prc->Height; diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 041ca96..13aa3c1 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -880,6 +880,7 @@ START_TEST(converter) test_conversion(&testdata_24bppBGR, &testdata_8bppGray, "24bppBGR -> 8bppGray", FALSE); test_conversion(&testdata_32bppBGR, &testdata_8bppGray, "32bppBGR -> 8bppGray", FALSE); test_conversion(&testdata_32bppGrayFloat, &testdata_24bppBGR_gray, "32bppGrayFloat -> 24bppBGR gray", FALSE); + test_conversion(&testdata_32bppGrayFloat, &testdata_8bppGray, "32bppGrayFloat -> 8bppGray", FALSE); test_invalid_conversion(); test_default_converter();

1 0

Jactry Zeng : shell32/tests: Add more tests for SHGetKnownFolderIDList.
by Alexandre Julliard 16 Aug '17

16 Aug '17

Module: wine Branch: master Commit: d71bc1503b0d8786a595db19956afb846e5e1b7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d71bc1503b0d8786a595db199… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Aug 14 21:34:10 2017 +0800 shell32/tests: Add more tests for SHGetKnownFolderIDList. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shellpath.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 3292c54..9fea876 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -2781,9 +2781,33 @@ if (0) { /* crashes on native */ hr = pSHGetKnownFolderIDList(&FOLDERID_Desktop, 0, NULL, NULL); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + pidl = (void*)0xdeadbeef; hr = pSHGetKnownFolderIDList(&FOLDERID_Desktop, 0, NULL, &pidl); - ok(hr == S_OK, "got 0x%08x\n", hr); - CoTaskMemFree(pidl); + ok(hr == S_OK, "SHGetKnownFolderIDList failed: 0x%08x\n", hr); + ok(ILIsEmpty(pidl), "pidl should be empty.\n"); + ok(pidl->mkid.cb == 0, "get wrong value: %d\n", pidl->mkid.cb); + ILFree(pidl); + + pidl = (void*)0xdeadbeef; + hr = pSHGetKnownFolderIDList(&FOLDERID_Desktop, KF_FLAG_NO_ALIAS, NULL, &pidl); + ok(hr == S_OK, "SHGetKnownFolderIDList failed: 0x%08x\n", hr); + todo_wine ok(!ILIsEmpty(pidl), "pidl should not be empty.\n"); + todo_wine ok(pidl->mkid.cb == 20, "get wrong value: %d\n", pidl->mkid.cb); + ILFree(pidl); + + pidl = (void*)0xdeadbeef; + hr = pSHGetKnownFolderIDList(&FOLDERID_Documents, 0, NULL, &pidl); + ok(hr == S_OK, "SHGetKnownFolderIDList failed: 0x%08x\n", hr); + ok(!ILIsEmpty(pidl), "pidl should not be empty.\n"); + ok(pidl->mkid.cb == 20, "get wrong value: %d\n", pidl->mkid.cb); + ILFree(pidl); + + pidl = (void*)0xdeadbeef; + hr = pSHGetKnownFolderIDList(&FOLDERID_Documents, KF_FLAG_NO_ALIAS, NULL, &pidl); + ok(hr == S_OK, "SHGetKnownFolderIDList failed: 0x%08x\n", hr); + ok(!ILIsEmpty(pidl), "pidl should not be empty.\n"); + ok(pidl->mkid.cb == 20, "get wrong value: %d\n", pidl->mkid.cb); + ILFree(pidl); } START_TEST(shellpath)

1 0

Jactry Zeng : shell32: Implement SHCreateItemInKnownFolder.
by Alexandre Julliard 16 Aug '17

16 Aug '17

Module: wine Branch: master Commit: 5451c7d04febc0f3abc87911b4190998723110bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5451c7d04febc0f3abc87911b… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Aug 14 21:34:03 2017 +0800 shell32: Implement SHCreateItemInKnownFolder. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.spec | 1 + dlls/shell32/shellitem.c | 35 +++++++++++++ dlls/shell32/tests/shlfolder.c | 111 +++++++++++++++++++++++++++++++++++++++++ include/shobjidl.idl | 1 + 4 files changed, 148 insertions(+) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index e8bbf37..dd4accb 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -344,6 +344,7 @@ @ stdcall SHCreateDirectoryExW(long wstr ptr) @ stdcall SHCreateItemFromIDList(ptr ptr ptr) @ stdcall SHCreateItemFromParsingName(wstr ptr ptr ptr) +@ stdcall SHCreateItemInKnownFolder(ptr long wstr ptr ptr) @ stdcall SHCreateItemFromRelativeName(ptr wstr ptr ptr ptr) @ stub SHCreateProcessAsUserW @ stdcall SHCreateShellItem(ptr ptr ptr ptr) diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index cc607ec..8fc767e 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -711,6 +711,41 @@ HRESULT WINAPI SHCreateItemFromIDList(PCIDLIST_ABSOLUTE pidl, REFIID riid, void return ret; } +HRESULT WINAPI SHCreateItemInKnownFolder(REFKNOWNFOLDERID rfid, DWORD flags, + PCWSTR filename, REFIID riid, void **ppv) +{ + HRESULT hr; + IShellItem *parent = NULL; + LPITEMIDLIST pidl = NULL; + + TRACE("(%p, %x, %s, %s, %p)\n", rfid, flags, wine_dbgstr_w(filename), + debugstr_guid(riid), ppv); + + if(!rfid || !ppv) + return E_INVALIDARG; + + *ppv = NULL; + hr = SHGetKnownFolderIDList(rfid, flags, NULL, &pidl); + if(hr != S_OK) + return hr; + + hr = SHCreateItemFromIDList(pidl, &IID_IShellItem, (void**)&parent); + if(hr != S_OK) + { + ILFree(pidl); + return hr; + } + + if(filename) + hr = SHCreateItemFromRelativeName(parent, filename, NULL, riid, ppv); + else + hr = IShellItem_QueryInterface(parent, riid, ppv); + + ILFree(pidl); + IShellItem_Release(parent); + return hr; +} + HRESULT WINAPI SHGetItemFromDataObject(IDataObject *pdtobj, DATAOBJ_GET_ITEM_FLAGS dwFlags, REFIID riid, void **ppv) { diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 1b9956e..739e685 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -59,6 +59,7 @@ static BOOL (WINAPI *pILIsEqual)(LPCITEMIDLIST, LPCITEMIDLIST); static HRESULT (WINAPI *pSHCreateItemFromIDList)(PCIDLIST_ABSOLUTE pidl, REFIID riid, void **ppv); static HRESULT (WINAPI *pSHCreateItemFromParsingName)(PCWSTR,IBindCtx*,REFIID,void**); static HRESULT (WINAPI *pSHCreateItemFromRelativeName)(IShellItem*,PCWSTR,IBindCtx*,REFIID,void**); +static HRESULT (WINAPI *pSHCreateItemInKnownFolder)(REFKNOWNFOLDERID,DWORD,PCWSTR,REFIID,void **); static HRESULT (WINAPI *pSHCreateShellItem)(LPCITEMIDLIST,IShellFolder*,LPCITEMIDLIST,IShellItem**); static HRESULT (WINAPI *pSHCreateShellItemArray)(LPCITEMIDLIST,IShellFolder*,UINT,LPCITEMIDLIST*,IShellItemArray**); static HRESULT (WINAPI *pSHCreateShellItemArrayFromIDLists)(UINT, PCIDLIST_ABSOLUTE*, IShellItemArray**); @@ -118,6 +119,7 @@ static void init_function_pointers(void) MAKEFUNC(SHCreateItemFromIDList); MAKEFUNC(SHCreateItemFromParsingName); MAKEFUNC(SHCreateItemFromRelativeName); + MAKEFUNC(SHCreateItemInKnownFolder); MAKEFUNC(SHCreateShellItem); MAKEFUNC(SHCreateShellItemArray); MAKEFUNC(SHCreateShellItemArrayFromIDLists); @@ -2603,6 +2605,115 @@ static void test_SHCreateShellItem(void) else win_skip("No SHCreateItemFromRelativeName or SHGetKnownFolderPath\n"); + /* SHCreateItemInKnownFolder */ + if(pSHCreateItemInKnownFolder && pSHGetKnownFolderPath) + { + WCHAR *desktop_path; + WCHAR testfile_path[MAX_PATH] = {0}; + HANDLE file; + WCHAR *displayname = NULL; + int order; + LPITEMIDLIST pidl_desktop_testfile = NULL; + + shellitem = (void*)0xdeadbeef; + ret = pSHCreateItemInKnownFolder(&FOLDERID_Desktop, 0, NULL, &IID_IShellItem, + (void**)&shellitem); + ok(ret == S_OK, "SHCreateItemInKnownFolder failed: 0x%08x.\n", ret); + ok(shellitem != NULL, "shellitem was %p.\n", shellitem); + if(SUCCEEDED(ret)) + { + shellitem2 = (void*)0xdeadbeef; + ret = pSHCreateShellItem(NULL, NULL, pidl_desktop, &shellitem2); + ok(SUCCEEDED(ret), "SHCreateShellItem returned %x\n", ret); + if(SUCCEEDED(ret)) + { + ret = IShellItem_Compare(shellitem, shellitem2, 0, &order); + ok(ret == S_OK, "IShellItem_Compare failed: 0x%08x.\n", ret); + ok(!order, "order got wrong value: %d.\n", order); + IShellItem_Release(shellitem2); + } + IShellItem_Release(shellitem); + } + + /* Test with a non-existent file */ + shellitem = (void*)0xdeadbeef; + ret = pSHCreateItemInKnownFolder(&FOLDERID_Desktop, 0, testfileW, &IID_IShellItem, + (void**)&shellitem); + ok(ret == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), + "Expected 0x%08x but SHCreateItemInKnownFolder return: 0x%08x.\n", + HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), ret); + ok(shellitem == NULL, "shellitem was %p.\n", shellitem); + + pSHGetKnownFolderPath(&FOLDERID_Desktop, 0, NULL, &desktop_path); + lstrcatW(testfile_path, desktop_path); + myPathAddBackslashW(testfile_path); + lstrcatW(testfile_path, testfileW); + file = CreateFileW(testfile_path, GENERIC_WRITE, 0, NULL, CREATE_NEW, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFileW failed! Last error: 0x%08x.\n", GetLastError()); + CloseHandle(file); + + shellitem = (void*)0xdeadbeef; + ret = pSHCreateItemInKnownFolder(&FOLDERID_Desktop, 0, testfileW, &IID_IShellItem, + (void**)&shellitem); + ok(ret == S_OK, "SHCreateItemInKnownFolder failed: 0x%08x.\n", ret); + ok(shellitem != NULL, "shellitem was %p.\n", shellitem); + if(SUCCEEDED(ret)) + { + ret = IShellItem_GetDisplayName(shellitem, 0, &displayname); + ok(ret == S_OK, "IShellItem_GetDisplayName failed: 0x%08x.\n", ret); + ok(!lstrcmpW(displayname, testfileW), "got wrong display name: %s.\n", + wine_dbgstr_w(displayname)); + CoTaskMemFree(displayname); + + shellitem2 = (void*)0xdeadbeef; + ret = pSHCreateItemInKnownFolder(&FOLDERID_Desktop, 0, testfileW, &IID_IShellItem, + (void**)&shellitem2); + ok(ret == S_OK, "SHCreateItemInKnownFolder failed: 0x%08x.\n", ret); + ok(shellitem2 != NULL, "shellitem was %p.\n", shellitem); + ret = IShellItem_Compare(shellitem, shellitem2, 0, &order); + ok(ret == S_OK, "IShellItem_Compare failed: 0x%08x.\n", ret); + ok(!order, "order got wrong value: %d.\n", order); + IShellItem_Release(shellitem2); + + shellitem2 = (void*)0xdeadbeef; + ret = IShellFolder_ParseDisplayName(desktopfolder, NULL, NULL, testfileW, NULL, + &pidl_desktop_testfile, NULL); + ok(SUCCEEDED(ret), "ParseDisplayName returned %x.\n", ret); + ret = pSHCreateItemFromIDList(pidl_desktop_testfile, &IID_IShellItem, (void**)&shellitem2); + ret = IShellItem_Compare(shellitem, shellitem2, 0, &order); + ok(ret == S_OK, "IShellItem_Compare failed: 0x%08x.\n", ret); + ok(!order, "order got wrong value: %d.\n", order); + pILFree(pidl_desktop_testfile); + IShellItem_Release(shellitem2); + + IShellItem_Release(shellitem); + } + + shellitem = (void*)0xdeadbeef; + ret = pSHCreateItemInKnownFolder(&FOLDERID_Documents, 0, NULL, &IID_IShellItem, + (void**)&shellitem); + ok(ret == S_OK, "SHCreateItemInKnownFolder failed: 0x%08x.\n", ret); + ok(shellitem != NULL, "shellitem was %p.\n", shellitem); + if(SUCCEEDED(ret)) + { + shellitem2 = (void*)0xdeadbeef; + ret = pSHCreateItemInKnownFolder(&FOLDERID_Documents, 0, NULL, &IID_IShellItem, + (void**)&shellitem2); + ok(ret == S_OK, "SHCreateItemInKnownFolder failed: 0x%08x.\n", ret); + ok(shellitem2 != NULL, "shellitem was %p.\n", shellitem); + ret = IShellItem_Compare(shellitem, shellitem2, 0, &order); + ok(ret == S_OK, "IShellItem_Compare failed: 0x%08x.\n", ret); + ok(!order, "order got wrong value: %d.\n", order); + IShellItem_Release(shellitem2); + + IShellItem_Release(shellitem); + } + DeleteFileW(testfile_path); + CoTaskMemFree(desktop_path); + } + else + win_skip("No SHCreateItemInKnownFolder or SHGetKnownFolderPath\n"); + DeleteFileA(".\\testfile"); pILFree(pidl_abstestfile); pILFree(pidl_testfile); diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 83fcbce..f1b85a8 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -608,6 +608,7 @@ cpp_quote("HRESULT WINAPI SHGetItemFromObject(IUnknown *punk, REFIID riid, void cpp_quote("HRESULT WINAPI SHCreateShellItemArray(PCIDLIST_ABSOLUTE pidlParent, IShellFolder* psf, UINT cidl, PCUITEMID_CHILD_ARRAY ppidl, IShellItemArray **ppsiItemArray);") cpp_quote("HRESULT WINAPI SHCreateShellItemArrayFromShellItem(IShellItem *psi, REFIID riid, void **ppv);") cpp_quote("HRESULT WINAPI SHCreateShellItemArrayFromIDLists(UINT cidl, PCIDLIST_ABSOLUTE_ARRAY pidl_array, IShellItemArray **psia);") +cpp_quote("HRESULT WINAPI SHCreateItemInKnownFolder(REFKNOWNFOLDERID rfid, DWORD flags, PCWSTR filename, REFIID riid, void **ppv);") cpp_quote("HRESULT WINAPI SHCreateShellItemArrayFromDataObject(IDataObject *pdo, REFIID riid, void **ppv);") /*****************************************************************************

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
36
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2017