wine-commits February 2017

wine-commits@winehq.org

2 participants
838 discussions

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

21 Feb '17

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: Request compatibility profile in GLSL for legacy contexts.
by Alexandre Julliard 21 Feb '17

21 Feb '17

Module: wine Branch: master Commit: 30ae841fefb11ee9e6dfb69c438776cf959fca92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30ae841fefb11ee9e6dfb69c4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 21 13:24:40 2017 +0100 wined3d: Request compatibility profile in GLSL for legacy contexts. The deprecated GLSL functions are used in the GLSL generated for legacy contexts. 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 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 72039b7..41adac1 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -366,7 +366,11 @@ static unsigned int shader_glsl_get_version(const struct wined3d_gl_info *gl_inf static void shader_glsl_add_version_declaration(struct wined3d_string_buffer *buffer, const struct wined3d_gl_info *gl_info, const struct wined3d_shader_version *version) { - shader_addline(buffer, "#version %u\n", shader_glsl_get_version(gl_info, version)); + unsigned int glsl_version = shader_glsl_get_version(gl_info, version); + if (glsl_version >= 150 && gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) + shader_addline(buffer, "#version %u compatibility\n", glsl_version); + else + shader_addline(buffer, "#version %u\n", glsl_version); } static void shader_glsl_append_imm_vec4(struct wined3d_string_buffer *buffer, const float *values)

1 0

Józef Kucia : wined3d: Get rid of shader_glsl_get_version_declaration().
by Alexandre Julliard 21 Feb '17

21 Feb '17

Module: wine Branch: master Commit: c74847111ff27dabcbc676de1ead8bb845e468e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c74847111ff27dabcbc676de1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 21 13:24:39 2017 +0100 wined3d: Get rid of shader_glsl_get_version_declaration(). 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 | 33 ++++++++++----------------------- 1 file changed, 10 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ca70859..72039b7 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -363,23 +363,10 @@ static unsigned int shader_glsl_get_version(const struct wined3d_gl_info *gl_inf return 120; } -static const char *shader_glsl_get_version_declaration(const struct wined3d_gl_info *gl_info, - const struct wined3d_shader_version *version) +static void shader_glsl_add_version_declaration(struct wined3d_string_buffer *buffer, + const struct wined3d_gl_info *gl_info, const struct wined3d_shader_version *version) { - unsigned int glsl_version; - - switch (glsl_version = shader_glsl_get_version(gl_info, version)) - { - case 150: - return "#version 150"; - case 130: - return "#version 130"; - case 120: - return "#version 120"; - default: - FIXME("Unexpected GLSL version %u requested.\n", glsl_version); - return ""; - } + shader_addline(buffer, "#version %u\n", shader_glsl_get_version(gl_info, version)); } static void shader_glsl_append_imm_vec4(struct wined3d_string_buffer *buffer, const float *values) @@ -6150,7 +6137,7 @@ static GLuint shader_glsl_generate_vs3_rasterizer_input_setup(struct shader_glsl string_buffer_clear(buffer); - shader_addline(buffer, "%s\n", shader_glsl_get_version_declaration(gl_info, &vs->reg_maps.shader_version)); + shader_glsl_add_version_declaration(buffer, gl_info, &vs->reg_maps.shader_version); if (per_vertex_point_size) { @@ -6431,7 +6418,7 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context priv_ctx.cur_np2fixup_info = np2fixup_info; priv_ctx.string_buffers = string_buffers; - shader_addline(buffer, "%s\n", shader_glsl_get_version_declaration(gl_info, &reg_maps->shader_version)); + shader_glsl_add_version_declaration(buffer, gl_info, &reg_maps->shader_version); shader_glsl_enable_extensions(buffer, gl_info); if (gl_info->supported[ARB_DERIVATIVE_CONTROL]) @@ -6585,7 +6572,7 @@ static GLuint shader_glsl_generate_vshader(const struct wined3d_context *context /* Create the hw GLSL shader program and assign it as the shader->prgId */ GLuint shader_id = GL_EXTCALL(glCreateShader(GL_VERTEX_SHADER)); - shader_addline(buffer, "%s\n", shader_glsl_get_version_declaration(gl_info, &reg_maps->shader_version)); + shader_glsl_add_version_declaration(buffer, gl_info, &reg_maps->shader_version); shader_glsl_enable_extensions(buffer, gl_info); if (gl_info->supported[ARB_DRAW_INSTANCED]) @@ -6641,7 +6628,7 @@ static GLuint shader_glsl_generate_geometry_shader(const struct wined3d_context shader_id = GL_EXTCALL(glCreateShader(GL_GEOMETRY_SHADER)); - shader_addline(buffer, "%s\n", shader_glsl_get_version_declaration(gl_info, &reg_maps->shader_version)); + shader_glsl_add_version_declaration(buffer, gl_info, &reg_maps->shader_version); shader_glsl_enable_extensions(buffer, gl_info); if (gl_info->supported[ARB_GEOMETRY_SHADER4]) @@ -6699,7 +6686,7 @@ static GLuint shader_glsl_generate_compute_shader(const struct wined3d_context * shader_id = GL_EXTCALL(glCreateShader(GL_COMPUTE_SHADER)); - shader_addline(buffer, "%s\n", shader_glsl_get_version_declaration(gl_info, &reg_maps->shader_version)); + shader_glsl_add_version_declaration(buffer, gl_info, &reg_maps->shader_version); shader_glsl_enable_extensions(buffer, gl_info); if (gl_info->supported[ARB_COMPUTE_SHADER]) @@ -7172,7 +7159,7 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct shader_glsl_priv *pr string_buffer_clear(buffer); - shader_addline(buffer, "%s\n", shader_glsl_get_version_declaration(gl_info, NULL)); + shader_glsl_add_version_declaration(buffer, gl_info, NULL); if (shader_glsl_use_explicit_attrib_location(gl_info)) shader_addline(buffer, "#extension GL_ARB_explicit_attrib_location : enable\n"); @@ -7743,7 +7730,7 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * } lowest_disabled_stage = stage; - shader_addline(buffer, "%s\n", shader_glsl_get_version_declaration(gl_info, NULL)); + shader_glsl_add_version_declaration(buffer, gl_info, NULL); if (gl_info->supported[ARB_TEXTURE_RECTANGLE]) shader_addline(buffer, "#extension GL_ARB_texture_rectangle : enable\n");

1 0

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

21 Feb '17

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 21 Feb '17

21 Feb '17

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

Stefan Dösinger : d3d8/tests: Work around a r500 Windows point sprite bug.
by Alexandre Julliard 21 Feb '17

21 Feb '17

Module: wine Branch: master Commit: 3ba0872239264bf45792eeed0a88f39b01bae7fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ba0872239264bf45792eeed0… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Mon Feb 20 22:31:02 2017 +0000 d3d8/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/d3d8/tests/visual.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index a7177d3..d314edb 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -6937,6 +6937,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 = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_TEX1); + ok(SUCCEEDED(hr), "Failed to set FVF, hr=%#x.\n", hr); + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_POINTLIST, 1, vertices, sizeof(float) * 5); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff0000ff, 1.0f, 0); ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); hr = IDirect3DDevice8_SetRenderState(device, D3DRS_LIGHTING, FALSE);

1 0

Bruno Jesus : winemp3.acm: Fixes compilation for older mpg123 library versions.
by Alexandre Julliard 21 Feb '17

21 Feb '17

Module: wine Branch: master Commit: bb036ae502f7012af17a4a5eefcb43e294ab502f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb036ae502f7012af17a4a5ee… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Feb 19 22:16:18 2017 -0300 winemp3.acm: Fixes compilation for older mpg123 library versions. Thanks to Sebastian Lackner for the correct approach. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemp3.acm/mpegl3.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winemp3.acm/mpegl3.c b/dlls/winemp3.acm/mpegl3.c index 28a1998..cc6008d 100644 --- a/dlls/winemp3.acm/mpegl3.c +++ b/dlls/winemp3.acm/mpegl3.c @@ -249,12 +249,14 @@ static LRESULT MPEG3_StreamOpen(PACMDRVSTREAMINSTANCE adsi) aad->mh = mpg123_new(NULL,&err); mpg123_open_feed(aad->mh); +#if MPG123_API_VERSION >= 31 /* needed for MPG123_IGNORE_FRAMEINFO enum value */ /* mpg123 may find a XING header in the mp3 and use that information * to ask for seeks in order to read specific frames in the file. * We cannot allow that since the caller application is feeding us. * This fixes problems for mp3 files encoded with LAME (bug 42361) */ mpg123_param(aad->mh, MPG123_ADD_FLAGS, MPG123_IGNORE_INFOFRAME, 0); +#endif } /* no encoding yet else if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_PCM &&

1 0

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

21 Feb '17

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 : server: Create async object in ioctl request handler.
by Alexandre Julliard 21 Feb '17

21 Feb '17

Module: wine Branch: master Commit: bede6499ed48d5a02f4dd99d15e4fbe230300d8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bede6499ed48d5a02f4dd99d1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 15 22:12:59 2017 +0100 server: Create async object in ioctl request handler. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 26 ++++++++++++++++++++++++++ dlls/ntdll/tests/pipe.c | 7 +++++++ server/device.c | 7 +++---- server/fd.c | 21 +++++++++++++++------ server/file.h | 6 +++--- server/named_pipe.c | 31 ++++++++++++------------------- server/sock.c | 7 ++----- 7 files changed, 68 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bede6499ed48d5a02f4dd…

1 0

Jacek Caban : server: Create async object in register_async handler.
by Alexandre Julliard 21 Feb '17

21 Feb '17

Module: wine Branch: master Commit: a604db12612afccd789e4c09884c3c35dc8f1562 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a604db12612afccd789e4c098… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 15 22:12:45 2017 +0100 server: Create async object in register_async handler. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/fd.c | 15 +++++++++------ server/file.h | 6 +++--- server/mailslot.c | 7 +++---- server/serial.c | 7 +++---- server/sock.c | 8 ++------ 5 files changed, 20 insertions(+), 23 deletions(-) diff --git a/server/fd.c b/server/fd.c index 202bd56..4aa1b1d 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2091,16 +2091,14 @@ void fd_reselect_async( struct fd *fd, struct async_queue *queue ) fd->fd_ops->reselect_async( fd, queue ); } -void no_fd_queue_async( struct fd *fd, const async_data_t *data, int type, int count ) +void no_fd_queue_async( struct fd *fd, struct async *async, int type, int count ) { set_error( STATUS_OBJECT_TYPE_MISMATCH ); } -void default_fd_queue_async( struct fd *fd, const async_data_t *data, int type, int count ) +void default_fd_queue_async( struct fd *fd, struct async *async, int type, int count ) { - struct async *async; - - if ((async = fd_queue_async( fd, data, NULL, type ))) + if ((async = fd_queue_async( fd, async_get_data( async ), NULL, type ))) { release_object( async ); set_error( STATUS_PENDING ); @@ -2509,6 +2507,7 @@ DECL_HANDLER(ioctl) DECL_HANDLER(register_async) { unsigned int access; + struct async *async; struct fd *fd; switch(req->type) @@ -2526,7 +2525,11 @@ DECL_HANDLER(register_async) if ((fd = get_handle_fd_obj( current->process, req->async.handle, access ))) { - if (get_unix_fd( fd ) != -1) fd->fd_ops->queue_async( fd, &req->async, req->type, req->count ); + if (get_unix_fd( fd ) != -1 && (async = create_async( current, &req->async, NULL ))) + { + fd->fd_ops->queue_async( fd, async, req->type, req->count ); + release_object( async ); + } release_object( fd ); } } diff --git a/server/file.h b/server/file.h index 3605053..98a1e84 100644 --- a/server/file.h +++ b/server/file.h @@ -60,7 +60,7 @@ struct fd_ops /* perform an ioctl on the file */ obj_handle_t (*ioctl)(struct fd *fd, ioctl_code_t code, const async_data_t *async, int blocking ); /* queue an async operation */ - void (*queue_async)(struct fd *, const async_data_t *data, int type, int count); + void (*queue_async)(struct fd *, struct async *async, int type, int count); /* selected events for async i/o need an update */ void (*reselect_async)( struct fd *, struct async_queue *queue ); }; @@ -105,8 +105,8 @@ extern obj_handle_t no_fd_write( struct fd *fd, struct async *async, int blockin extern obj_handle_t no_fd_flush( struct fd *fd, const async_data_t *async, int blocking ); extern obj_handle_t no_fd_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *async, int blocking ); extern obj_handle_t default_fd_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *async, int blocking ); -extern void no_fd_queue_async( struct fd *fd, const async_data_t *data, int type, int count ); -extern void default_fd_queue_async( struct fd *fd, const async_data_t *data, int type, int count ); +extern void no_fd_queue_async( struct fd *fd, struct async *async, int type, int count ); +extern void default_fd_queue_async( struct fd *fd, struct async *async, int type, int count ); extern void default_fd_reselect_async( struct fd *fd, struct async_queue *queue ); extern void main_loop(void); extern void remove_process_locks( struct process *process ); diff --git a/server/mailslot.c b/server/mailslot.c index 783b28b..20bf99c 100644 --- a/server/mailslot.c +++ b/server/mailslot.c @@ -94,7 +94,7 @@ static const struct object_ops mailslot_ops = }; static enum server_fd_type mailslot_get_fd_type( struct fd *fd ); -static void mailslot_queue_async( struct fd *fd, const async_data_t *data, int type, int count ); +static void mailslot_queue_async( struct fd *fd, struct async *async, int type, int count ); static const struct fd_ops mailslot_fd_ops = { @@ -325,14 +325,13 @@ static struct object *mailslot_open_file( struct object *obj, unsigned int acces return &writer->obj; } -static void mailslot_queue_async( struct fd *fd, const async_data_t *data, int type, int count ) +static void mailslot_queue_async( struct fd *fd, struct async *async, int type, int count ) { struct mailslot *mailslot = get_fd_user( fd ); - struct async *async; assert(mailslot->obj.ops == &mailslot_ops); - if ((async = fd_queue_async( fd, data, NULL, type ))) + if ((async = fd_queue_async( fd, async_get_data( async ), NULL, type ))) { async_set_timeout( async, mailslot->read_timeout ? mailslot->read_timeout : -1, STATUS_IO_TIMEOUT ); diff --git a/server/serial.c b/server/serial.c index 6f9cc24..58170cd 100644 --- a/server/serial.c +++ b/server/serial.c @@ -61,7 +61,7 @@ static struct fd *serial_get_fd( struct object *obj ); static void serial_destroy(struct object *obj); static enum server_fd_type serial_get_fd_type( struct fd *fd ); -static void serial_queue_async( struct fd *fd, const async_data_t *data, int type, int count ); +static void serial_queue_async( struct fd *fd, struct async *async, int type, int count ); static void serial_reselect_async( struct fd *fd, struct async_queue *queue ); struct serial @@ -183,11 +183,10 @@ static enum server_fd_type serial_get_fd_type( struct fd *fd ) return FD_TYPE_SERIAL; } -static void serial_queue_async( struct fd *fd, const async_data_t *data, int type, int count ) +static void serial_queue_async( struct fd *fd, struct async *async, int type, int count ) { struct serial *serial = get_fd_user( fd ); timeout_t timeout = 0; - struct async *async; assert(serial->obj.ops == &serial_ops); @@ -201,7 +200,7 @@ static void serial_queue_async( struct fd *fd, const async_data_t *data, int typ break; } - if ((async = fd_queue_async( fd, data, NULL, type ))) + if ((async = fd_queue_async( fd, async_get_data( async ), NULL, type ))) { if (timeout) async_set_timeout( async, timeout * -10000, STATUS_TIMEOUT ); release_object( async ); diff --git a/server/sock.c b/server/sock.c index e9369e5..c997bf3 100644 --- a/server/sock.c +++ b/server/sock.c @@ -130,7 +130,7 @@ static int sock_get_poll_events( struct fd *fd ); static void sock_poll_event( struct fd *fd, int event ); static enum server_fd_type sock_get_fd_type( struct fd *fd ); static obj_handle_t sock_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *async, int blocking ); -static void sock_queue_async( struct fd *fd, const async_data_t *data, int type, int count ); +static void sock_queue_async( struct fd *fd, struct async *async, int type, int count ); static void sock_reselect_async( struct fd *fd, struct async_queue *queue ); static int sock_get_ntstatus( int err ); @@ -564,10 +564,9 @@ obj_handle_t sock_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *a } } -static void sock_queue_async( struct fd *fd, const async_data_t *data, int type, int count ) +static void sock_queue_async( struct fd *fd, struct async *async, int type, int count ) { struct sock *sock = get_fd_user( fd ); - struct async *async; struct async_queue *queue; assert( sock->obj.ops == &sock_ops ); @@ -594,10 +593,7 @@ static void sock_queue_async( struct fd *fd, const async_data_t *data, int type, return; } - if (!(async = create_async( current, data, NULL ))) return; queue_async( queue, async ); - release_object( async ); - sock_reselect( sock ); set_error( STATUS_PENDING );

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
84
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 February 2017