May 2019 - Wine-devel - list.winehq.org

[PATCH 2/5] wined3d: Pass a wined3d_context_gl structure to context_check_fbo_status().
by Henri Verbeet 15 May '19

15 May '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/context.c | 18 ++++++------------ dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/surface.c | 12 ++++++------ dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 15 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index ff46153f6d9..a0f5e68f0ee 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7900,7 +7900,7 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl wined3d_context_gl_apply_fbo_state_blit(context_gl, GL_DRAW_FRAMEBUFFER, &dst_texture->resource, dst_sub_resource_idx, NULL, 0, dst_location); context_set_draw_buffer(context, buffer); - context_check_fbo_status(context, GL_DRAW_FRAMEBUFFER); + wined3d_context_gl_check_fbo_status(context_gl, GL_DRAW_FRAMEBUFFER); context_invalidate_state(context, STATE_FRAMEBUFFER); } diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index d628d54316a..4707d7031ef 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -375,9 +375,9 @@ static void context_dump_fbo_attachment(const struct wined3d_gl_info *gl_info, G } /* Context activation is done by the caller. */ -void context_check_fbo_status(const struct wined3d_context *context, GLenum target) +void wined3d_context_gl_check_fbo_status(const struct wined3d_context_gl *context_gl, GLenum target) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; GLenum status; if (!FIXME_ON(d3d)) @@ -394,7 +394,7 @@ void context_check_fbo_status(const struct wined3d_context *context, GLenum targ FIXME("FBO status %s (%#x).\n", debug_fbostatus(status), status); - if (!context->current_fbo) + if (!context_gl->c.current_fbo) { ERR("FBO 0 is incomplete, driver bug?\n"); return; @@ -2787,9 +2787,7 @@ void wined3d_context_gl_apply_blit_state(struct wined3d_context_gl *context_gl, } if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) - { - context_check_fbo_status(context, GL_FRAMEBUFFER); - } + wined3d_context_gl_check_fbo_status(context_gl, GL_FRAMEBUFFER); context_invalidate_state(context, STATE_FRAMEBUFFER); context_get_rt_size(context, &rt_size); @@ -3097,9 +3095,7 @@ BOOL wined3d_context_gl_apply_clear_state(struct wined3d_context_gl *context_gl, } if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) - { - context_check_fbo_status(&context_gl->c, GL_FRAMEBUFFER); - } + wined3d_context_gl_check_fbo_status(context_gl, GL_FRAMEBUFFER); context_gl->c.last_was_blit = FALSE; context_gl->c.last_was_ffp_blit = FALSE; @@ -4021,9 +4017,7 @@ static BOOL context_apply_draw_state(struct wined3d_context *context, } if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) - { - context_check_fbo_status(context, GL_FRAMEBUFFER); - } + wined3d_context_gl_check_fbo_status(context_gl, GL_FRAMEBUFFER); context->numDirtyEntries = 0; /* This makes the whole list clean */ context->last_was_blit = FALSE; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a3c17294c64..dbf11d7a13e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -13334,7 +13334,7 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli wined3d_context_gl_apply_fbo_state_blit(context_gl, GL_DRAW_FRAMEBUFFER, &dst_texture->resource, dst_sub_resource_idx, NULL, 0, dst_location); context_set_draw_buffer(context, buffer); - context_check_fbo_status(context, GL_DRAW_FRAMEBUFFER); + wined3d_context_gl_check_fbo_status(context_gl, GL_DRAW_FRAMEBUFFER); context_invalidate_state(context, STATE_FRAMEBUFFER); } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 3d0d9c0caf6..b76ebe91ab7 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -106,12 +106,12 @@ static void texture2d_depth_blt_fbo(const struct wined3d_device *device, struct wined3d_context_gl_apply_fbo_state_blit(context_gl, GL_READ_FRAMEBUFFER, NULL, 0, &src_texture->resource, src_sub_resource_idx, src_location); - context_check_fbo_status(context, GL_READ_FRAMEBUFFER); + wined3d_context_gl_check_fbo_status(context_gl, GL_READ_FRAMEBUFFER); wined3d_context_gl_apply_fbo_state_blit(context_gl, GL_DRAW_FRAMEBUFFER, NULL, 0, &dst_texture->resource, dst_sub_resource_idx, dst_location); context_set_draw_buffer(context, GL_NONE); - context_check_fbo_status(context, GL_DRAW_FRAMEBUFFER); + wined3d_context_gl_check_fbo_status(context_gl, GL_DRAW_FRAMEBUFFER); context_invalidate_state(context, STATE_FRAMEBUFFER); if (gl_mask & GL_DEPTH_BUFFER_BIT) @@ -252,7 +252,7 @@ static void texture2d_blt_fbo(const struct wined3d_device *device, struct wined3 &src_texture->resource, src_sub_resource_idx, NULL, 0, src_location); gl_info->gl_ops.gl.p_glReadBuffer(buffer); checkGLcall("glReadBuffer()"); - context_check_fbo_status(context, GL_READ_FRAMEBUFFER); + wined3d_context_gl_check_fbo_status(context_gl, GL_READ_FRAMEBUFFER); if (dst_location == WINED3D_LOCATION_DRAWABLE) { @@ -271,7 +271,7 @@ static void texture2d_blt_fbo(const struct wined3d_device *device, struct wined3 wined3d_context_gl_apply_fbo_state_blit(context_gl, GL_DRAW_FRAMEBUFFER, &dst_texture->resource, dst_sub_resource_idx, NULL, 0, dst_location); context_set_draw_buffer(context, buffer); - context_check_fbo_status(context, GL_DRAW_FRAMEBUFFER); + wined3d_context_gl_check_fbo_status(context_gl, GL_DRAW_FRAMEBUFFER); context_invalidate_state(context, STATE_FRAMEBUFFER); gl_info->gl_ops.gl.p_glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); @@ -737,7 +737,7 @@ static void texture2d_read_from_framebuffer(struct wined3d_texture *texture, uns { wined3d_context_gl_apply_fbo_state_blit(context_gl, GL_READ_FRAMEBUFFER, resource, sub_resource_idx, NULL, 0, src_location); - context_check_fbo_status(context, GL_READ_FRAMEBUFFER); + wined3d_context_gl_check_fbo_status(context_gl, GL_READ_FRAMEBUFFER); context_invalidate_state(context, STATE_FRAMEBUFFER); } else @@ -2260,7 +2260,7 @@ static DWORD ffp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit wined3d_context_gl_apply_fbo_state_blit(context_gl, GL_DRAW_FRAMEBUFFER, dst_resource, dst_sub_resource_idx, NULL, 0, dst_location); context_set_draw_buffer(context, buffer); - context_check_fbo_status(context, GL_DRAW_FRAMEBUFFER); + wined3d_context_gl_check_fbo_status(context_gl, GL_DRAW_FRAMEBUFFER); context_invalidate_state(context, STATE_FRAMEBUFFER); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 77d551e1fd1..f1e7f6d416e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2074,6 +2074,7 @@ void wined3d_context_gl_apply_ffp_blit_state(struct wined3d_context_gl *context_ const struct wined3d_device *device) DECLSPEC_HIDDEN; void wined3d_context_gl_bind_texture(struct wined3d_context_gl *context_gl, GLenum target, GLuint name) DECLSPEC_HIDDEN; +void wined3d_context_gl_check_fbo_status(const struct wined3d_context_gl *context_gl, GLenum target) DECLSPEC_HIDDEN; void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; void wined3d_context_gl_free_fence(struct wined3d_fence *fence) DECLSPEC_HIDDEN; void wined3d_context_gl_free_occlusion_query(struct wined3d_occlusion_query *query) DECLSPEC_HIDDEN; @@ -2227,7 +2228,6 @@ void context_active_texture(struct wined3d_context *context, const struct wined3 unsigned int unit) DECLSPEC_HIDDEN; void context_bind_bo(struct wined3d_context *context, GLenum binding, GLuint name) DECLSPEC_HIDDEN; void context_bind_dummy_textures(const struct wined3d_context *context) DECLSPEC_HIDDEN; -void context_check_fbo_status(const struct wined3d_context *context, GLenum target) DECLSPEC_HIDDEN; void context_copy_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *dst, GLenum dst_binding, const struct wined3d_bo_address *src, GLenum src_binding, size_t size) DECLSPEC_HIDDEN; -- 2.11.0

2 1

[PATCH 1/5] wined3d: Pass a wined3d_context_gl structure to context_apply_fbo_state_blit().
by Henri Verbeet 15 May '19

15 May '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 5 +++-- dlls/wined3d/context.c | 14 +++++++------- dlls/wined3d/glsl_shader.c | 5 +++-- dlls/wined3d/surface.c | 22 ++++++++++++++-------- dlls/wined3d/wined3d_private.h | 6 +++--- 5 files changed, 30 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index de32587050d..ff46153f6d9 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7783,6 +7783,7 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl const struct wined3d_color_key *color_key, enum wined3d_texture_filter_type filter) { struct wined3d_texture_gl *src_texture_gl = wined3d_texture_gl(src_texture); + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); struct wined3d_device *device = dst_texture->resource.device; struct wined3d_texture *staging_texture = NULL; struct wined3d_arbfp_blitter *arbfp_blitter; @@ -7873,7 +7874,7 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl wined3d_texture_load(src_texture, context, FALSE); } - wined3d_context_gl_apply_ffp_blit_state(wined3d_context_gl(context), device); + wined3d_context_gl_apply_ffp_blit_state(context_gl, device); if (dst_location == WINED3D_LOCATION_DRAWABLE) { @@ -7896,7 +7897,7 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl TRACE("Destination texture %p is offscreen.\n", dst_texture); buffer = GL_COLOR_ATTACHMENT0; } - context_apply_fbo_state_blit(context, GL_DRAW_FRAMEBUFFER, + wined3d_context_gl_apply_fbo_state_blit(context_gl, GL_DRAW_FRAMEBUFFER, &dst_texture->resource, dst_sub_resource_idx, NULL, 0, dst_location); context_set_draw_buffer(context, buffer); context_check_fbo_status(context, GL_DRAW_FRAMEBUFFER); diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 75abee81ec0..d628d54316a 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -783,18 +783,18 @@ static void context_apply_fbo_state(struct wined3d_context *context, GLenum targ } /* Context activation is done by the caller. */ -void context_apply_fbo_state_blit(struct wined3d_context *context, GLenum target, +void wined3d_context_gl_apply_fbo_state_blit(struct wined3d_context_gl *context_gl, GLenum target, struct wined3d_resource *rt, unsigned int rt_sub_resource_idx, struct wined3d_resource *ds, unsigned int ds_sub_resource_idx, DWORD location) { struct wined3d_rendertarget_info ds_info = {{0}}; - memset(context->blit_targets, 0, sizeof(context->blit_targets)); + memset(context_gl->c.blit_targets, 0, sizeof(context_gl->c.blit_targets)); if (rt) { - context->blit_targets[0].resource = rt; - context->blit_targets[0].sub_resource_idx = rt_sub_resource_idx; - context->blit_targets[0].layer_count = 1; + context_gl->c.blit_targets[0].resource = rt; + context_gl->c.blit_targets[0].sub_resource_idx = rt_sub_resource_idx; + context_gl->c.blit_targets[0].layer_count = 1; } if (ds) @@ -804,7 +804,7 @@ void context_apply_fbo_state_blit(struct wined3d_context *context, GLenum target ds_info.layer_count = 1; } - context_apply_fbo_state(context, target, context->blit_targets, &ds_info, location, location); + context_apply_fbo_state(&context_gl->c, target, context_gl->c.blit_targets, &ds_info, location, location); } /* Context activation is done by the caller. */ @@ -2759,7 +2759,7 @@ void wined3d_context_gl_apply_blit_state(struct wined3d_context_gl *context_gl, { wined3d_texture_load(rt, context, FALSE); - context_apply_fbo_state_blit(context, GL_FRAMEBUFFER, &rt->resource, + wined3d_context_gl_apply_fbo_state_blit(context_gl, GL_FRAMEBUFFER, &rt->resource, context->current_rt.sub_resource_idx, NULL, 0, rt->resource.draw_binding); if (rt->resource.format->id != WINED3DFMT_NULL) rt_mask = 1; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 386ce78f419..a3c17294c64 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -13215,6 +13215,7 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli { struct wined3d_texture_gl *src_texture_gl = wined3d_texture_gl(src_texture); struct wined3d_texture_gl *dst_texture_gl = wined3d_texture_gl(dst_texture); + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); struct wined3d_device *device = dst_texture->resource.device; const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_texture *staging_texture = NULL; @@ -13307,7 +13308,7 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli wined3d_texture_load(src_texture, context, FALSE); } - wined3d_context_gl_apply_blit_state(wined3d_context_gl(context), device); + wined3d_context_gl_apply_blit_state(context_gl, device); if (dst_location == WINED3D_LOCATION_DRAWABLE) { @@ -13330,7 +13331,7 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli TRACE("Destination texture %p is offscreen.\n", dst_texture); buffer = GL_COLOR_ATTACHMENT0; } - context_apply_fbo_state_blit(context, GL_DRAW_FRAMEBUFFER, + wined3d_context_gl_apply_fbo_state_blit(context_gl, GL_DRAW_FRAMEBUFFER, &dst_texture->resource, dst_sub_resource_idx, NULL, 0, dst_location); context_set_draw_buffer(context, buffer); context_check_fbo_status(context, GL_DRAW_FRAMEBUFFER); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 15d8078fa06..3d0d9c0caf6 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -62,6 +62,7 @@ static void texture2d_depth_blt_fbo(const struct wined3d_device *device, struct const RECT *src_rect, struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, DWORD dst_location, const RECT *dst_rect) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context->gl_info; DWORD src_mask, dst_mask; GLbitfield gl_mask; @@ -103,11 +104,11 @@ static void texture2d_depth_blt_fbo(const struct wined3d_device *device, struct else wined3d_texture_prepare_location(dst_texture, dst_sub_resource_idx, context, dst_location); - context_apply_fbo_state_blit(context, GL_READ_FRAMEBUFFER, NULL, 0, + wined3d_context_gl_apply_fbo_state_blit(context_gl, GL_READ_FRAMEBUFFER, NULL, 0, &src_texture->resource, src_sub_resource_idx, src_location); context_check_fbo_status(context, GL_READ_FRAMEBUFFER); - context_apply_fbo_state_blit(context, GL_DRAW_FRAMEBUFFER, NULL, 0, + wined3d_context_gl_apply_fbo_state_blit(context_gl, GL_DRAW_FRAMEBUFFER, NULL, 0, &dst_texture->resource, dst_sub_resource_idx, dst_location); context_set_draw_buffer(context, GL_NONE); context_check_fbo_status(context, GL_DRAW_FRAMEBUFFER); @@ -157,6 +158,7 @@ static void texture2d_blt_fbo(const struct wined3d_device *device, struct wined3 struct wined3d_texture *required_texture, *restore_texture; unsigned int required_idx, restore_idx; const struct wined3d_gl_info *gl_info; + struct wined3d_context_gl *context_gl; GLenum gl_filter; GLenum buffer; RECT s, d; @@ -229,6 +231,7 @@ static void texture2d_blt_fbo(const struct wined3d_device *device, struct wined3 return; } + context_gl = wined3d_context_gl(context); gl_info = context->gl_info; if (src_location == WINED3D_LOCATION_DRAWABLE) @@ -245,7 +248,7 @@ static void texture2d_blt_fbo(const struct wined3d_device *device, struct wined3 buffer = GL_COLOR_ATTACHMENT0; } - context_apply_fbo_state_blit(context, GL_READ_FRAMEBUFFER, + wined3d_context_gl_apply_fbo_state_blit(context_gl, GL_READ_FRAMEBUFFER, &src_texture->resource, src_sub_resource_idx, NULL, 0, src_location); gl_info->gl_ops.gl.p_glReadBuffer(buffer); checkGLcall("glReadBuffer()"); @@ -265,7 +268,7 @@ static void texture2d_blt_fbo(const struct wined3d_device *device, struct wined3 buffer = GL_COLOR_ATTACHMENT0; } - context_apply_fbo_state_blit(context, GL_DRAW_FRAMEBUFFER, + wined3d_context_gl_apply_fbo_state_blit(context_gl, GL_DRAW_FRAMEBUFFER, &dst_texture->resource, dst_sub_resource_idx, NULL, 0, dst_location); context_set_draw_buffer(context, buffer); context_check_fbo_status(context, GL_DRAW_FRAMEBUFFER); @@ -709,6 +712,7 @@ static void texture2d_read_from_framebuffer(struct wined3d_texture *texture, uns const struct wined3d_format_gl *format_gl; struct wined3d_texture *restore_texture; const struct wined3d_gl_info *gl_info; + struct wined3d_context_gl *context_gl; unsigned int row_pitch, slice_pitch; unsigned int width, height, level; struct wined3d_bo_address data; @@ -726,18 +730,19 @@ static void texture2d_read_from_framebuffer(struct wined3d_texture *texture, uns context = context_acquire(device, texture, sub_resource_idx); else restore_texture = NULL; + context_gl = wined3d_context_gl(context); gl_info = context->gl_info; if (src_location != resource->draw_binding) { - context_apply_fbo_state_blit(context, GL_READ_FRAMEBUFFER, + wined3d_context_gl_apply_fbo_state_blit(context_gl, GL_READ_FRAMEBUFFER, resource, sub_resource_idx, NULL, 0, src_location); context_check_fbo_status(context, GL_READ_FRAMEBUFFER); context_invalidate_state(context, STATE_FRAMEBUFFER); } else { - wined3d_context_gl_apply_blit_state(wined3d_context_gl(context), device); + wined3d_context_gl_apply_blit_state(context_gl, device); } /* Select the correct read buffer, and give some debug output. @@ -2156,6 +2161,7 @@ static DWORD ffp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit const struct wined3d_color_key *color_key, enum wined3d_texture_filter_type filter) { struct wined3d_texture_gl *src_texture_gl = wined3d_texture_gl(src_texture); + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_resource *src_resource, *dst_resource; struct wined3d_texture *staging_texture = NULL; @@ -2228,7 +2234,7 @@ static DWORD ffp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit wined3d_texture_load(src_texture, context, FALSE); } - wined3d_context_gl_apply_ffp_blit_state(wined3d_context_gl(context), device); + wined3d_context_gl_apply_ffp_blit_state(context_gl, device); if (dst_location == WINED3D_LOCATION_DRAWABLE) { @@ -2251,7 +2257,7 @@ static DWORD ffp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit TRACE("Destination texture %p is offscreen.\n", dst_texture); buffer = GL_COLOR_ATTACHMENT0; } - context_apply_fbo_state_blit(context, GL_DRAW_FRAMEBUFFER, + wined3d_context_gl_apply_fbo_state_blit(context_gl, GL_DRAW_FRAMEBUFFER, dst_resource, dst_sub_resource_idx, NULL, 0, dst_location); context_set_draw_buffer(context, buffer); context_check_fbo_status(context, GL_DRAW_FRAMEBUFFER); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bb982f8afbd..77d551e1fd1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2067,6 +2067,9 @@ void wined3d_context_gl_apply_blit_state(struct wined3d_context_gl *context_gl, const struct wined3d_device *device) DECLSPEC_HIDDEN; BOOL wined3d_context_gl_apply_clear_state(struct wined3d_context_gl *context_gl, const struct wined3d_state *state, unsigned int rt_count, const struct wined3d_fb_state *fb) DECLSPEC_HIDDEN; +void wined3d_context_gl_apply_fbo_state_blit(struct wined3d_context_gl *context_gl, GLenum target, + struct wined3d_resource *rt, unsigned int rt_sub_resource_idx, + struct wined3d_resource *ds, unsigned int ds_sub_resource_idx, DWORD location) DECLSPEC_HIDDEN; void wined3d_context_gl_apply_ffp_blit_state(struct wined3d_context_gl *context_gl, const struct wined3d_device *device) DECLSPEC_HIDDEN; void wined3d_context_gl_bind_texture(struct wined3d_context_gl *context_gl, @@ -2220,9 +2223,6 @@ BOOL wined3d_clip_blit(const RECT *clip_rect, RECT *clipped, RECT *other) DECLSP struct wined3d_context *context_acquire(const struct wined3d_device *device, struct wined3d_texture *texture, unsigned int sub_resource_idx) DECLSPEC_HIDDEN; -void context_apply_fbo_state_blit(struct wined3d_context *context, GLenum target, - struct wined3d_resource *rt, unsigned int rt_sub_resource_idx, - struct wined3d_resource *ds, unsigned int ds_sub_resource_idx, DWORD location) DECLSPEC_HIDDEN; void context_active_texture(struct wined3d_context *context, const struct wined3d_gl_info *gl_info, unsigned int unit) DECLSPEC_HIDDEN; void context_bind_bo(struct wined3d_context *context, GLenum binding, GLuint name) DECLSPEC_HIDDEN; -- 2.11.0

2 1

[PATCH 2/2] winebus.sys: Correctly set HID device input number in device endpoint path.
by Piotr Caban 15 May '19

15 May '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/winebus.sys/bus.h | 2 +- dlls/winebus.sys/bus_iohid.c | 3 ++- dlls/winebus.sys/bus_sdl.c | 3 ++- dlls/winebus.sys/bus_udev.c | 15 ++++++++++---- dlls/winebus.sys/main.c | 38 ++++++++++++++++++++++++------------ 5 files changed, 42 insertions(+), 19 deletions(-)

2 1

[PATCH 1/2] winebus.sys: Fix typo in endpoint name.
by Piotr Caban 15 May '19

15 May '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/winebus.sys/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

2 1

WineConf 2019
by Ulrich Czekalla 15 May '19

15 May '19

Hi All, As many of you are aware, WineConf 2019 will take place in Toronto, Canada. Specifically, it will be held October 12-13, 2019. I have updated the wikihttps://wiki.winehq.org/WineConf2019 including information on the venue. I will develop the page further as we finalize details and plan on adding a registration link in the next few days. Please subscribe towineconf(a)winehq.org to stay up-to-date with further developments. If you have any questions please don't hesitate to ask on the wineconf mailing list or email me directly. I look forward to hosting and seeing everyone in October. Thanks, -Ulrich

1 1

[PATCH] ntdll: Fix breakpoint exception address on 64-bit Linux.
by Hans Leidekker 15 May '19

15 May '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/kernel32/tests/debugger.c | 10 +++++++++- dlls/ntdll/signal_x86_64.c | 5 ++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index f62a614a97..bd9d61bc4f 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -638,7 +638,15 @@ static void test_debug_loop(int argc, char **argv) if (!ret) break; if (ev.dwDebugEventCode == EXIT_PROCESS_DEBUG_EVENT) break; - +#if defined(__i386__) || defined(__x86_64__) + if (ev.dwDebugEventCode == EXCEPTION_DEBUG_EVENT && + ev.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT) + { + BYTE byte = 0; + NtReadVirtualMemory(pi.hProcess, ev.u.Exception.ExceptionRecord.ExceptionAddress, &byte, 1, NULL); + ok(byte == 0xcc, "got %02x\n", byte); + } +#endif ret = ContinueDebugEvent(ev.dwProcessId, ev.dwThreadId, DBG_CONTINUE); ok(ret, "ContinueDebugEvent failed, last error %#x.\n", GetLastError()); if (!ret) break; diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 21e7098876..1ca7799fd4 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -3134,7 +3134,10 @@ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec->ExceptionCode = EXCEPTION_SINGLE_STEP; break; case TRAP_BRKPT: /* Breakpoint exception */ - /* Check if this is actuallly icebp instruction */ +#ifdef linux + case SI_KERNEL: +#endif + /* Check if this is actually icebp instruction */ if (((unsigned char *)rec->ExceptionAddress)[-1] == 0xF1) { rec->ExceptionCode = EXCEPTION_SINGLE_STEP; -- 2.11.0

1 0

[PATCH 1/3] kernelbase: Duplicate more path API from shlwapi.
by Nikolay Sivov 15 May '19

15 May '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernelbase/kernelbase.spec | 52 +-- dlls/kernelbase/path.c | 560 +++++++++++++++++++++++++++++++- 2 files changed, 585 insertions(+), 27 deletions(-) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index d1bcea5593..e586f500a4 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1060,20 +1060,20 @@ @ stdcall PathFileExistsW(wstr) shlwapi.PathFileExistsW @ stdcall PathFindExtensionA(str) @ stdcall PathFindExtensionW(wstr) -@ stdcall PathFindFileNameA(str) shlwapi.PathFindFileNameA -@ stdcall PathFindFileNameW(wstr) shlwapi.PathFindFileNameW +@ stdcall PathFindFileNameA(str) +@ stdcall PathFindFileNameW(wstr) @ stdcall PathFindNextComponentA(str) shlwapi.PathFindNextComponentA @ stdcall PathFindNextComponentW(wstr) shlwapi.PathFindNextComponentW -@ stdcall PathGetArgsA(str) shlwapi.PathGetArgsA -@ stdcall PathGetArgsW(wstr) shlwapi.PathGetArgsW -@ stdcall PathGetCharTypeA(long) shlwapi.PathGetCharTypeA -@ stdcall PathGetCharTypeW(long) shlwapi.PathGetCharTypeW -@ stdcall PathGetDriveNumberA(str) shlwapi.PathGetDriveNumberA -@ stdcall PathGetDriveNumberW(wstr) shlwapi.PathGetDriveNumberW -@ stdcall PathIsFileSpecA(str) shlwapi.PathIsFileSpecA -@ stdcall PathIsFileSpecW(wstr) shlwapi.PathIsFileSpecW -@ stdcall PathIsLFNFileSpecA(str) shlwapi.PathIsLFNFileSpecA -@ stdcall PathIsLFNFileSpecW(wstr) shlwapi.PathIsLFNFileSpecW +@ stdcall PathGetArgsA(str) +@ stdcall PathGetArgsW(wstr) +@ stdcall PathGetCharTypeA(long) +@ stdcall PathGetCharTypeW(long) +@ stdcall PathGetDriveNumberA(str) +@ stdcall PathGetDriveNumberW(wstr) +@ stdcall PathIsFileSpecA(str) +@ stdcall PathIsFileSpecW(wstr) +@ stdcall PathIsLFNFileSpecA(str) +@ stdcall PathIsLFNFileSpecW(wstr) @ stdcall PathIsPrefixA(str str) @ stdcall PathIsPrefixW(wstr wstr) @ stdcall PathIsRelativeA(str) @@ -1084,15 +1084,15 @@ @ stdcall PathIsSameRootW(wstr wstr) shlwapi.PathIsSameRootW @ stdcall PathIsUNCA(str) @ stdcall PathIsUNCEx(wstr ptr) -@ stdcall PathIsUNCServerA(str) shlwapi.PathIsUNCServerA +@ stdcall PathIsUNCServerA(str) @ stdcall PathIsUNCServerShareA(str) @ stdcall PathIsUNCServerShareW(wstr) -@ stdcall PathIsUNCServerW(wstr) shlwapi.PathIsUNCServerW +@ stdcall PathIsUNCServerW(wstr) @ stdcall PathIsUNCW(wstr) @ stdcall PathIsURLA(str) shlwapi.PathIsURLA @ stdcall PathIsURLW(wstr) shlwapi.PathIsURLW -@ stdcall PathIsValidCharA(long long) shlwapi.PathIsValidCharA -@ stdcall PathIsValidCharW(long long) shlwapi.PathIsValidCharW +@ stdcall PathIsValidCharA(long long) +@ stdcall PathIsValidCharW(long long) @ stdcall PathMatchSpecA(str str) shlwapi.PathMatchSpecA # @ stub PathMatchSpecExA # @ stub PathMatchSpecExW @@ -1103,16 +1103,16 @@ @ stdcall PathQuoteSpacesW(wstr) shlwapi.PathQuoteSpacesW @ stdcall PathRelativePathToA(ptr str long str long) shlwapi.PathRelativePathToA @ stdcall PathRelativePathToW(ptr wstr long wstr long) shlwapi.PathRelativePathToW -@ stdcall PathRemoveBackslashA(str) shlwapi.PathRemoveBackslashA -@ stdcall PathRemoveBackslashW(wstr) shlwapi.PathRemoveBackslashW -@ stdcall PathRemoveBlanksA(str) shlwapi.PathRemoveBlanksA -@ stdcall PathRemoveBlanksW(wstr) shlwapi.PathRemoveBlanksW -@ stdcall PathRemoveExtensionA(str) shlwapi.PathRemoveExtensionA -@ stdcall PathRemoveExtensionW(wstr) shlwapi.PathRemoveExtensionW +@ stdcall PathRemoveBackslashA(str) +@ stdcall PathRemoveBackslashW(wstr) +@ stdcall PathRemoveBlanksA(str) +@ stdcall PathRemoveBlanksW(wstr) +@ stdcall PathRemoveExtensionA(str) +@ stdcall PathRemoveExtensionW(wstr) @ stdcall PathRemoveFileSpecA(str) @ stdcall PathRemoveFileSpecW(wstr) -@ stdcall PathRenameExtensionA(str str) shlwapi.PathRenameExtensionA -@ stdcall PathRenameExtensionW(wstr wstr) shlwapi.PathRenameExtensionW +@ stdcall PathRenameExtensionA(str str) +@ stdcall PathRenameExtensionW(wstr wstr) @ stdcall PathSearchAndQualifyA(str ptr long) shlwapi.PathSearchAndQualifyA @ stdcall PathSearchAndQualifyW(wstr ptr long) shlwapi.PathSearchAndQualifyW @ stdcall PathSkipRootA(str) shlwapi.PathSkipRootA @@ -1123,8 +1123,8 @@ @ stdcall PathStripToRootW(wstr) @ stdcall PathUnExpandEnvStringsA(str ptr long) shlwapi.PathUnExpandEnvStringsA @ stdcall PathUnExpandEnvStringsW(wstr ptr long) shlwapi.PathUnExpandEnvStringsW -@ stdcall PathUnquoteSpacesA(str) shlwapi.PathUnquoteSpacesA -@ stdcall PathUnquoteSpacesW(wstr) shlwapi.PathUnquoteSpacesW +@ stdcall PathUnquoteSpacesA(str) +@ stdcall PathUnquoteSpacesW(wstr) # @ stub PcwAddQueryItem # @ stub PcwClearCounterSetSecurity # @ stub PcwCollectData diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index a72ff8e694..49af28effe 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -23,19 +23,31 @@ #include "winbase.h" #include "pathcch.h" #include "strsafe.h" +#include "shlwapi.h" #include "wine/debug.h" #include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(path); -char *char_next(const char *ptr) +static char *char_next(const char *ptr) { if (!*ptr) return (LPSTR)ptr; if (IsDBCSLeadByte( ptr[0] ) && ptr[1]) return (LPSTR)(ptr + 2); return (LPSTR)(ptr + 1); } +static char * char_prev(const char *start, const char *ptr) +{ + while (*start && (start < ptr)) + { + const char *next = char_next(start); + if (next >= ptr) break; + start = next; + } + return (char *)start; +} + static SIZE_T strnlenW(const WCHAR *string, SIZE_T maxlen) { SIZE_T i; @@ -1618,3 +1630,549 @@ BOOL WINAPI PathIsPrefixW(const WCHAR *prefix, const WCHAR *path) return prefix && path && PathCommonPrefixW(path, prefix, NULL) == (int)strlenW(prefix); } + +char * WINAPI PathFindFileNameA(const char *path) +{ + const char *last_slash = path; + + TRACE("%s\n", wine_dbgstr_a(path)); + + while (path && *path) + { + if ((*path == '\\' || *path == '/' || *path == ':') && + path[1] && path[1] != '\\' && path[1] != '/') + last_slash = path + 1; + path = char_next(path); + } + + return (char *)last_slash; +} + +WCHAR * WINAPI PathFindFileNameW(const WCHAR *path) +{ + const WCHAR *last_slash = path; + + TRACE("%s\n", wine_dbgstr_w(path)); + + while (path && *path) + { + if ((*path == '\\' || *path == '/' || *path == ':') && + path[1] && path[1] != '\\' && path[1] != '/') + last_slash = path + 1; + path++; + } + + return (WCHAR *)last_slash; +} + +char * WINAPI PathGetArgsA(const char *path) +{ + BOOL seen_quote = FALSE; + + TRACE("%s\n", wine_dbgstr_a(path)); + + if (!path) + return NULL; + + while (*path) + { + if (*path == ' ' && !seen_quote) + return (char *)path + 1; + + if (*path == '"') + seen_quote = !seen_quote; + path = char_next(path); + } + + return (char *)path; +} + +WCHAR * WINAPI PathGetArgsW(const WCHAR *path) +{ + BOOL seen_quote = FALSE; + + TRACE("%s\n", wine_dbgstr_w(path)); + + if (!path) + return NULL; + + while (*path) + { + if (*path == ' ' && !seen_quote) + return (WCHAR *)path + 1; + + if (*path == '"') + seen_quote = !seen_quote; + path++; + } + + return (WCHAR *)path; +} + +UINT WINAPI PathGetCharTypeW(WCHAR ch) +{ + UINT flags = 0; + + TRACE("%#x\n", ch); + + if (!ch || ch < ' ' || ch == '<' || ch == '>' || ch == '"' || ch == '|' || ch == '/') + flags = GCT_INVALID; /* Invalid */ + else if (ch == '*' || ch == '?') + flags = GCT_WILD; /* Wildchars */ + else if (ch == '\\' || ch == ':') + return GCT_SEPARATOR; /* Path separators */ + else + { + if (ch < 126) + { + if (((ch & 0x1) && ch != ';') || !ch || isalnum(ch) || ch == '$' || ch == '&' || ch == '(' || + ch == '.' || ch == '@' || ch == '^' || ch == '\'' || ch == 130 || ch == '`') + { + flags |= GCT_SHORTCHAR; /* All these are valid for DOS */ + } + } + else + flags |= GCT_SHORTCHAR; /* Bug compatible with win32 */ + + flags |= GCT_LFNCHAR; /* Valid for long file names */ + } + + return flags; +} + +UINT WINAPI PathGetCharTypeA(UCHAR ch) +{ + return PathGetCharTypeW(ch); +} + +int WINAPI PathGetDriveNumberA(const char *path) +{ + TRACE("%s\n", wine_dbgstr_a(path)); + + if (path && !IsDBCSLeadByte(*path) && path[1] == ':' && tolower(*path) >= 'a' && tolower(*path) <= 'z') + return tolower(*path) - 'a'; + + return -1; +} + +int WINAPI PathGetDriveNumberW(const WCHAR *path) +{ + static const WCHAR nt_prefixW[] = {'\\','\\','?','\\'}; + WCHAR drive; + + TRACE("%s\n", wine_dbgstr_w(path)); + + if (!path) + return -1; + + if (!strncmpW(path, nt_prefixW, 4)) + path += 4; + + drive = tolowerW(path[0]); + if (drive < 'a' || drive > 'z' || path[1] != ':') + return -1; + + return drive - 'a'; +} + +BOOL WINAPI PathIsFileSpecA(const char *path) +{ + TRACE("%s\n", wine_dbgstr_a(path)); + + if (!path) + return FALSE; + + while (*path) + { + if (*path == '\\' || *path == ':') + return FALSE; + path = char_next(path); + } + + return TRUE; +} + +BOOL WINAPI PathIsFileSpecW(const WCHAR *path) +{ + TRACE("%s\n", wine_dbgstr_w(path)); + + if (!path) + return FALSE; + + while (*path) + { + if (*path == '\\' || *path == ':') + return FALSE; + path++; + } + + return TRUE; +} + +BOOL WINAPI PathIsUNCServerA(const char *path) +{ + TRACE("%s\n", wine_dbgstr_a(path)); + + if (!(path && path[0] == '\\' && path[1] == '\\')) + return FALSE; + + while (*path) + { + if (*path == '\\') + return FALSE; + path = char_next(path); + } + + return TRUE; +} + +BOOL WINAPI PathIsUNCServerW(const WCHAR *path) +{ + TRACE("%s\n", wine_dbgstr_w(path)); + + if (!(path && path[0] == '\\' && path[1] == '\\')) + return FALSE; + + return !strchrW(path + 2, '\\'); +} + +void WINAPI PathRemoveBlanksA(char *path) +{ + char *start; + + TRACE("%s\n", wine_dbgstr_a(path)); + + if (!path || !*path) + return; + + start = path; + + while (*path == ' ') + path = char_next(path); + + while (*path) + *start++ = *path++; + + if (start != path) + while (start[-1] == ' ') + start--; + + *start = '\0'; +} + +void WINAPI PathRemoveBlanksW(WCHAR *path) +{ + WCHAR *start = path; + + TRACE("%s\n", wine_dbgstr_w(path)); + + if (!path || !*path) + return; + + while (*path == ' ') + path++; + + while (*path) + *start++ = *path++; + + if (start != path) + while (start[-1] == ' ') + start--; + + *start = '\0'; +} + +void WINAPI PathRemoveExtensionA(char *path) +{ + TRACE("%s\n", wine_dbgstr_a(path)); + + if (!path) + return; + + path = PathFindExtensionA(path); + if (path && !*path) + *path = '\0'; +} + +void WINAPI PathRemoveExtensionW(WCHAR *path) +{ + TRACE("%s\n", wine_dbgstr_w(path)); + + if (!path) + return; + + path = PathFindExtensionW(path); + if (path && !*path) + *path = '\0'; +} + +BOOL WINAPI PathRenameExtensionA(char *path, const char *ext) +{ + char *extension; + + TRACE("%s, %s\n", wine_dbgstr_a(path), wine_dbgstr_a(ext)); + + extension = PathFindExtensionA(path); + + if (!extension || (extension - path + strlen(ext) >= MAX_PATH)) + return FALSE; + + strcpy(extension, ext); + return TRUE; +} + +BOOL WINAPI PathRenameExtensionW(WCHAR *path, const WCHAR *ext) +{ + WCHAR *extension; + + TRACE("%s, %s\n", wine_dbgstr_w(path), wine_dbgstr_w(ext)); + + extension = PathFindExtensionW(path); + + if (!extension || (extension - path + strlenW(ext) >= MAX_PATH)) + return FALSE; + + strcpyW(extension, ext); + return TRUE; +} + +void WINAPI PathUnquoteSpacesA(char *path) +{ + unsigned int len; + + TRACE("%s\n", wine_dbgstr_a(path)); + + if (!path || *path != '"') + return; + + len = strlen(path) - 1; + if (path[len] == '"') + { + path[len] = '\0'; + for (; *path; path++) + *path = path[1]; + } +} + +void WINAPI PathUnquoteSpacesW(WCHAR *path) +{ + unsigned int len; + + TRACE("%s\n", wine_dbgstr_w(path)); + + if (!path || *path != '"') + return; + + len = strlenW(path) - 1; + if (path[len] == '"') + { + path[len] = '\0'; + for (; *path; path++) + *path = path[1]; + } +} + +char * WINAPI PathRemoveBackslashA(char *path) +{ + char *ptr; + + TRACE("%s\n", wine_dbgstr_a(path)); + + if (!path) + return NULL; + + ptr = char_prev(path, path + strlen(path)); + if (!PathIsRootA(path) && *ptr == '\\') + *ptr = '\0'; + + return ptr; +} + +WCHAR * WINAPI PathRemoveBackslashW(WCHAR *path) +{ + WCHAR *ptr; + + TRACE("%s\n", wine_dbgstr_w(path)); + + if (!path) + return NULL; + + ptr = path + strlenW(path); + if (ptr > path) ptr--; + if (!PathIsRootW(path) && *ptr == '\\') + *ptr = '\0'; + + return ptr; +} + +BOOL WINAPI PathIsLFNFileSpecA(const char *path) +{ + unsigned int name_len = 0, ext_len = 0; + + TRACE("%s\n", wine_dbgstr_a(path)); + + if (!path) + return FALSE; + + while (*path) + { + if (*path == ' ') + return TRUE; /* DOS names cannot have spaces */ + if (*path == '.') + { + if (ext_len) + return TRUE; /* DOS names have only one dot */ + ext_len = 1; + } + else if (ext_len) + { + ext_len++; + if (ext_len > 4) + return TRUE; /* DOS extensions are <= 3 chars*/ + } + else + { + name_len++; + if (name_len > 8) + return TRUE; /* DOS names are <= 8 chars */ + } + path = char_next(path); + } + + return FALSE; /* Valid DOS path */ +} + +BOOL WINAPI PathIsLFNFileSpecW(const WCHAR *path) +{ + unsigned int name_len = 0, ext_len = 0; + + TRACE("%s\n", wine_dbgstr_w(path)); + + if (!path) + return FALSE; + + while (*path) + { + if (*path == ' ') + return TRUE; /* DOS names cannot have spaces */ + if (*path == '.') + { + if (ext_len) + return TRUE; /* DOS names have only one dot */ + ext_len = 1; + } + else if (ext_len) + { + ext_len++; + if (ext_len > 4) + return TRUE; /* DOS extensions are <= 3 chars*/ + } + else + { + name_len++; + if (name_len > 8) + return TRUE; /* DOS names are <= 8 chars */ + } + path++; + } + + return FALSE; /* Valid DOS path */ +} + +#define PATH_CHAR_CLASS_LETTER 0x00000001 +#define PATH_CHAR_CLASS_ASTERIX 0x00000002 +#define PATH_CHAR_CLASS_DOT 0x00000004 +#define PATH_CHAR_CLASS_BACKSLASH 0x00000008 +#define PATH_CHAR_CLASS_COLON 0x00000010 +#define PATH_CHAR_CLASS_SEMICOLON 0x00000020 +#define PATH_CHAR_CLASS_COMMA 0x00000040 +#define PATH_CHAR_CLASS_SPACE 0x00000080 +#define PATH_CHAR_CLASS_OTHER_VALID 0x00000100 +#define PATH_CHAR_CLASS_DOUBLEQUOTE 0x00000200 + +#define PATH_CHAR_CLASS_INVALID 0x00000000 +#define PATH_CHAR_CLASS_ANY 0xffffffff + +static const DWORD path_charclass[] = +{ + /* 0x00 */ PATH_CHAR_CLASS_INVALID, /* 0x01 */ PATH_CHAR_CLASS_INVALID, + /* 0x02 */ PATH_CHAR_CLASS_INVALID, /* 0x03 */ PATH_CHAR_CLASS_INVALID, + /* 0x04 */ PATH_CHAR_CLASS_INVALID, /* 0x05 */ PATH_CHAR_CLASS_INVALID, + /* 0x06 */ PATH_CHAR_CLASS_INVALID, /* 0x07 */ PATH_CHAR_CLASS_INVALID, + /* 0x08 */ PATH_CHAR_CLASS_INVALID, /* 0x09 */ PATH_CHAR_CLASS_INVALID, + /* 0x0a */ PATH_CHAR_CLASS_INVALID, /* 0x0b */ PATH_CHAR_CLASS_INVALID, + /* 0x0c */ PATH_CHAR_CLASS_INVALID, /* 0x0d */ PATH_CHAR_CLASS_INVALID, + /* 0x0e */ PATH_CHAR_CLASS_INVALID, /* 0x0f */ PATH_CHAR_CLASS_INVALID, + /* 0x10 */ PATH_CHAR_CLASS_INVALID, /* 0x11 */ PATH_CHAR_CLASS_INVALID, + /* 0x12 */ PATH_CHAR_CLASS_INVALID, /* 0x13 */ PATH_CHAR_CLASS_INVALID, + /* 0x14 */ PATH_CHAR_CLASS_INVALID, /* 0x15 */ PATH_CHAR_CLASS_INVALID, + /* 0x16 */ PATH_CHAR_CLASS_INVALID, /* 0x17 */ PATH_CHAR_CLASS_INVALID, + /* 0x18 */ PATH_CHAR_CLASS_INVALID, /* 0x19 */ PATH_CHAR_CLASS_INVALID, + /* 0x1a */ PATH_CHAR_CLASS_INVALID, /* 0x1b */ PATH_CHAR_CLASS_INVALID, + /* 0x1c */ PATH_CHAR_CLASS_INVALID, /* 0x1d */ PATH_CHAR_CLASS_INVALID, + /* 0x1e */ PATH_CHAR_CLASS_INVALID, /* 0x1f */ PATH_CHAR_CLASS_INVALID, + /* ' ' */ PATH_CHAR_CLASS_SPACE, /* '!' */ PATH_CHAR_CLASS_OTHER_VALID, + /* '"' */ PATH_CHAR_CLASS_DOUBLEQUOTE, /* '#' */ PATH_CHAR_CLASS_OTHER_VALID, + /* '$' */ PATH_CHAR_CLASS_OTHER_VALID, /* '%' */ PATH_CHAR_CLASS_OTHER_VALID, + /* '&' */ PATH_CHAR_CLASS_OTHER_VALID, /* '\'' */ PATH_CHAR_CLASS_OTHER_VALID, + /* '(' */ PATH_CHAR_CLASS_OTHER_VALID, /* ')' */ PATH_CHAR_CLASS_OTHER_VALID, + /* '*' */ PATH_CHAR_CLASS_ASTERIX, /* '+' */ PATH_CHAR_CLASS_OTHER_VALID, + /* ',' */ PATH_CHAR_CLASS_COMMA, /* '-' */ PATH_CHAR_CLASS_OTHER_VALID, + /* '.' */ PATH_CHAR_CLASS_DOT, /* '/' */ PATH_CHAR_CLASS_INVALID, + /* '0' */ PATH_CHAR_CLASS_OTHER_VALID, /* '1' */ PATH_CHAR_CLASS_OTHER_VALID, + /* '2' */ PATH_CHAR_CLASS_OTHER_VALID, /* '3' */ PATH_CHAR_CLASS_OTHER_VALID, + /* '4' */ PATH_CHAR_CLASS_OTHER_VALID, /* '5' */ PATH_CHAR_CLASS_OTHER_VALID, + /* '6' */ PATH_CHAR_CLASS_OTHER_VALID, /* '7' */ PATH_CHAR_CLASS_OTHER_VALID, + /* '8' */ PATH_CHAR_CLASS_OTHER_VALID, /* '9' */ PATH_CHAR_CLASS_OTHER_VALID, + /* ':' */ PATH_CHAR_CLASS_COLON, /* ';' */ PATH_CHAR_CLASS_SEMICOLON, + /* '<' */ PATH_CHAR_CLASS_INVALID, /* '=' */ PATH_CHAR_CLASS_OTHER_VALID, + /* '>' */ PATH_CHAR_CLASS_INVALID, /* '?' */ PATH_CHAR_CLASS_LETTER, + /* '@' */ PATH_CHAR_CLASS_OTHER_VALID, /* 'A' */ PATH_CHAR_CLASS_ANY, + /* 'B' */ PATH_CHAR_CLASS_ANY, /* 'C' */ PATH_CHAR_CLASS_ANY, + /* 'D' */ PATH_CHAR_CLASS_ANY, /* 'E' */ PATH_CHAR_CLASS_ANY, + /* 'F' */ PATH_CHAR_CLASS_ANY, /* 'G' */ PATH_CHAR_CLASS_ANY, + /* 'H' */ PATH_CHAR_CLASS_ANY, /* 'I' */ PATH_CHAR_CLASS_ANY, + /* 'J' */ PATH_CHAR_CLASS_ANY, /* 'K' */ PATH_CHAR_CLASS_ANY, + /* 'L' */ PATH_CHAR_CLASS_ANY, /* 'M' */ PATH_CHAR_CLASS_ANY, + /* 'N' */ PATH_CHAR_CLASS_ANY, /* 'O' */ PATH_CHAR_CLASS_ANY, + /* 'P' */ PATH_CHAR_CLASS_ANY, /* 'Q' */ PATH_CHAR_CLASS_ANY, + /* 'R' */ PATH_CHAR_CLASS_ANY, /* 'S' */ PATH_CHAR_CLASS_ANY, + /* 'T' */ PATH_CHAR_CLASS_ANY, /* 'U' */ PATH_CHAR_CLASS_ANY, + /* 'V' */ PATH_CHAR_CLASS_ANY, /* 'W' */ PATH_CHAR_CLASS_ANY, + /* 'X' */ PATH_CHAR_CLASS_ANY, /* 'Y' */ PATH_CHAR_CLASS_ANY, + /* 'Z' */ PATH_CHAR_CLASS_ANY, /* '[' */ PATH_CHAR_CLASS_OTHER_VALID, + /* '\\' */ PATH_CHAR_CLASS_BACKSLASH, /* ']' */ PATH_CHAR_CLASS_OTHER_VALID, + /* '^' */ PATH_CHAR_CLASS_OTHER_VALID, /* '_' */ PATH_CHAR_CLASS_OTHER_VALID, + /* '`' */ PATH_CHAR_CLASS_OTHER_VALID, /* 'a' */ PATH_CHAR_CLASS_ANY, + /* 'b' */ PATH_CHAR_CLASS_ANY, /* 'c' */ PATH_CHAR_CLASS_ANY, + /* 'd' */ PATH_CHAR_CLASS_ANY, /* 'e' */ PATH_CHAR_CLASS_ANY, + /* 'f' */ PATH_CHAR_CLASS_ANY, /* 'g' */ PATH_CHAR_CLASS_ANY, + /* 'h' */ PATH_CHAR_CLASS_ANY, /* 'i' */ PATH_CHAR_CLASS_ANY, + /* 'j' */ PATH_CHAR_CLASS_ANY, /* 'k' */ PATH_CHAR_CLASS_ANY, + /* 'l' */ PATH_CHAR_CLASS_ANY, /* 'm' */ PATH_CHAR_CLASS_ANY, + /* 'n' */ PATH_CHAR_CLASS_ANY, /* 'o' */ PATH_CHAR_CLASS_ANY, + /* 'p' */ PATH_CHAR_CLASS_ANY, /* 'q' */ PATH_CHAR_CLASS_ANY, + /* 'r' */ PATH_CHAR_CLASS_ANY, /* 's' */ PATH_CHAR_CLASS_ANY, + /* 't' */ PATH_CHAR_CLASS_ANY, /* 'u' */ PATH_CHAR_CLASS_ANY, + /* 'v' */ PATH_CHAR_CLASS_ANY, /* 'w' */ PATH_CHAR_CLASS_ANY, + /* 'x' */ PATH_CHAR_CLASS_ANY, /* 'y' */ PATH_CHAR_CLASS_ANY, + /* 'z' */ PATH_CHAR_CLASS_ANY, /* '{' */ PATH_CHAR_CLASS_OTHER_VALID, + /* '|' */ PATH_CHAR_CLASS_INVALID, /* '}' */ PATH_CHAR_CLASS_OTHER_VALID, + /* '~' */ PATH_CHAR_CLASS_OTHER_VALID +}; + +BOOL WINAPI PathIsValidCharA(char c, DWORD class) +{ + if ((unsigned)c > 0x7e) + return class & PATH_CHAR_CLASS_OTHER_VALID; + + return class & path_charclass[(unsigned)c]; +} + +BOOL WINAPI PathIsValidCharW(WCHAR c, DWORD class) +{ + if (c > 0x7e) + return class & PATH_CHAR_CLASS_OTHER_VALID; + + return class & path_charclass[c]; +} -- 2.20.1

2 5

[PATCH 4/4] kernel32: Forward GetSystemTimeAsFileTime() to NtQuerySystemTime().
by Huw Davies 15 May '19

15 May '19

This relies on FILETIME and LARGE_INTEGER having the same layout. On an i7-8700 CPU @ 3.20GHz with HZ=1000 it cuts the call cost from ~18ns to ~12ns. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/tests/time.c | 15 +++++++++++++++ dlls/kernel32/time.c | 21 --------------------- 3 files changed, 16 insertions(+), 22 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 8346575ac6..f887b1dc8c 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -832,7 +832,7 @@ @ stdcall GetSystemRegistryQuota(ptr ptr) @ stdcall GetSystemTime(ptr) @ stdcall GetSystemTimeAdjustment(ptr ptr ptr) -@ stdcall GetSystemTimeAsFileTime(ptr) +@ stdcall GetSystemTimeAsFileTime(ptr) ntdll.NtQuerySystemTime @ stdcall GetSystemTimePreciseAsFileTime(ptr) @ stdcall GetSystemTimes(ptr ptr ptr) @ stdcall GetSystemWindowsDirectoryA(ptr long) diff --git a/dlls/kernel32/tests/time.c b/dlls/kernel32/tests/time.c index 8bbad2b8a2..536f23359b 100644 --- a/dlls/kernel32/tests/time.c +++ b/dlls/kernel32/tests/time.c @@ -773,6 +773,20 @@ static ULONGLONG get_longlong_time(FILETIME *time) return uli.QuadPart; } +static void test_GetSystemTimeAsFileTime(void) +{ + LARGE_INTEGER t1, t2, t3; + FILETIME ft; + + NtQuerySystemTime( &t1 ); + GetSystemTimeAsFileTime( &ft ); + NtQuerySystemTime( &t3 ); + t2.QuadPart = get_longlong_time( &ft ); + + ok(t1.QuadPart <= t2.QuadPart, "out of order %s %s\n", wine_dbgstr_longlong(t1.QuadPart), wine_dbgstr_longlong(t2.QuadPart)); + ok(t2.QuadPart <= t3.QuadPart, "out of order %s %s\n", wine_dbgstr_longlong(t2.QuadPart), wine_dbgstr_longlong(t3.QuadPart)); +} + static void test_GetSystemTimePreciseAsFileTime(void) { FILETIME ft; @@ -1012,6 +1026,7 @@ START_TEST(time) test_FileTimeToDosDateTime(); test_GetCalendarInfo(); test_GetDynamicTimeZoneInformation(); + test_GetSystemTimeAsFileTime(); test_GetSystemTimePreciseAsFileTime(); test_GetTimeZoneInformationForYear(); } diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 8805c81aaa..3affb725ef 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -750,27 +750,6 @@ BOOL WINAPI TzSpecificLocalTimeToSystemTime( } -/*********************************************************************** - * GetSystemTimeAsFileTime (KERNEL32.@) - * - * Get the current time in utc format. - * - * PARAMS - * time [out] Destination for the current utc time - * - * RETURNS - * Nothing. - */ -void WINAPI GetSystemTimeAsFileTime( FILETIME *time ) -{ - LARGE_INTEGER t; - - NtQuerySystemTime( &t ); - time->dwLowDateTime = t.u.LowPart; - time->dwHighDateTime = t.u.HighPart; -} - - /*********************************************************************** * GetSystemTimePreciseAsFileTime (KERNEL32.@) * -- 2.17.1

2 2

[PATCH v2 5/8] kernel32: Implement GetSystemTimeAsFileTime() directly.
by Huw Davies 15 May '19

15 May '19

On an i7-8700 CPU @ 3.20GHz with HZ=1000 it cuts the call cost from ~18ns to ~12ns. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/kernel32/time.c | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 41742894dd..6516bca972 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -59,6 +59,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(time); #define FILETIME2LL( pft, ll) \ ll = (((LONGLONG)((pft)->dwHighDateTime))<<32) + (pft)-> dwLowDateTime ; +#define TICKSPERSEC 10000000 +#define SECS_1601_TO_1970 ((369 * 365 + 89) * (ULONGLONG)(60 * 60 * 24)) +#define TICKS_1601_TO_1970 (SECS_1601_TO_1970 * TICKSPERSEC) + static const WCHAR mui_stdW[] = { 'M','U','I','_','S','t','d',0 }; static const WCHAR mui_dltW[] = { 'M','U','I','_','D','l','t',0 }; @@ -764,7 +768,38 @@ void WINAPI GetSystemTimeAsFileTime( FILETIME *time ) { LARGE_INTEGER t; - NtQuerySystemTime( &t ); +#ifdef HAVE_CLOCK_GETTIME + struct timespec ts; + static clockid_t clock_id = CLOCK_MONOTONIC; /* placeholder */ + + if (clock_id == CLOCK_MONOTONIC) + { +#ifdef CLOCK_REALTIME_COARSE + struct timespec res; + + /* Use CLOCK_REALTIME_COARSE if it has 1 ms or better resolution */ + if (!clock_getres( CLOCK_REALTIME_COARSE, &res ) && res.tv_sec == 0 && res.tv_nsec <= 1000000) + clock_id = CLOCK_REALTIME_COARSE; + else +#endif /* CLOCK_REALTIME_COARSE */ + clock_id = CLOCK_REALTIME; + } + + if (!clock_gettime( clock_id, &ts )) + { + t.QuadPart = ts.tv_sec * (ULONGLONG)TICKSPERSEC + TICKS_1601_TO_1970; + t.QuadPart += (ts.tv_nsec + 50) / 100; + } + else +#endif /* HAVE_CLOCK_GETTIME */ + { + struct timeval now; + + gettimeofday( &now, 0 ); + t.QuadPart = now.tv_sec * (ULONGLONG)TICKSPERSEC + TICKS_1601_TO_1970; + t.QuadPart += now.tv_usec * 10; + } + time->dwLowDateTime = t.u.LowPart; time->dwHighDateTime = t.u.HighPart; } -- 2.17.1

2 2

[PATCH 3/4] kernel32: Simplify is_not_current().
by Huw Davies 15 May '19

15 May '19

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/kernel32/profile.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 027693e5da..8310ad6fe2 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -713,15 +713,15 @@ static void PROFILE_ReleaseFile(void) * two seconds, so files that are not at least two seconds old might * keep their time even on modification, so don't cache them. */ -static BOOL is_not_current(FILETIME * ft) +static BOOL is_not_current(FILETIME *ft) { - FILETIME Now; - LONGLONG ftll, nowll; - GetSystemTimeAsFileTime(&Now); + LARGE_INTEGER now; + LONGLONG ftll; + + NtQuerySystemTime( &now ); ftll = ((LONGLONG)ft->dwHighDateTime << 32) + ft->dwLowDateTime; - nowll = ((LONGLONG)Now.dwHighDateTime << 32) + Now.dwLowDateTime; - TRACE("%08x;%08x\n",(unsigned)ftll+21000000,(unsigned)nowll); - return ftll + 21000000 < nowll; + TRACE("%s; %s\n", wine_dbgstr_longlong(ftll), wine_dbgstr_longlong(now.QuadPart)); + return ftll + 21000000 < now.QuadPart; } /*********************************************************************** -- 2.17.1

1 0