November 2016 - Wine-commits

Huw Davies : rpcrt4/tests: Register the proxies to fix a crash on Windows 8 and 10.
by Alexandre Julliard 03 Nov '16

03 Nov '16

Module: wine Branch: master Commit: eb3ceac1ddc07feaf8f38427f93f82a4356f8760 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb3ceac1ddc07feaf8f38427f… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Nov 3 17:49:22 2016 +0000 rpcrt4/tests: Register the proxies to fix a crash on Windows 8 and 10. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/cstub.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/rpcrt4/tests/cstub.c b/dlls/rpcrt4/tests/cstub.c index 7c71d60..606107f 100644 --- a/dlls/rpcrt4/tests/cstub.c +++ b/dlls/rpcrt4/tests/cstub.c @@ -627,6 +627,19 @@ static IPSFactoryBuffer *test_NdrDllGetClassObject(void) ok(r == S_OK, "ret %08x\n", r); ok(ppsf != NULL, "ppsf == NULL\n"); + /* Because this PS factory is not loaded as a dll in the normal way, Windows 8 / 10 + get confused and will crash when one of the proxies for the delegated ifaces is created. + Registering the ifaces fixes this (in fact calling CoRegisterPSClsid() with any IID / CLSID is enough). */ + + r = CoRegisterPSClsid(&IID_if1, &CLSID_psfact); + ok(r == S_OK, "ret %08x\n", r); + r = CoRegisterPSClsid(&IID_if2, &CLSID_psfact); + ok(r == S_OK, "ret %08x\n", r); + r = CoRegisterPSClsid(&IID_if3, &CLSID_psfact); + ok(r == S_OK, "ret %08x\n", r); + r = CoRegisterPSClsid(&IID_if4, &CLSID_psfact); + ok(r == S_OK, "ret %08x\n", r); + return ppsf; }

1 0

Józef Kucia : wined3d: Compute "buffer_type_hint" from buffer bind flags.
by Alexandre Julliard 02 Nov '16

02 Nov '16

Module: wine Branch: master Commit: e3c692151f9199d7e37b2c788daa629d0c2c1b3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3c692151f9199d7e37b2c788… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 2 10:55:32 2016 +0100 wined3d: Compute "buffer_type_hint" from buffer bind flags. 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/buffer.c | 31 +++++++++++++++++++++++-------- include/wine/wined3d.h | 9 +++++++++ 2 files changed, 32 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 13953c9..c9493c7 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1410,14 +1410,28 @@ static const struct wined3d_resource_ops buffer_resource_ops = buffer_resource_sub_resource_unmap, }; +static GLenum buffer_type_hint_from_bind_flags(unsigned int bind_flags) +{ + if (bind_flags == WINED3D_BIND_INDEX_BUFFER) + return GL_ELEMENT_ARRAY_BUFFER; + + if (bind_flags & WINED3D_BIND_CONSTANT_BUFFER) + return GL_UNIFORM_BUFFER; + + if (bind_flags & ~(WINED3D_BIND_VERTEX_BUFFER | WINED3D_BIND_INDEX_BUFFER)) + FIXME("Unhandled bind flags %#x.\n", bind_flags); + + return GL_ARRAY_BUFFER; +} + static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device *device, - UINT size, DWORD usage, enum wined3d_format_id format_id, enum wined3d_pool pool, GLenum bind_hint, + UINT size, DWORD usage, enum wined3d_format_id format_id, enum wined3d_pool pool, unsigned int bind_flags, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops) { const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; const struct wined3d_format *format = wined3d_get_format(gl_info, format_id); - HRESULT hr; BOOL dynamic_buffer_ok; + HRESULT hr; if (!size) { @@ -1438,11 +1452,12 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device WARN("Failed to initialize resource, hr %#x.\n", hr); return hr; } - buffer->buffer_type_hint = bind_hint; + buffer->buffer_type_hint = buffer_type_hint_from_bind_flags(bind_flags); buffer->locations = WINED3D_LOCATION_SYSMEM; - TRACE("size %#x, usage %#x, format %s, memory @ %p, iface @ %p.\n", buffer->resource.size, buffer->resource.usage, - debug_d3dformat(buffer->resource.format->id), buffer->resource.heap_memory, buffer); + 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); if (device->create_parms.flags & WINED3DCREATE_SOFTWARE_VERTEXPROCESSING || pool == WINED3D_POOL_MANAGED) { @@ -1509,7 +1524,7 @@ HRESULT CDECL wined3d_buffer_create(struct wined3d_device *device, const struct FIXME("Ignoring access flags (pool).\n"); hr = buffer_init(object, device, desc->byte_width, desc->usage, WINED3DFMT_UNKNOWN, - WINED3D_POOL_MANAGED, GL_ARRAY_BUFFER_ARB, data, parent, parent_ops); + WINED3D_POOL_MANAGED, desc->bind_flags, data, parent, parent_ops); if (FAILED(hr)) { WARN("Failed to initialize buffer, hr %#x.\n", hr); @@ -1551,7 +1566,7 @@ HRESULT CDECL wined3d_buffer_create_vb(struct wined3d_device *device, UINT size, } hr = buffer_init(object, device, size, usage, WINED3DFMT_VERTEXDATA, - pool, GL_ARRAY_BUFFER_ARB, NULL, parent, parent_ops); + pool, WINED3D_BIND_VERTEX_BUFFER, NULL, parent, parent_ops); if (FAILED(hr)) { WARN("Failed to initialize buffer, hr %#x.\n", hr); @@ -1582,7 +1597,7 @@ HRESULT CDECL wined3d_buffer_create_ib(struct wined3d_device *device, UINT size, } hr = buffer_init(object, device, size, usage | WINED3DUSAGE_STATICDECL, - WINED3DFMT_UNKNOWN, pool, GL_ELEMENT_ARRAY_BUFFER_ARB, NULL, + WINED3DFMT_UNKNOWN, pool, WINED3D_BIND_INDEX_BUFFER, NULL, parent, parent_ops); if (FAILED(hr)) { diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index e42ef77..9d234d6 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -834,6 +834,15 @@ enum wined3d_display_rotation #define WINED3DDP_MAXTEXCOORD 8 +#define WINED3D_BIND_VERTEX_BUFFER 0x00000001 +#define WINED3D_BIND_INDEX_BUFFER 0x00000002 +#define WINED3D_BIND_CONSTANT_BUFFER 0x00000004 +#define WINED3D_BIND_SHADER_RESOURCE 0x00000008 +#define WINED3D_BIND_STREAM_OUTPUT 0x00000010 +#define WINED3D_BIND_RENDER_TARGET 0x00000020 +#define WINED3D_BIND_DEPTH_STENCIL 0x00000040 +#define WINED3D_BIND_UNORDERED_ACCESS 0x00000080 + #define WINED3DUSAGE_RENDERTARGET 0x00000001 #define WINED3DUSAGE_DEPTHSTENCIL 0x00000002 #define WINED3DUSAGE_WRITEONLY 0x00000008

1 0

Józef Kucia : wined3d: Invalidate device state based on buffer bind flags when buffer is deleted.
by Alexandre Julliard 02 Nov '16

02 Nov '16

Module: wine Branch: master Commit: cc35b6c8b3896a2020dc45db3aab61673f7c7268 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc35b6c8b3896a2020dc45db3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 2 10:55:33 2016 +0100 wined3d: Invalidate device state based on buffer bind flags when buffer is deleted. 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/buffer.c | 32 +++++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index c9493c7..70c718c 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -141,12 +141,27 @@ static void buffer_bind(struct wined3d_buffer *buffer, struct wined3d_context *c /* Context activation is done by the caller */ static void delete_gl_buffer(struct wined3d_buffer *This, const struct wined3d_gl_info *gl_info) { + struct wined3d_resource *resource = &This->resource; + if(!This->buffer_object) return; GL_EXTCALL(glDeleteBuffers(1, &This->buffer_object)); checkGLcall("glDeleteBuffers"); This->buffer_object = 0; + /* The stream source state handler might have read the memory of the + * vertex buffer already and got the memory in the vbo which is not + * valid any longer. Dirtify the stream source to force a reload. This + * happens only once per changed vertexbuffer and should occur rather + * rarely. */ + if (resource->bind_count) + { + if (This->bind_flags & WINED3D_BIND_VERTEX_BUFFER) + device_invalidate_state(resource->device, STATE_STREAMSRC); + if (This->bind_flags & WINED3D_BIND_INDEX_BUFFER) + device_invalidate_state(resource->device, STATE_INDEXBUFFER); + } + if(This->query) { wined3d_event_query_destroy(This->query); @@ -637,10 +652,9 @@ static void buffer_unload(struct wined3d_resource *resource) if (buffer->buffer_object) { - struct wined3d_device *device = resource->device; struct wined3d_context *context; - context = context_acquire(device, NULL); + context = context_acquire(resource->device, NULL); /* Download the buffer, but don't permanently enable double buffering. */ wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM); @@ -658,19 +672,6 @@ static void buffer_unload(struct wined3d_resource *resource) buffer->stride = 0; buffer->conversion_stride = 0; buffer->flags &= ~WINED3D_BUFFER_HASDESC; - - /* The stream source state handler might have read the memory of the - * vertex buffer already and got the memory in the vbo which is not - * valid any longer. Dirtify the stream source to force a reload. This - * happens only once per changed vertexbuffer and should occur rather - * rarely. */ - if (resource->bind_count) - { - device_invalidate_state(device, STATE_STREAMSRC); - - if (buffer->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER) - device_invalidate_state(device, STATE_INDEXBUFFER); - } } resource_unload(resource); @@ -1453,6 +1454,7 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device return hr; } buffer->buffer_type_hint = buffer_type_hint_from_bind_flags(bind_flags); + buffer->bind_flags = bind_flags; buffer->locations = WINED3D_LOCATION_SYSMEM; TRACE("buffer %p, size %#x, usage %#x, format %s, memory @ %p.\n", diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c56558d..19b650e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3158,6 +3158,7 @@ struct wined3d_buffer GLuint buffer_object; GLenum buffer_object_usage; GLenum buffer_type_hint; + unsigned int bind_flags; DWORD flags; void *map_ptr;

1 0

Józef Kucia : wined3d: Pass context to delete_gl_buffer().
by Alexandre Julliard 02 Nov '16

02 Nov '16

Module: wine Branch: master Commit: 20eb55fdefa9f0b7a0864dce3b4a12b132dba651 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20eb55fdefa9f0b7a0864dce3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 2 10:55:34 2016 +0100 wined3d: Pass context to delete_gl_buffer(). 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/buffer.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 70c718c..179f66c 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -138,9 +138,10 @@ static void buffer_bind(struct wined3d_buffer *buffer, struct wined3d_context *c GL_EXTCALL(glBindBuffer(buffer->buffer_type_hint, buffer->buffer_object)); } -/* Context activation is done by the caller */ -static void delete_gl_buffer(struct wined3d_buffer *This, const struct wined3d_gl_info *gl_info) +/* Context activation is done by the caller. */ +static void delete_gl_buffer(struct wined3d_buffer *This, const struct wined3d_context *context) { + const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_resource *resource = &This->resource; if(!This->buffer_object) return; @@ -256,7 +257,7 @@ fail: /* Clean up all BO init, but continue because we can work without a BO :-) */ ERR("Failed to create a buffer object. Continuing, but performance issues may occur.\n"); buffer->flags &= ~WINED3D_BUFFER_USE_BO; - delete_gl_buffer(buffer, gl_info); + delete_gl_buffer(buffer, context); buffer_clear_dirty_areas(buffer); return FALSE; } @@ -662,7 +663,7 @@ static void buffer_unload(struct wined3d_resource *resource) buffer->flags &= ~WINED3D_BUFFER_DOUBLEBUFFER; wined3d_buffer_invalidate_location(buffer, WINED3D_LOCATION_BUFFER); - delete_gl_buffer(buffer, context->gl_info); + delete_gl_buffer(buffer, context); buffer_clear_dirty_areas(buffer); context_release(context); @@ -691,7 +692,7 @@ static void wined3d_buffer_destroy_object(void *object) if (buffer->buffer_object) { context = context_acquire(buffer->resource.device, NULL); - delete_gl_buffer(buffer, context->gl_info); + delete_gl_buffer(buffer, context); context_release(context); HeapFree(GetProcessHeap(), 0, buffer->conversion_map);

1 0

Józef Kucia : wined3d: Fix style issues in delete_gl_buffer().
by Alexandre Julliard 02 Nov '16

02 Nov '16

Module: wine Branch: master Commit: 01b8bea329a34d946aa2efbeabae9ad00a5e9868 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01b8bea329a34d946aa2efbea… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 2 10:55:35 2016 +0100 wined3d: Fix style issues in delete_gl_buffer(). 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/buffer.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 179f66c..d2b54be 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -139,16 +139,17 @@ static void buffer_bind(struct wined3d_buffer *buffer, struct wined3d_context *c } /* Context activation is done by the caller. */ -static void delete_gl_buffer(struct wined3d_buffer *This, const struct wined3d_context *context) +static void buffer_destroy_buffer_object(struct wined3d_buffer *buffer, const struct wined3d_context *context) { const struct wined3d_gl_info *gl_info = context->gl_info; - struct wined3d_resource *resource = &This->resource; + struct wined3d_resource *resource = &buffer->resource; - if(!This->buffer_object) return; + if (!buffer->buffer_object) + return; - GL_EXTCALL(glDeleteBuffers(1, &This->buffer_object)); + GL_EXTCALL(glDeleteBuffers(1, &buffer->buffer_object)); checkGLcall("glDeleteBuffers"); - This->buffer_object = 0; + buffer->buffer_object = 0; /* The stream source state handler might have read the memory of the * vertex buffer already and got the memory in the vbo which is not @@ -157,18 +158,18 @@ static void delete_gl_buffer(struct wined3d_buffer *This, const struct wined3d_c * rarely. */ if (resource->bind_count) { - if (This->bind_flags & WINED3D_BIND_VERTEX_BUFFER) + if (buffer->bind_flags & WINED3D_BIND_VERTEX_BUFFER) device_invalidate_state(resource->device, STATE_STREAMSRC); - if (This->bind_flags & WINED3D_BIND_INDEX_BUFFER) + if (buffer->bind_flags & WINED3D_BIND_INDEX_BUFFER) device_invalidate_state(resource->device, STATE_INDEXBUFFER); } - if(This->query) + if (buffer->query) { - wined3d_event_query_destroy(This->query); - This->query = NULL; + wined3d_event_query_destroy(buffer->query); + buffer->query = NULL; } - This->flags &= ~WINED3D_BUFFER_APPLESYNC; + buffer->flags &= ~WINED3D_BUFFER_APPLESYNC; } /* Context activation is done by the caller. */ @@ -257,7 +258,7 @@ fail: /* Clean up all BO init, but continue because we can work without a BO :-) */ ERR("Failed to create a buffer object. Continuing, but performance issues may occur.\n"); buffer->flags &= ~WINED3D_BUFFER_USE_BO; - delete_gl_buffer(buffer, context); + buffer_destroy_buffer_object(buffer, context); buffer_clear_dirty_areas(buffer); return FALSE; } @@ -663,7 +664,7 @@ static void buffer_unload(struct wined3d_resource *resource) buffer->flags &= ~WINED3D_BUFFER_DOUBLEBUFFER; wined3d_buffer_invalidate_location(buffer, WINED3D_LOCATION_BUFFER); - delete_gl_buffer(buffer, context); + buffer_destroy_buffer_object(buffer, context); buffer_clear_dirty_areas(buffer); context_release(context); @@ -692,7 +693,7 @@ static void wined3d_buffer_destroy_object(void *object) if (buffer->buffer_object) { context = context_acquire(buffer->resource.device, NULL); - delete_gl_buffer(buffer, context); + buffer_destroy_buffer_object(buffer, context); context_release(context); HeapFree(GetProcessHeap(), 0, buffer->conversion_map);

1 0

Józef Kucia : wined3d: Invalidate STATE_CONSTANT_BUFFER(*) device state in buffer_destroy_buffer_object() when needed.
by Alexandre Julliard 02 Nov '16

02 Nov '16

Module: wine Branch: master Commit: de19ba7c23b3fd3c80ce7221bdb3ce138b3d4400 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de19ba7c23b3fd3c80ce7221b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 2 10:55:36 2016 +0100 wined3d: Invalidate STATE_CONSTANT_BUFFER(*) device state in buffer_destroy_buffer_object() when needed. 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/buffer.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index d2b54be..72c45ee 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -162,6 +162,15 @@ static void buffer_destroy_buffer_object(struct wined3d_buffer *buffer, const st device_invalidate_state(resource->device, STATE_STREAMSRC); if (buffer->bind_flags & WINED3D_BIND_INDEX_BUFFER) device_invalidate_state(resource->device, STATE_INDEXBUFFER); + if (buffer->bind_flags & WINED3D_BIND_CONSTANT_BUFFER) + { + device_invalidate_state(resource->device, STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_VERTEX)); + device_invalidate_state(resource->device, STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_HULL)); + device_invalidate_state(resource->device, STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_DOMAIN)); + device_invalidate_state(resource->device, STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_GEOMETRY)); + device_invalidate_state(resource->device, STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_PIXEL)); + device_invalidate_state(resource->device, STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_COMPUTE)); + } } if (buffer->query)

1 0

Józef Kucia : wined3d: Use wined3d_vec4 in fixup_transformed_pos().
by Alexandre Julliard 02 Nov '16

02 Nov '16

Module: wine Branch: master Commit: 07cfeac3dd7ca41d9d9fde3a490425451c4b26b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07cfeac3dd7ca41d9d9fde3a4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 2 10:55:37 2016 +0100 wined3d: Use wined3d_vec4 in fixup_transformed_pos(). 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/buffer.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 72c45ee..25c1853 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -509,19 +509,19 @@ static inline unsigned int fixup_d3dcolor(DWORD *dst_color) return sizeof(*dst_color); } -static inline unsigned int fixup_transformed_pos(float *p) +static inline unsigned int fixup_transformed_pos(struct wined3d_vec4 *p) { /* rhw conversion like in position_float4(). */ - if (p[3] != 1.0f && p[3] != 0.0f) + if (p->w != 1.0f && p->w != 0.0f) { - float w = 1.0f / p[3]; - p[0] *= w; - p[1] *= w; - p[2] *= w; - p[3] = w; + float w = 1.0f / p->w; + p->x *= w; + p->y *= w; + p->z *= w; + p->w = w; } - return 4 * sizeof(*p); + return sizeof(*p); } ULONG CDECL wined3d_buffer_incref(struct wined3d_buffer *buffer) @@ -909,7 +909,7 @@ static void buffer_conversion_upload(struct wined3d_buffer *buffer, struct wined j += fixup_d3dcolor((DWORD *) (data + i * buffer->stride + j)); break; case CONV_POSITIONT: - j += fixup_transformed_pos((float *) (data + i * buffer->stride + j)); + j += fixup_transformed_pos((struct wined3d_vec4 *) (data + i * buffer->stride + j)); break; default: FIXME("Unimplemented conversion %d in shifted conversion.\n", buffer->conversion_map[j]);

1 0

Aric Stewart : winebus.sys: Implement IOCTL_HID_GET(SET) _FEATURE for hidraw.
by Alexandre Julliard 02 Nov '16

02 Nov '16

Module: wine Branch: master Commit: 72dd8bafccc7ca26e89acccf1915eb175e53e6f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72dd8bafccc7ca26e89acccf1… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Nov 2 08:12:24 2016 -0500 winebus.sys: Implement IOCTL_HID_GET(SET)_FEATURE for hidraw. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus.h | 2 ++ dlls/winebus.sys/bus_udev.c | 48 +++++++++++++++++++++++++++++++++++++++++++++ dlls/winebus.sys/main.c | 19 ++++++++++++++++++ 3 files changed, 69 insertions(+) diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h index 18bebcf..45a65e2 100644 --- a/dlls/winebus.sys/bus.h +++ b/dlls/winebus.sys/bus.h @@ -27,6 +27,8 @@ typedef struct NTSTATUS (*get_string)(DEVICE_OBJECT *device, DWORD index, WCHAR *buffer, DWORD length); NTSTATUS (*begin_report_processing)(DEVICE_OBJECT *device); NTSTATUS (*set_output_report)(DEVICE_OBJECT *device, UCHAR id, BYTE *report, DWORD length, ULONG_PTR *written); + NTSTATUS (*get_feature_report)(DEVICE_OBJECT *device, UCHAR id, BYTE *report, DWORD length, ULONG_PTR *read); + NTSTATUS (*set_feature_report)(DEVICE_OBJECT *device, UCHAR id, BYTE *report, DWORD length, ULONG_PTR *written); } platform_vtbl; void *get_platform_private(DEVICE_OBJECT *device) DECLSPEC_HIDDEN; diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index be8e93f..6cfbdb8 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -301,6 +301,52 @@ static NTSTATUS hidraw_set_output_report(DEVICE_OBJECT *device, UCHAR id, BYTE * } } +static NTSTATUS hidraw_get_feature_report(DEVICE_OBJECT *device, UCHAR id, BYTE *report, DWORD length, ULONG_PTR *read) +{ +#ifdef HAVE_LINUX_HIDRAW_H + int rc; + struct platform_private* ext = impl_from_DEVICE_OBJECT(device); + length = min(length, 0x1fff); + rc = ioctl(ext->device_fd, HIDIOCGFEATURE(length), report); + if (rc >= 0) + { + *read = rc; + return STATUS_SUCCESS; + } + else + { + *read = 0; + return STATUS_UNSUCCESSFUL; + } +#else + *read = 0; + return STATUS_NOT_IMPLEMENTED; +#endif +} + +static NTSTATUS hidraw_set_feature_report(DEVICE_OBJECT *device, UCHAR id, BYTE *report, DWORD length, ULONG_PTR *written) +{ +#ifdef HAVE_LINUX_HIDRAW_H + int rc; + struct platform_private* ext = impl_from_DEVICE_OBJECT(device); + length = min(length, 0x1fff); + rc = ioctl(ext->device_fd, HIDIOCSFEATURE(length), report); + if (rc >= 0) + { + *written = rc; + return STATUS_SUCCESS; + } + else + { + *written = 0; + return STATUS_UNSUCCESSFUL; + } +#else + *written = 0; + return STATUS_NOT_IMPLEMENTED; +#endif +} + static const platform_vtbl hidraw_vtbl = { compare_platform_device, @@ -308,6 +354,8 @@ static const platform_vtbl hidraw_vtbl = hidraw_get_string, begin_report_processing, hidraw_set_output_report, + hidraw_get_feature_report, + hidraw_set_feature_report, }; static void try_add_device(struct udev_device *dev) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 802122f..791ccbb 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -541,6 +541,25 @@ NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) packet->reportBufferLen, &irp->IoStatus.Information); break; } + case IOCTL_HID_GET_FEATURE: + { + HID_XFER_PACKET *packet = (HID_XFER_PACKET*)(irp->UserBuffer); + TRACE_(hid_report)("IOCTL_HID_GET_FEATURE\n"); + irp->IoStatus.u.Status = status = ext->vtbl->get_feature_report( + device, packet->reportId, packet->reportBuffer, + packet->reportBufferLen, &irp->IoStatus.Information); + packet->reportBufferLen = irp->IoStatus.Information; + break; + } + case IOCTL_HID_SET_FEATURE: + { + HID_XFER_PACKET *packet = (HID_XFER_PACKET*)(irp->UserBuffer); + TRACE_(hid_report)("IOCTL_HID_SET_FEATURE\n"); + irp->IoStatus.u.Status = status = ext->vtbl->set_feature_report( + device, packet->reportId, packet->reportBuffer, + packet->reportBufferLen, &irp->IoStatus.Information); + break; + } default: { ULONG code = irpsp->Parameters.DeviceIoControl.IoControlCode;

1 0

Detlef Riekenberg : winspool: Return a failure code in ClosePrinter.
by Alexandre Julliard 02 Nov '16

02 Nov '16

Module: wine Branch: master Commit: b611acc7369f4a260ec7d4b260b221524f04d440 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b611acc7369f4a260ec7d4b26… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Nov 1 23:21:41 2016 +0100 winspool: Return a failure code in ClosePrinter. Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/info.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 2f0ff3d..2b2e0fc 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -3315,7 +3315,6 @@ BOOL WINAPI ClosePrinter(HANDLE hPrinter) { UINT_PTR i = (UINT_PTR)hPrinter; opened_printer_t *printer = NULL; - BOOL ret = FALSE; TRACE("(%p)\n", hPrinter); @@ -3331,10 +3330,6 @@ BOOL WINAPI ClosePrinter(HANDLE hPrinter) TRACE("closing %s (doc: %p)\n", debugstr_w(printer->name), printer->doc); - if (printer->backend_printer) { - backend->fpClosePrinter(printer->backend_printer); - } - if(printer->doc) EndDocPrinter(hPrinter); @@ -3348,12 +3343,19 @@ BOOL WINAPI ClosePrinter(HANDLE hPrinter) HeapFree(GetProcessHeap(), 0, printer->queue); } + if (printer->backend_printer) { + backend->fpClosePrinter(printer->backend_printer); + } + free_printer_entry( printer ); printer_handles[i - 1] = NULL; - ret = TRUE; + LeaveCriticalSection(&printer_handles_cs); + return TRUE; } + LeaveCriticalSection(&printer_handles_cs); - return ret; + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; } /*****************************************************************************

1 0

Detlef Riekenberg : winspool/tests: Add tests for ClosePrinter.
by Alexandre Julliard 02 Nov '16

02 Nov '16

Module: wine Branch: master Commit: 4814aad7fe89e78b54b765c19145a478b9c7a874 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4814aad7fe89e78b54b765c19… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Nov 1 23:21:42 2016 +0100 winspool/tests: Add tests for ClosePrinter. Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/tests/info.c | 49 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 47 insertions(+), 2 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index ffa31ed..f6527c5 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -672,6 +672,50 @@ static void test_ConfigurePort(void) /* ########################### */ +static void test_ClosePrinter(void) +{ + HANDLE printer = 0; + BOOL res; + + /* NULL is handled */ + SetLastError(0xdeadbeef); + res = ClosePrinter(NULL); + ok(!res && (GetLastError() == ERROR_INVALID_HANDLE), + "got %d with %d (expected FALSE with ERROR_INVALID_HANDLE)\n", + res, GetLastError()); + + /* A random value as HANDLE is handled */ + SetLastError(0xdeadbeef); + res = ClosePrinter( (void *) -1); + if (is_spooler_deactivated(res, GetLastError())) return; + ok(!res && (GetLastError() == ERROR_INVALID_HANDLE), + "got %d with %d (expected FALSE with ERROR_INVALID_HANDLE)\n", + res, GetLastError()); + + + /* Normal use (The Spooler service is needed) */ + SetLastError(0xdeadbeef); + res = OpenPrinterA(default_printer, &printer, NULL); + if (is_spooler_deactivated(res, GetLastError())) return; + if (res) + { + SetLastError(0xdeadbeef); + res = ClosePrinter(printer); + ok(res, "got %d with %d (expected TRUE)\n", res, GetLastError()); + + + /* double free is handled */ + SetLastError(0xdeadbeef); + res = ClosePrinter(printer); + ok(!res && (GetLastError() == ERROR_INVALID_HANDLE), + "got %d with %d (expected FALSE with ERROR_INVALID_HANDLE)\n", + res, GetLastError()); + + } +} + +/* ########################### */ + static void test_DeleteMonitor(void) { MONITOR_INFO_2A mi2a; @@ -3023,6 +3067,7 @@ START_TEST(info) test_AddPort(); test_AddPortEx(); test_ConfigurePort(); + test_ClosePrinter(); test_DeleteMonitor(); test_DeletePort(); test_DeviceCapabilities(); @@ -3037,7 +3082,9 @@ START_TEST(info) test_GetDefaultPrinter(); test_GetPrinterDriverDirectory(); test_GetPrintProcessorDirectory(); + test_IsValidDevmodeW(); test_OpenPrinter(); + test_OpenPrinter_defaults(); test_GetPrinter(); test_GetPrinterData(); test_GetPrinterDataEx(); @@ -3045,8 +3092,6 @@ START_TEST(info) test_SetDefaultPrinter(); test_XcvDataW_MonitorUI(); test_XcvDataW_PortIsValid(); - test_IsValidDevmodeW(); - test_OpenPrinter_defaults(); /* Cleanup our temporary file */ DeleteFileA(tempfileA);

1 0