February 2017 - Wine-Commits

Józef Kucia : d3d8: Get rid of WINECAPSTOD3D8CAPS() macro.
by Alexandre Julliard Feb. 21, 2017

Feb. 21, 2017

Module: wine Branch: master Commit: b9688afce54e0d9567f5976b65ca266b675fca16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9688afce54e0d9567f5976b6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 21 13:24:41 2017 +0100 d3d8: Get rid of WINECAPSTOD3D8CAPS() macro. 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/d3d8/d3d8_private.h | 60 +----------------------------------------------- dlls/d3d8/device.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/d3d8/directx.c | 2 +- 3 files changed, 60 insertions(+), 61 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b9688afce54e0d9567f59…

1 0

Józef Kucia : wined3d: Fix swizzle for ld_raw instruction.
by Alexandre Julliard Feb. 21, 2017

Feb. 21, 2017

Module: wine Branch: master Commit: 0593292700d971614476dc735a280ad0e60f62b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0593292700d971614476dc735… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 21 13:24:38 2017 +0100 wined3d: Fix swizzle for ld_raw instruction. 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/glsl_shader.c | 38 ++++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7bfd52f..ca70859 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2910,7 +2910,8 @@ static DWORD shader_glsl_get_write_mask(const struct wined3d_shader_dst_param *p return mask; } -static unsigned int shader_glsl_get_write_mask_size(DWORD write_mask) { +static unsigned int shader_glsl_get_write_mask_size(DWORD write_mask) +{ unsigned int size = 0; if (write_mask & WINED3DSP_WRITEMASK_0) ++size; @@ -2921,19 +2922,27 @@ static unsigned int shader_glsl_get_write_mask_size(DWORD write_mask) { return size; } -static void shader_glsl_swizzle_to_str(const DWORD swizzle, BOOL fixup, DWORD mask, char *str) +static unsigned int shader_glsl_swizzle_get_component(DWORD swizzle, + unsigned int component_idx) +{ + /* swizzle bits fields: wwzzyyxx */ + return (swizzle >> (2 * component_idx)) & 0x3; +} + +static void shader_glsl_swizzle_to_str(DWORD swizzle, BOOL fixup, DWORD mask, char *str) { /* For registers of type WINED3DDECLTYPE_D3DCOLOR, data is stored as "bgra", * but addressed as "rgba". To fix this we need to swap the register's x * and z components. */ const char *swizzle_chars = fixup ? "zyxw" : "xyzw"; + unsigned int i; *str++ = '.'; - /* swizzle bits fields: wwzzyyxx */ - if (mask & WINED3DSP_WRITEMASK_0) *str++ = swizzle_chars[swizzle & 0x03]; - if (mask & WINED3DSP_WRITEMASK_1) *str++ = swizzle_chars[(swizzle >> 2) & 0x03]; - if (mask & WINED3DSP_WRITEMASK_2) *str++ = swizzle_chars[(swizzle >> 4) & 0x03]; - if (mask & WINED3DSP_WRITEMASK_3) *str++ = swizzle_chars[(swizzle >> 6) & 0x03]; + for (i = 0; i < 4; ++i) + { + if (mask & (WINED3DSP_WRITEMASK_0 << i)) + *str++ = swizzle_chars[shader_glsl_swizzle_get_component(swizzle, i)]; + } *str = '\0'; } @@ -4142,7 +4151,7 @@ static void shader_glsl_conditional_move(const struct wined3d_shader_instruction /* Find the destination channels which use the current source0 channel. */ for (j = 0; j < 4; ++j) { - if (((ins->src[0].swizzle >> (2 * j)) & 0x3) == i) + if (shader_glsl_swizzle_get_component(ins->src[0].swizzle, j) == i) { write_mask |= WINED3DSP_WRITEMASK_0 << j; cmp_channel = WINED3DSP_WRITEMASK_0 << j; @@ -5033,9 +5042,7 @@ static void shader_glsl_ld_raw(const struct wined3d_shader_instruction *ins) struct wined3d_shader_dst_param dst; const char *function, *resource; struct glsl_src_param offset; - char dst_swizzle[6]; - DWORD write_mask; - unsigned int i; + unsigned int i, swizzle; if (src->reg.type == WINED3DSPR_RESOURCE) { @@ -5054,13 +5061,12 @@ static void shader_glsl_ld_raw(const struct wined3d_shader_instruction *ins) for (i = 0; i < 4; ++i) { dst.write_mask = ins->dst[0].write_mask & (WINED3DSP_WRITEMASK_0 << i); - if (!(write_mask = shader_glsl_append_dst_ext(ins->ctx->buffer, ins, - &dst, dst.reg.data_type))) + if (!shader_glsl_append_dst_ext(ins->ctx->buffer, ins, &dst, dst.reg.data_type)) continue; - shader_glsl_swizzle_to_str(src->swizzle, FALSE, write_mask, dst_swizzle); - shader_addline(buffer, "%s(%s_%s%u, %s / 4)%s);\n", - function, prefix, resource, src->reg.idx[0].offset, offset.param_str, dst_swizzle); + swizzle = shader_glsl_swizzle_get_component(src->swizzle, i); + shader_addline(buffer, "%s(%s_%s%u, %s / 4 + %u).x);\n", + function, prefix, resource, src->reg.idx[0].offset, offset.param_str, swizzle); } }

1 0

Stefan Dösinger : d3d9/tests: Work around a r500 Windows point sprite bug.
by Alexandre Julliard Feb. 21, 2017

Feb. 21, 2017

Module: wine Branch: master Commit: a5abe2c53af5a155d89f253c3c44d9283858ad57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5abe2c53af5a155d89f253c3… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Mon Feb 20 22:31:03 2017 +0000 d3d9/tests: Work around a r500 Windows point sprite bug. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 4de3beb..72005ff 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -10641,6 +10641,17 @@ static void test_pointsize(void) goto done; } + /* The r500 Windows driver needs a draw with regular texture coordinates at least once during the + * device's lifetime, otherwise texture coordinate generation only works for texture 0. */ + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1); + ok(SUCCEEDED(hr), "Failed to set FVF, hr=%#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_POINTLIST, 1, vertices, sizeof(float) * 5); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff0000ff, 1.0f, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed, hr=%08x\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE);

1 0

Józef Kucia : d3d8: Merge fixup_caps() into d3dcaps_from_wined3dcaps().
by Alexandre Julliard Feb. 21, 2017

Feb. 21, 2017

Module: wine Branch: master Commit: 377c2eebbfc750d67c687c1d81911200b92c004d URL: http://source.winehq.org/git/wine.git/?a=commit;h=377c2eebbfc750d67c687c1d8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 21 13:24:42 2017 +0100 d3d8: Merge fixup_caps() into d3dcaps_from_wined3dcaps(). 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/d3d8/d3d8_private.h | 1 - dlls/d3d8/device.c | 14 +++++++++++++- dlls/d3d8/directx.c | 17 ----------------- 3 files changed, 13 insertions(+), 19 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 1a7d7fd..e7dea35 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -42,7 +42,6 @@ #define VS_HIGHESTFIXEDFXF 0xF0000000 void d3dcaps_from_wined3dcaps(D3DCAPS8 *caps, const WINED3DCAPS *wined3d_caps) DECLSPEC_HIDDEN; -void fixup_caps(WINED3DCAPS *pWineCaps) DECLSPEC_HIDDEN; struct d3d8 { diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 1ef7420..d7a933b 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -282,6 +282,19 @@ void d3dcaps_from_wined3dcaps(D3DCAPS8 *caps, const WINED3DCAPS *wined3d_caps) caps->MaxVertexShaderConst = wined3d_caps->MaxVertexShaderConst; caps->PixelShaderVersion = wined3d_caps->PixelShaderVersion; caps->MaxPixelShaderValue = wined3d_caps->PixelShader1xMaxValue; + + /* D3D8 doesn't support SM 2.0 or higher, so clamp to 1.x */ + if (caps->PixelShaderVersion) + caps->PixelShaderVersion = D3DPS_VERSION(1, 4); + else + caps->PixelShaderVersion = D3DPS_VERSION(0, 0); + if (caps->VertexShaderVersion) + caps->VertexShaderVersion = D3DVS_VERSION(1, 1); + else + caps->VertexShaderVersion = D3DVS_VERSION(0, 0); + caps->MaxVertexShaderConst = min(D3D8_MAX_VERTEX_SHADER_CONSTANTF, caps->MaxVertexShaderConst); + + caps->StencilCaps &= ~WINED3DSTENCILCAPS_TWOSIDED; } /* Handle table functions */ @@ -527,7 +540,6 @@ static HRESULT WINAPI d3d8_device_GetDeviceCaps(IDirect3DDevice8 *iface, D3DCAPS hr = wined3d_device_get_device_caps(device->wined3d_device, &wined3d_caps); wined3d_mutex_unlock(); - fixup_caps(&wined3d_caps); d3dcaps_from_wined3dcaps(caps, &wined3d_caps); return hr; diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 560e107..f91e4af 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -315,22 +315,6 @@ static HRESULT WINAPI d3d8_CheckDepthStencilMatch(IDirect3D8 *iface, UINT adapte return hr; } -void fixup_caps(WINED3DCAPS *caps) -{ - /* D3D8 doesn't support SM 2.0 or higher, so clamp to 1.x */ - if (caps->PixelShaderVersion) - caps->PixelShaderVersion = D3DPS_VERSION(1,4); - else - caps->PixelShaderVersion = D3DPS_VERSION(0,0); - if (caps->VertexShaderVersion) - caps->VertexShaderVersion = D3DVS_VERSION(1,1); - else - caps->VertexShaderVersion = D3DVS_VERSION(0,0); - caps->MaxVertexShaderConst = min(D3D8_MAX_VERTEX_SHADER_CONSTANTF, caps->MaxVertexShaderConst); - - caps->StencilCaps &= ~WINED3DSTENCILCAPS_TWOSIDED; -} - static HRESULT WINAPI d3d8_GetDeviceCaps(IDirect3D8 *iface, UINT adapter, D3DDEVTYPE device_type, D3DCAPS8 *caps) { struct d3d8 *d3d8 = impl_from_IDirect3D8(iface); @@ -346,7 +330,6 @@ static HRESULT WINAPI d3d8_GetDeviceCaps(IDirect3D8 *iface, UINT adapter, D3DDEV hr = wined3d_get_device_caps(d3d8->wined3d, adapter, device_type, &wined3d_caps); wined3d_mutex_unlock(); - fixup_caps(&wined3d_caps); d3dcaps_from_wined3dcaps(caps, &wined3d_caps); return hr;

1 0

Józef Kucia : d3d9: Merge filter_caps() into d3dcaps_from_wined3dcaps().
by Alexandre Julliard Feb. 21, 2017

Feb. 21, 2017

Module: wine Branch: master Commit: 711539bc6e89cb980d4c28fee2200f1b9e84fb7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=711539bc6e89cb980d4c28fee… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 21 13:24:44 2017 +0100 d3d9: Merge filter_caps() into d3dcaps_from_wined3dcaps(). 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/d3d9/d3d9_private.h | 1 - dlls/d3d9/device.c | 88 +++++++++++++++++++++++++++++++++++++++++++++--- dlls/d3d9/directx.c | 82 -------------------------------------------- 3 files changed, 83 insertions(+), 88 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=711539bc6e89cb980d4c2…

1 0

Józef Kucia : wined3d: Check if texture unit mapping is required in context_update_tex_unit_map( ).
by Alexandre Julliard Feb. 21, 2017

Feb. 21, 2017

Module: wine Branch: master Commit: 3d62cd26d1b988b373efae0b9c4a0a988985d45f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d62cd26d1b988b373efae0b9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 21 13:24:47 2017 +0100 wined3d: Check if texture unit mapping is required in context_update_tex_unit_map(). 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/context.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index cb1935a..93b49a0 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2865,15 +2865,9 @@ static void context_map_fixed_function_samplers(struct wined3d_context *context, const struct wined3d_state *state) { const struct wined3d_d3d_info *d3d_info = context->d3d_info; - const struct wined3d_gl_info *gl_info = context->gl_info; unsigned int i, tex; WORD ffu_map; - context_update_fixed_function_usage_map(context, state); - - if (gl_info->limits.combined_samplers >= MAX_COMBINED_SAMPLERS) - return; - ffu_map = context->fixed_function_usage_map; if (d3d_info->limits.ffp_textures == d3d_info->limits.ffp_blend_stages @@ -2915,14 +2909,10 @@ static void context_map_fixed_function_samplers(struct wined3d_context *context, static void context_map_psamplers(struct wined3d_context *context, const struct wined3d_state *state) { const struct wined3d_d3d_info *d3d_info = context->d3d_info; - const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_shader_resource_info *resource_info = state->shader[WINED3D_SHADER_TYPE_PIXEL]->reg_maps.resource_info; unsigned int i; - if (gl_info->limits.combined_samplers >= MAX_COMBINED_SAMPLERS) - return; - for (i = 0; i < MAX_FRAGMENT_SAMPLERS; ++i) { if (resource_info[i].type && context->tex_unit_map[i] != i) @@ -2970,9 +2960,6 @@ static void context_map_vsamplers(struct wined3d_context *context, BOOL ps, cons int start = min(MAX_COMBINED_SAMPLERS, gl_info->limits.combined_samplers) - 1; int i; - if (gl_info->limits.combined_samplers >= MAX_COMBINED_SAMPLERS) - return; - /* Note that we only care if a resource is used or not, not the * resource's specific type. Otherwise we'd need to call * shader_update_samplers() here for 1.x pixelshaders. */ @@ -3008,14 +2995,21 @@ static void context_map_vsamplers(struct wined3d_context *context, BOOL ps, cons static void context_update_tex_unit_map(struct wined3d_context *context, const struct wined3d_state *state) { + const struct wined3d_gl_info *gl_info = context->gl_info; BOOL vs = use_vs(state); BOOL ps = use_ps(state); + if (!ps) + context_update_fixed_function_usage_map(context, state); + /* Try to go for a 1:1 mapping of the samplers when possible. Pixel shaders * need a 1:1 map at the moment. * When the mapping of a stage is changed, sampler and ALL texture stage * states have to be reset. */ + if (gl_info->limits.combined_samplers >= MAX_COMBINED_SAMPLERS) + return; + if (ps) context_map_psamplers(context, state); else

1 0

Józef Kucia : wined3d: Get rid of "tmp" variables in wined3d_adapter_init_limits().
by Alexandre Julliard Feb. 21, 2017

Feb. 21, 2017

Module: wine Branch: master Commit: 9acc780aadbc5749d27ebc79b20749170234da42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9acc780aadbc5749d27ebc79b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 21 13:24:45 2017 +0100 wined3d: Get rid of "tmp" variables in wined3d_adapter_init_limits(). 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/directx.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 0df4b58..56193da 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3416,11 +3416,10 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) if (gl_info->supported[ARB_FRAGMENT_PROGRAM]) { - GLint tmp; gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_TEXTURE_COORDS_ARB, &gl_max); gl_info->limits.texture_coords = min(MAX_TEXTURES, gl_max); - gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS_ARB, &tmp); - gl_info->limits.fragment_samplers = min(MAX_FRAGMENT_SAMPLERS, tmp); + gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS_ARB, &gl_max); + gl_info->limits.fragment_samplers = min(MAX_FRAGMENT_SAMPLERS, gl_max); } else { @@ -3432,13 +3431,12 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) if (gl_info->supported[ARB_VERTEX_SHADER]) { - GLint tmp; - gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB, &tmp); - gl_info->limits.vertex_samplers = tmp; - gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB, &tmp); - gl_info->limits.combined_samplers = tmp; - gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_VERTEX_ATTRIBS_ARB, &tmp); - gl_info->limits.vertex_attribs = tmp; + gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB, &gl_max); + gl_info->limits.vertex_samplers = gl_max; + gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB, &gl_max); + gl_info->limits.combined_samplers = gl_max; + gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_VERTEX_ATTRIBS_ARB, &gl_max); + gl_info->limits.vertex_attribs = gl_max; /* Loading GLSL sampler uniforms is much simpler if we can assume that the sampler setup * is known at shader link time. In a vertex shader + pixel shader combination this isn't

1 0

Jacek Caban : server: Create async object in flush request handler.
by Alexandre Julliard Feb. 21, 2017

Feb. 21, 2017

Module: wine Branch: master Commit: a9c51f4e8a13328af823469cba791b8811ae121a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9c51f4e8a13328af823469cb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 15 22:13:17 2017 +0100 server: Create async object in flush request handler. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/device.c | 16 ++++++++-------- server/fd.c | 13 +++++++++---- server/file.c | 4 ++-- server/file.h | 4 ++-- server/named_pipe.c | 11 +++++------ 5 files changed, 26 insertions(+), 22 deletions(-) diff --git a/server/device.c b/server/device.c index 1479a1c..d5574ae 100644 --- a/server/device.c +++ b/server/device.c @@ -176,7 +176,7 @@ static void device_file_destroy( struct object *obj ); static enum server_fd_type device_file_get_fd_type( struct fd *fd ); static obj_handle_t device_file_read( struct fd *fd, struct async *async, int blocking, file_pos_t pos ); static obj_handle_t device_file_write( struct fd *fd, struct async *async, int blocking, file_pos_t pos ); -static obj_handle_t device_file_flush( struct fd *fd, const async_data_t *async_data, int blocking ); +static obj_handle_t device_file_flush( struct fd *fd, struct async *async, int blocking ); static obj_handle_t device_file_ioctl( struct fd *fd, ioctl_code_t code, struct async *async, int blocking ); static const struct object_ops device_file_ops = @@ -465,13 +465,13 @@ static void set_file_user_ptr( struct device_file *file, client_ptr_t ptr ) /* queue an irp to the device */ static obj_handle_t queue_irp( struct device_file *file, struct irp_call *irp, - const async_data_t *async_data, int blocking ) + struct async *async, int blocking ) { obj_handle_t handle = 0; if (blocking && !(handle = alloc_handle( current->process, irp, SYNCHRONIZE, 0 ))) return 0; - if (!(irp->async = fd_queue_async( file->fd, async_data, irp->iosb, ASYNC_TYPE_WAIT ))) + if (!(irp->async = fd_queue_async( file->fd, async_get_data( async ), irp->iosb, ASYNC_TYPE_WAIT ))) { if (handle) close_handle( current->process, handle ); return 0; @@ -505,7 +505,7 @@ static obj_handle_t device_file_read( struct fd *fd, struct async *async, int bl release_object( iosb ); if (!irp) return 0; - handle = queue_irp( file, irp, async_get_data( async ), blocking ); + handle = queue_irp( file, irp, async, blocking ); release_object( irp ); return handle; } @@ -529,12 +529,12 @@ static obj_handle_t device_file_write( struct fd *fd, struct async *async, int b release_object( iosb ); if (!irp) return 0; - handle = queue_irp( file, irp, async_get_data( async ), blocking ); + handle = queue_irp( file, irp, async, blocking ); release_object( irp ); return handle; } -static obj_handle_t device_file_flush( struct fd *fd, const async_data_t *async_data, int blocking ) +static obj_handle_t device_file_flush( struct fd *fd, struct async *async, int blocking ) { struct device_file *file = get_fd_user( fd ); struct irp_call *irp; @@ -548,7 +548,7 @@ static obj_handle_t device_file_flush( struct fd *fd, const async_data_t *async_ irp = create_irp( file, &params, NULL ); if (!irp) return 0; - handle = queue_irp( file, irp, async_data, blocking ); + handle = queue_irp( file, irp, async, blocking ); release_object( irp ); return handle; } @@ -573,7 +573,7 @@ static obj_handle_t device_file_ioctl( struct fd *fd, ioctl_code_t code, struct release_object(iosb); if (!irp) return 0; - handle = queue_irp( file, irp, async_get_data( async ), blocking ); + handle = queue_irp( file, irp, async, blocking ); release_object( irp ); return handle; } diff --git a/server/fd.c b/server/fd.c index d8ee682..2ed639f 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2179,7 +2179,7 @@ obj_handle_t no_fd_write( struct fd *fd, struct async *async, int blocking, file } /* default flush() routine */ -obj_handle_t no_fd_flush( struct fd *fd, const async_data_t *async, int blocking ) +obj_handle_t no_fd_flush( struct fd *fd, struct async *async, int blocking ) { set_error( STATUS_OBJECT_TYPE_MISMATCH ); return 0; @@ -2376,12 +2376,17 @@ void fd_copy_completion( struct fd *src, struct fd *dst ) DECL_HANDLER(flush) { struct fd *fd = get_handle_fd_obj( current->process, req->async.handle, 0 ); + struct async *async; - if (fd) + if (!fd) return; + + async = create_async( current, &req->async, NULL ); + if (async) { - reply->event = fd->fd_ops->flush( fd, &req->async, req->blocking ); - release_object( fd ); + reply->event = fd->fd_ops->flush( fd, async, req->blocking ); + release_object( async ); } + release_object( fd ); } /* open a file object */ diff --git a/server/file.c b/server/file.c index 2f5371d..85bd950 100644 --- a/server/file.c +++ b/server/file.c @@ -74,7 +74,7 @@ static struct object *file_open_file( struct object *obj, unsigned int access, static void file_destroy( struct object *obj ); static int file_get_poll_events( struct fd *fd ); -static obj_handle_t file_flush( struct fd *fd, const async_data_t *async, int blocking ); +static obj_handle_t file_flush( struct fd *fd, struct async *async, int blocking ); static enum server_fd_type file_get_fd_type( struct fd *fd ); static const struct object_ops file_ops = @@ -295,7 +295,7 @@ static int file_get_poll_events( struct fd *fd ) return events; } -static obj_handle_t file_flush( struct fd *fd, const async_data_t *async, int blocking ) +static obj_handle_t file_flush( struct fd *fd, struct async *async, int blocking ) { int unix_fd = get_unix_fd( fd ); if (unix_fd != -1 && fsync( unix_fd ) == -1) file_set_error(); diff --git a/server/file.h b/server/file.h index c3938c2..0a0e72f 100644 --- a/server/file.h +++ b/server/file.h @@ -56,7 +56,7 @@ struct fd_ops /* perform a write on the file */ obj_handle_t (*write)(struct fd *, struct async *, int, file_pos_t ); /* flush the object buffers */ - obj_handle_t (*flush)(struct fd *, const async_data_t *, int); + obj_handle_t (*flush)(struct fd *, struct async *, int); /* perform an ioctl on the file */ obj_handle_t (*ioctl)(struct fd *fd, ioctl_code_t code, struct async *async, int blocking ); /* queue an async operation */ @@ -102,7 +102,7 @@ extern void fd_async_wake_up( struct fd *fd, int type, unsigned int status ); extern void fd_reselect_async( struct fd *fd, struct async_queue *queue ); extern obj_handle_t no_fd_read( struct fd *fd, struct async *async, int blocking, file_pos_t pos ); extern obj_handle_t no_fd_write( struct fd *fd, struct async *async, int blocking, file_pos_t pos ); -extern obj_handle_t no_fd_flush( struct fd *fd, const async_data_t *async, int blocking ); +extern obj_handle_t no_fd_flush( struct fd *fd, struct async *async, int blocking ); extern obj_handle_t no_fd_ioctl( struct fd *fd, ioctl_code_t code, struct async *async, int blocking ); extern obj_handle_t default_fd_ioctl( struct fd *fd, ioctl_code_t code, struct async *async, int blocking ); extern void no_fd_queue_async( struct fd *fd, struct async *async, int type, int count ); diff --git a/server/named_pipe.c b/server/named_pipe.c index 1668aaf..1426023 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -142,7 +142,7 @@ static const struct object_ops named_pipe_ops = static void pipe_server_dump( struct object *obj, int verbose ); static struct fd *pipe_server_get_fd( struct object *obj ); static void pipe_server_destroy( struct object *obj); -static obj_handle_t pipe_server_flush( struct fd *fd, const async_data_t *async, int blocking ); +static obj_handle_t pipe_server_flush( struct fd *fd, struct async *async, int blocking ); static enum server_fd_type pipe_server_get_fd_type( struct fd *fd ); static obj_handle_t pipe_server_ioctl( struct fd *fd, ioctl_code_t code, struct async *async, int blocking ); @@ -187,7 +187,7 @@ static void pipe_client_dump( struct object *obj, int verbose ); static int pipe_client_signaled( struct object *obj, struct wait_queue_entry *entry ); static struct fd *pipe_client_get_fd( struct object *obj ); static void pipe_client_destroy( struct object *obj ); -static obj_handle_t pipe_client_flush( struct fd *fd, const async_data_t *async, int blocking ); +static obj_handle_t pipe_client_flush( struct fd *fd, struct async *async, int blocking ); static enum server_fd_type pipe_client_get_fd_type( struct fd *fd ); static const struct object_ops pipe_client_ops = @@ -545,17 +545,16 @@ static void check_flushed( void *arg ) } } -static obj_handle_t pipe_server_flush( struct fd *fd, const async_data_t *async_data, int blocking ) +static obj_handle_t pipe_server_flush( struct fd *fd, struct async *async, int blocking ) { struct pipe_server *server = get_fd_user( fd ); obj_handle_t handle = 0; - struct async *async; if (!server || server->state != ps_connected_server) return 0; if (!pipe_data_remaining( server )) return 0; - if ((async = fd_queue_async( server->fd, async_data, NULL, ASYNC_TYPE_WAIT ))) + if ((async = fd_queue_async( server->fd, async_get_data( async ), NULL, ASYNC_TYPE_WAIT ))) { /* there's no unix way to be alerted when a pipe becomes empty, so resort to polling */ if (!server->flush_poll) @@ -567,7 +566,7 @@ static obj_handle_t pipe_server_flush( struct fd *fd, const async_data_t *async_ return handle; } -static obj_handle_t pipe_client_flush( struct fd *fd, const async_data_t *async, int blocking ) +static obj_handle_t pipe_client_flush( struct fd *fd, struct async *async, int blocking ) { /* FIXME: what do we have to do for this? */ return 0;

1 0

Jacek Caban : ole32: Use generic class factory for anti moniker.
by Alexandre Julliard Feb. 21, 2017

Feb. 21, 2017

Module: wine Branch: master Commit: b05fd4689e827dc64ef520c140ca0c5d5bde16cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b05fd4689e827dc64ef520c14… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 21 13:19:32 2017 +0100 ole32: Use generic class factory for anti moniker. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/antimoniker.c | 47 ++--------------------------------------------- dlls/ole32/moniker.h | 2 +- dlls/ole32/oleproxy.c | 13 ++++++++++++- 3 files changed, 15 insertions(+), 47 deletions(-) diff --git a/dlls/ole32/antimoniker.c b/dlls/ole32/antimoniker.c index a99b1b7..f7912fa 100644 --- a/dlls/ole32/antimoniker.c +++ b/dlls/ole32/antimoniker.c @@ -628,30 +628,8 @@ HRESULT WINAPI CreateAntiMoniker(IMoniker **ppmk) (void**)ppmk); } -static HRESULT WINAPI AntiMonikerCF_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) -{ - *ppv = NULL; - if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IClassFactory)) - { - *ppv = iface; - IClassFactory_AddRef(iface); - return S_OK; - } - return E_NOINTERFACE; -} - -static ULONG WINAPI AntiMonikerCF_AddRef(LPCLASSFACTORY iface) -{ - return 2; /* non-heap based object */ -} - -static ULONG WINAPI AntiMonikerCF_Release(LPCLASSFACTORY iface) -{ - return 1; /* non-heap based object */ -} - -static HRESULT WINAPI AntiMonikerCF_CreateInstance(LPCLASSFACTORY iface, - LPUNKNOWN pUnk, REFIID riid, LPVOID *ppv) +HRESULT WINAPI AntiMoniker_CreateInstance(IClassFactory *iface, + IUnknown *pUnk, REFIID riid, void **ppv) { IMoniker *pMoniker; HRESULT hr; @@ -674,24 +652,3 @@ static HRESULT WINAPI AntiMonikerCF_CreateInstance(LPCLASSFACTORY iface, return hr; } - -static HRESULT WINAPI AntiMonikerCF_LockServer(LPCLASSFACTORY iface, BOOL fLock) -{ - FIXME("(%d), stub!\n",fLock); - return S_OK; -} - -static const IClassFactoryVtbl AntiMonikerCFVtbl = -{ - AntiMonikerCF_QueryInterface, - AntiMonikerCF_AddRef, - AntiMonikerCF_Release, - AntiMonikerCF_CreateInstance, - AntiMonikerCF_LockServer -}; -static const IClassFactoryVtbl *AntiMonikerCF = &AntiMonikerCFVtbl; - -HRESULT AntiMonikerCF_Create(REFIID riid, LPVOID *ppv) -{ - return IClassFactory_QueryInterface((IClassFactory *)&AntiMonikerCF, riid, ppv); -} diff --git a/dlls/ole32/moniker.h b/dlls/ole32/moniker.h index a811366..8af2d9e 100644 --- a/dlls/ole32/moniker.h +++ b/dlls/ole32/moniker.h @@ -32,7 +32,7 @@ DEFINE_OLEGUID( CLSID_PointerMoniker, 0x306, 0, 0 ); HRESULT WINAPI FileMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv); HRESULT WINAPI ItemMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv); -HRESULT AntiMonikerCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; +HRESULT WINAPI AntiMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv); HRESULT CompositeMonikerCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; HRESULT ClassMonikerCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; HRESULT PointerMonikerCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; diff --git a/dlls/ole32/oleproxy.c b/dlls/ole32/oleproxy.c index b7a11a1..52249a2 100644 --- a/dlls/ole32/oleproxy.c +++ b/dlls/ole32/oleproxy.c @@ -95,6 +95,17 @@ static const IClassFactoryVtbl ItemMonikerCFVtbl = static IClassFactory ItemMonikerCF = { &ItemMonikerCFVtbl }; +static const IClassFactoryVtbl AntiMonikerCFVtbl = +{ + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + AntiMoniker_CreateInstance, + ClassFactory_LockServer +}; + +static IClassFactory AntiMonikerCF = { &AntiMonikerCFVtbl }; + /*********************************************************************** * DllGetClassObject [OLE32.@] */ @@ -116,7 +127,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv) if (IsEqualCLSID(rclsid, &CLSID_ItemMoniker)) return IClassFactory_QueryInterface(&ItemMonikerCF, iid, ppv); if (IsEqualCLSID(rclsid, &CLSID_AntiMoniker)) - return AntiMonikerCF_Create(iid, ppv); + return IClassFactory_QueryInterface(&AntiMonikerCF, iid, ppv); if (IsEqualCLSID(rclsid, &CLSID_CompositeMoniker)) return CompositeMonikerCF_Create(iid, ppv); if (IsEqualCLSID(rclsid, &CLSID_ClassMoniker))

1 0

Jacek Caban : ole32: Use generic class factory for item moniker.
by Alexandre Julliard Feb. 21, 2017

Feb. 21, 2017

Module: wine Branch: master Commit: dee64631ffeda2dffe4bb5d75405bbdf29873630 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dee64631ffeda2dffe4bb5d75… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 21 13:19:24 2017 +0100 ole32: Use generic class factory for item moniker. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/itemmoniker.c | 50 +++--------------------------------------------- dlls/ole32/moniker.h | 2 +- dlls/ole32/oleproxy.c | 13 ++++++++++++- 3 files changed, 16 insertions(+), 49 deletions(-) diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c index 67bef5f..14beada 100644 --- a/dlls/ole32/itemmoniker.c +++ b/dlls/ole32/itemmoniker.c @@ -948,39 +948,16 @@ HRESULT WINAPI CreateItemMoniker(LPCOLESTR lpszDelim, LPCOLESTR lpszItem, IMoni hr = ItemMonikerImpl_Construct(newItemMoniker,lpszDelim,lpszItem); if (FAILED(hr)){ - HeapFree(GetProcessHeap(),0,newItemMoniker); - return hr; + return hr; } return ItemMonikerImpl_QueryInterface(&newItemMoniker->IMoniker_iface,&IID_IMoniker, (void**)ppmk); } -static HRESULT WINAPI ItemMonikerCF_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) -{ - *ppv = NULL; - if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IClassFactory)) - { - *ppv = iface; - IClassFactory_AddRef(iface); - return S_OK; - } - return E_NOINTERFACE; -} - -static ULONG WINAPI ItemMonikerCF_AddRef(LPCLASSFACTORY iface) -{ - return 2; /* non-heap based object */ -} - -static ULONG WINAPI ItemMonikerCF_Release(LPCLASSFACTORY iface) -{ - return 1; /* non-heap based object */ -} - -static HRESULT WINAPI ItemMonikerCF_CreateInstance(LPCLASSFACTORY iface, - LPUNKNOWN pUnk, REFIID riid, LPVOID *ppv) +HRESULT WINAPI ItemMoniker_CreateInstance(IClassFactory *iface, + IUnknown *pUnk, REFIID riid, void **ppv) { ItemMonikerImpl* newItemMoniker; HRESULT hr; @@ -1006,24 +983,3 @@ static HRESULT WINAPI ItemMonikerCF_CreateInstance(LPCLASSFACTORY iface, return hr; } - -static HRESULT WINAPI ItemMonikerCF_LockServer(LPCLASSFACTORY iface, BOOL fLock) -{ - FIXME("(%d), stub!\n",fLock); - return S_OK; -} - -static const IClassFactoryVtbl ItemMonikerCFVtbl = -{ - ItemMonikerCF_QueryInterface, - ItemMonikerCF_AddRef, - ItemMonikerCF_Release, - ItemMonikerCF_CreateInstance, - ItemMonikerCF_LockServer -}; -static const IClassFactoryVtbl *ItemMonikerCF = &ItemMonikerCFVtbl; - -HRESULT ItemMonikerCF_Create(REFIID riid, LPVOID *ppv) -{ - return IClassFactory_QueryInterface((IClassFactory *)&ItemMonikerCF, riid, ppv); -} diff --git a/dlls/ole32/moniker.h b/dlls/ole32/moniker.h index 2b08384..a811366 100644 --- a/dlls/ole32/moniker.h +++ b/dlls/ole32/moniker.h @@ -31,7 +31,7 @@ DEFINE_OLEGUID( CLSID_ClassMoniker, 0x31a, 0, 0 ); DEFINE_OLEGUID( CLSID_PointerMoniker, 0x306, 0, 0 ); HRESULT WINAPI FileMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv); -HRESULT ItemMonikerCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; +HRESULT WINAPI ItemMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv); HRESULT AntiMonikerCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; HRESULT CompositeMonikerCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; HRESULT ClassMonikerCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; diff --git a/dlls/ole32/oleproxy.c b/dlls/ole32/oleproxy.c index ba0703d..b7a11a1 100644 --- a/dlls/ole32/oleproxy.c +++ b/dlls/ole32/oleproxy.c @@ -84,6 +84,17 @@ static const IClassFactoryVtbl FileMonikerCFVtbl = static IClassFactory FileMonikerCF = { &FileMonikerCFVtbl }; +static const IClassFactoryVtbl ItemMonikerCFVtbl = +{ + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + ItemMoniker_CreateInstance, + ClassFactory_LockServer +}; + +static IClassFactory ItemMonikerCF = { &ItemMonikerCFVtbl }; + /*********************************************************************** * DllGetClassObject [OLE32.@] */ @@ -103,7 +114,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv) if (IsEqualCLSID(rclsid, &CLSID_FileMoniker)) return IClassFactory_QueryInterface(&FileMonikerCF, iid, ppv); if (IsEqualCLSID(rclsid, &CLSID_ItemMoniker)) - return ItemMonikerCF_Create(iid, ppv); + return IClassFactory_QueryInterface(&ItemMonikerCF, iid, ppv); if (IsEqualCLSID(rclsid, &CLSID_AntiMoniker)) return AntiMonikerCF_Create(iid, ppv); if (IsEqualCLSID(rclsid, &CLSID_CompositeMoniker))

1 0