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

[PATCH 5/5] wined3d: Use texture2d_load_sysmem() in texture1d_load_location().
by Henri Verbeet 17 Jun '19

17 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 62 ++------------------------- dlls/wined3d/texture.c | 97 +++++++++++++++++++++++------------------- dlls/wined3d/wined3d_private.h | 38 +++++++++++------ 3 files changed, 81 insertions(+), 116 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8d67e52afa2..33b60d2bc0b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -138,15 +138,6 @@ static void texture2d_depth_blt_fbo(const struct wined3d_device *device, struct checkGLcall("glBlitFramebuffer()"); } -static BOOL is_multisample_location(const struct wined3d_texture_gl *texture_gl, DWORD location) -{ - if (location == WINED3D_LOCATION_RB_MULTISAMPLE) - return TRUE; - if (location != WINED3D_LOCATION_TEXTURE_RGB && location != WINED3D_LOCATION_TEXTURE_SRGB) - return FALSE; - return texture_gl->target == GL_TEXTURE_2D_MULTISAMPLE || texture_gl->target == GL_TEXTURE_2D_MULTISAMPLE_ARRAY; -} - /* Blit between surface locations. Onscreen on different swapchains is not supported. * Depth / stencil is not supported. Context activation is done by the caller. */ static void texture2d_blt_fbo(struct wined3d_device *device, struct wined3d_context *context, @@ -185,7 +176,7 @@ static void texture2d_blt_fbo(struct wined3d_device *device, struct wined3d_cont } /* Resolve the source surface first if needed. */ - if (is_multisample_location(wined3d_texture_gl(src_texture), src_location) + if (wined3d_texture_gl_is_multisample_location(wined3d_texture_gl(src_texture), src_location) && (src_texture->resource.format->id != dst_texture->resource.format->id || abs(src_rect->bottom - src_rect->top) != abs(dst_rect->bottom - dst_rect->top) || abs(src_rect->right - src_rect->left) != abs(dst_rect->right - dst_rect->left))) @@ -708,7 +699,7 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr return dst_texture; } -static void texture2d_read_from_framebuffer(struct wined3d_texture *texture, unsigned int sub_resource_idx, +void texture2d_read_from_framebuffer(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD src_location, DWORD dst_location) { struct wined3d_resource *resource = &texture->resource; @@ -1432,52 +1423,6 @@ static HRESULT wined3d_texture_blt_special(struct wined3d_texture *dst_texture, } /* Context activation is done by the caller. */ -BOOL texture2d_load_sysmem(struct wined3d_texture *texture, unsigned int sub_resource_idx, - struct wined3d_context *context, DWORD dst_location) -{ - struct wined3d_texture_sub_resource *sub_resource; - - sub_resource = &texture->sub_resources[sub_resource_idx]; - wined3d_texture_prepare_location(texture, sub_resource_idx, context, dst_location); - - /* We cannot download data from multisample textures directly. */ - if (is_multisample_location(wined3d_texture_gl(texture), WINED3D_LOCATION_TEXTURE_RGB)) - { - wined3d_texture_load_location(texture, sub_resource_idx, context, WINED3D_LOCATION_RB_RESOLVED); - texture2d_read_from_framebuffer(texture, sub_resource_idx, context, - WINED3D_LOCATION_RB_RESOLVED, dst_location); - return TRUE; - } - - if (sub_resource->locations & (WINED3D_LOCATION_RB_MULTISAMPLE | WINED3D_LOCATION_RB_RESOLVED)) - wined3d_texture_load_location(texture, sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); - - /* Download the sub-resource to system memory. */ - if (sub_resource->locations & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB)) - { - struct wined3d_bo_address data; - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), wined3d_context_gl(context), - !(sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB)); - wined3d_texture_get_memory(texture, sub_resource_idx, &data, dst_location); - wined3d_texture_download_data(texture, sub_resource_idx, context, &data); - ++texture->download_count; - return TRUE; - } - - if (!(texture->resource.bind_flags & WINED3D_BIND_DEPTH_STENCIL) - && (sub_resource->locations & WINED3D_LOCATION_DRAWABLE)) - { - texture2d_read_from_framebuffer(texture, sub_resource_idx, context, - texture->resource.draw_binding, dst_location); - return TRUE; - } - - FIXME("Can't load texture %p, %u with location flags %s into sysmem.\n", - texture, sub_resource_idx, wined3d_debug_location(sub_resource->locations)); - return FALSE; -} - -/* Context activation is done by the caller. */ BOOL texture2d_load_drawable(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context) { @@ -3359,7 +3304,8 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_ TRACE("Not doing download because of format conversion.\n"); else if (src_texture->resource.format->conv_byte_count) TRACE("Not doing download because the source format needs conversion.\n"); - else if (is_multisample_location(wined3d_texture_gl(src_texture), WINED3D_LOCATION_TEXTURE_RGB)) + else if (wined3d_texture_gl_is_multisample_location(wined3d_texture_gl(src_texture), + WINED3D_LOCATION_TEXTURE_RGB)) TRACE("Not doing download because of multisample source.\n"); else if (!texture2d_is_full_rect(src_texture, src_sub_resource_idx % src_texture->level_count, &src_rect)) TRACE("Not doing download because of partial download (src).\n"); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 16f0a56875f..13ebd311718 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2433,6 +2433,53 @@ void wined3d_texture_download_data(struct wined3d_texture *texture, unsigned int } } +/* Context activation is done by the caller. */ +static BOOL wined3d_texture_gl_load_sysmem(struct wined3d_texture_gl *texture_gl, + unsigned int sub_resource_idx, struct wined3d_context_gl *context_gl, DWORD dst_location) +{ + struct wined3d_texture_sub_resource *sub_resource; + + sub_resource = &texture_gl->t.sub_resources[sub_resource_idx]; + wined3d_texture_prepare_location(&texture_gl->t, sub_resource_idx, &context_gl->c, dst_location); + + /* We cannot download data from multisample textures directly. */ + if (wined3d_texture_gl_is_multisample_location(texture_gl, WINED3D_LOCATION_TEXTURE_RGB)) + { + wined3d_texture_load_location(&texture_gl->t, sub_resource_idx, &context_gl->c, WINED3D_LOCATION_RB_RESOLVED); + texture2d_read_from_framebuffer(&texture_gl->t, sub_resource_idx, &context_gl->c, + WINED3D_LOCATION_RB_RESOLVED, dst_location); + return TRUE; + } + + if (sub_resource->locations & (WINED3D_LOCATION_RB_MULTISAMPLE | WINED3D_LOCATION_RB_RESOLVED)) + wined3d_texture_load_location(&texture_gl->t, sub_resource_idx, &context_gl->c, WINED3D_LOCATION_TEXTURE_RGB); + + /* Download the sub-resource to system memory. */ + if (sub_resource->locations & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB)) + { + struct wined3d_bo_address data; + wined3d_texture_gl_bind_and_dirtify(texture_gl, context_gl, + !(sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB)); + wined3d_texture_get_memory(&texture_gl->t, sub_resource_idx, &data, dst_location); + wined3d_texture_download_data(&texture_gl->t, sub_resource_idx, &context_gl->c, &data); + ++texture_gl->t.download_count; + return TRUE; + } + + if (!(texture_gl->t.resource.bind_flags & WINED3D_BIND_DEPTH_STENCIL) + && (sub_resource->locations & WINED3D_LOCATION_DRAWABLE)) + { + texture2d_read_from_framebuffer(&texture_gl->t, sub_resource_idx, &context_gl->c, + texture_gl->t.resource.draw_binding, dst_location); + return TRUE; + } + + FIXME("Can't load texture %p, %u with location flags %s into sysmem.\n", + texture_gl, sub_resource_idx, wined3d_debug_location(sub_resource->locations)); + + return FALSE; +} + /* Context activation is done by the caller. Context may be NULL in ddraw-only mode. */ static BOOL texture2d_load_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location) @@ -2445,7 +2492,8 @@ static BOOL texture2d_load_location(struct wined3d_texture *texture, unsigned in case WINED3D_LOCATION_USER_MEMORY: case WINED3D_LOCATION_SYSMEM: case WINED3D_LOCATION_BUFFER: - return texture2d_load_sysmem(texture, sub_resource_idx, context, location); + return wined3d_texture_gl_load_sysmem(wined3d_texture_gl(texture), + sub_resource_idx, wined3d_context_gl(context), location); case WINED3D_LOCATION_DRAWABLE: return texture2d_load_drawable(texture, sub_resource_idx, context); @@ -2845,6 +2893,7 @@ static BOOL texture1d_load_location(struct wined3d_texture *texture, unsigned in struct wined3d_context *context, DWORD location) { struct wined3d_texture_sub_resource *sub_resource = &texture->sub_resources[sub_resource_idx]; + struct wined3d_texture_gl *texture_gl = wined3d_texture_gl(texture); struct wined3d_context_gl *context_gl = wined3d_context_gl(context); unsigned int row_pitch, slice_pitch; @@ -2864,8 +2913,7 @@ static BOOL texture1d_load_location(struct wined3d_texture *texture, unsigned in struct wined3d_box src_box; data.addr += sub_resource->offset; - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), - context_gl, location == WINED3D_LOCATION_TEXTURE_SRGB); + wined3d_texture_gl_bind_and_dirtify(texture_gl, context_gl, location == WINED3D_LOCATION_TEXTURE_SRGB); wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); wined3d_texture_get_level_box(texture, sub_resource_idx % texture->level_count, &src_box); wined3d_texture_upload_data(texture, sub_resource_idx, context, texture->resource.format, @@ -2876,8 +2924,7 @@ static BOOL texture1d_load_location(struct wined3d_texture *texture, unsigned in struct wined3d_const_bo_address data = {sub_resource->buffer_object, NULL}; struct wined3d_box src_box; - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context_gl, - location == WINED3D_LOCATION_TEXTURE_SRGB); + wined3d_texture_gl_bind_and_dirtify(texture_gl, context_gl, location == WINED3D_LOCATION_TEXTURE_SRGB); wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); wined3d_texture_get_level_box(texture, sub_resource_idx % texture->level_count, &src_box); wined3d_texture_upload_data(texture, sub_resource_idx, context, texture->resource.format, @@ -2891,46 +2938,8 @@ static BOOL texture1d_load_location(struct wined3d_texture *texture, unsigned in break; case WINED3D_LOCATION_SYSMEM: - if (sub_resource->locations & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB)) - { - struct wined3d_bo_address data = {0, texture->resource.heap_memory}; - - data.addr += sub_resource->offset; - if (sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB) - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context_gl, FALSE); - else - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context_gl, TRUE); - - wined3d_texture_download_data(texture, sub_resource_idx, context, &data); - ++texture->download_count; - } - else - { - FIXME("Implement WINED3D_LOCATION_SYSMEM loading from %s.\n", - wined3d_debug_location(sub_resource->locations)); - return FALSE; - } - break; - case WINED3D_LOCATION_BUFFER: - if (sub_resource->locations & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB)) - { - struct wined3d_bo_address data = {sub_resource->buffer_object, NULL}; - - if (sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB) - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context_gl, FALSE); - else - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context_gl, TRUE); - - wined3d_texture_download_data(texture, sub_resource_idx, context, &data); - } - else - { - FIXME("Implement WINED3D_LOCATION_BUFFER loading from %s.\n", - wined3d_debug_location(sub_resource->locations)); - return FALSE; - } - break; + return wined3d_texture_gl_load_sysmem(texture_gl, sub_resource_idx, context_gl, location); default: FIXME("Implement %s loading from %s.\n", wined3d_debug_location(location), diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bbcc6acf164..aebaa9ed2f2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3372,6 +3372,18 @@ void wined3d_resource_update_draw_binding(struct wined3d_resource *resource) DEC #define RESOURCE_ALIGNMENT 16 #define WINED3D_CONSTANT_BUFFER_ALIGNMENT 16 +#define WINED3D_LOCATION_DISCARDED 0x00000001 +#define WINED3D_LOCATION_SYSMEM 0x00000002 +#define WINED3D_LOCATION_USER_MEMORY 0x00000004 +#define WINED3D_LOCATION_BUFFER 0x00000008 +#define WINED3D_LOCATION_TEXTURE_RGB 0x00000010 +#define WINED3D_LOCATION_TEXTURE_SRGB 0x00000020 +#define WINED3D_LOCATION_DRAWABLE 0x00000040 +#define WINED3D_LOCATION_RB_MULTISAMPLE 0x00000080 +#define WINED3D_LOCATION_RB_RESOLVED 0x00000100 + +const char *wined3d_debug_location(DWORD location) DECLSPEC_HIDDEN; + struct wined3d_blt_info { GLenum bind_target; @@ -3533,10 +3545,10 @@ void texture2d_load_fb_texture(struct wined3d_texture_gl *texture_gl, unsigned i BOOL srgb, struct wined3d_context *context) DECLSPEC_HIDDEN; BOOL texture2d_load_renderbuffer(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD dst_location) DECLSPEC_HIDDEN; -BOOL texture2d_load_sysmem(struct wined3d_texture *texture, unsigned int sub_resource_idx, - struct wined3d_context *context, DWORD dst_location) DECLSPEC_HIDDEN; BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; +void texture2d_read_from_framebuffer(struct wined3d_texture *texture, unsigned int sub_resource_idx, + struct wined3d_context *context, DWORD src_location, DWORD dst_location) DECLSPEC_HIDDEN; HRESULT wined3d_texture_check_box_dimensions(const struct wined3d_texture *texture, unsigned int level, const struct wined3d_box *box) DECLSPEC_HIDDEN; @@ -3622,6 +3634,16 @@ static inline GLenum wined3d_texture_gl_get_sub_resource_target(const struct win ? cube_targets[sub_resource_idx / texture_gl->t.level_count] : texture_gl->target; } +static inline BOOL wined3d_texture_gl_is_multisample_location(const struct wined3d_texture_gl *texture_gl, + DWORD location) +{ + if (location == WINED3D_LOCATION_RB_MULTISAMPLE) + return TRUE; + if (location != WINED3D_LOCATION_TEXTURE_RGB && location != WINED3D_LOCATION_TEXTURE_SRGB) + return FALSE; + return texture_gl->target == GL_TEXTURE_2D_MULTISAMPLE || texture_gl->target == GL_TEXTURE_2D_MULTISAMPLE_ARRAY; +} + void wined3d_texture_gl_apply_sampler_desc(struct wined3d_texture_gl *texture_gl, const struct wined3d_sampler_desc *sampler_desc, const struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; void wined3d_texture_gl_bind(struct wined3d_texture_gl *texture_gl, @@ -3634,18 +3656,6 @@ void wined3d_texture_gl_set_compatible_renderbuffer(struct wined3d_texture_gl *t struct wined3d_context_gl *context_gl, unsigned int level, const struct wined3d_rendertarget_info *rt) DECLSPEC_HIDDEN; -#define WINED3D_LOCATION_DISCARDED 0x00000001 -#define WINED3D_LOCATION_SYSMEM 0x00000002 -#define WINED3D_LOCATION_USER_MEMORY 0x00000004 -#define WINED3D_LOCATION_BUFFER 0x00000008 -#define WINED3D_LOCATION_TEXTURE_RGB 0x00000010 -#define WINED3D_LOCATION_TEXTURE_SRGB 0x00000020 -#define WINED3D_LOCATION_DRAWABLE 0x00000040 -#define WINED3D_LOCATION_RB_MULTISAMPLE 0x00000080 -#define WINED3D_LOCATION_RB_RESOLVED 0x00000100 - -const char *wined3d_debug_location(DWORD location) DECLSPEC_HIDDEN; - struct wined3d_renderbuffer_entry { struct list entry; -- 2.11.0

1 0

[PATCH 4/5] wined3d: Pass a wined3d_context_gl structure to context_apply_blit_projection().
by Henri Verbeet 17 Jun '19

17 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 0aaeac76002..ea9f1763908 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2870,9 +2870,10 @@ void wined3d_context_gl_apply_blit_state(struct wined3d_context_gl *context_gl, checkGLcall("blit state application"); } -static void context_apply_blit_projection(const struct wined3d_context *context, unsigned int w, unsigned int h) +static void wined3d_context_gl_apply_blit_projection(const struct wined3d_context_gl *context_gl, + unsigned int w, unsigned int h) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; const GLdouble projection[] = { 2.0 / w, 0.0, 0.0, 0.0, @@ -2904,7 +2905,7 @@ void wined3d_context_gl_apply_ffp_blit_state(struct wined3d_context_gl *context_ wined3d_context_gl_get_rt_size(context_gl, &rt_size); if (context_gl->blit_size.cx != rt_size.cx || context_gl->blit_size.cy != rt_size.cy) - context_apply_blit_projection(context, rt_size.cx, rt_size.cy); + wined3d_context_gl_apply_blit_projection(context_gl, rt_size.cx, rt_size.cy); wined3d_context_gl_apply_blit_state(context_gl, device); checkGLcall("ffp blit state application"); @@ -2958,7 +2959,7 @@ void wined3d_context_gl_apply_ffp_blit_state(struct wined3d_context_gl *context_ gl_info->gl_ops.gl.p_glMatrixMode(GL_MODELVIEW); gl_info->gl_ops.gl.p_glLoadIdentity(); context_invalidate_state(context, STATE_TRANSFORM(WINED3D_TS_WORLD_MATRIX(0))); - context_apply_blit_projection(context, context_gl->blit_size.cx, context_gl->blit_size.cy); + wined3d_context_gl_apply_blit_projection(context_gl, context_gl->blit_size.cx, context_gl->blit_size.cy); context_invalidate_state(context, STATE_TRANSFORM(WINED3D_TS_PROJECTION)); /* Other misc states. */ -- 2.11.0

1 0

[PATCH 3/5] wined3d: Pass a wined3d_context_gl structure to context_set_render_offscreen().
by Henri Verbeet 17 Jun '19

17 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 66c7d79c19c..0aaeac76002 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2685,23 +2685,23 @@ void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, } } -static void context_set_render_offscreen(struct wined3d_context *context, BOOL offscreen) +static void wined3d_context_gl_set_render_offscreen(struct wined3d_context_gl *context_gl, BOOL offscreen) { - if (context->render_offscreen == offscreen) + if (context_gl->c.render_offscreen == offscreen) return; - context_invalidate_state(context, STATE_VIEWPORT); - context_invalidate_state(context, STATE_SCISSORRECT); - if (!context->gl_info->supported[ARB_CLIP_CONTROL]) + context_invalidate_state(&context_gl->c, STATE_VIEWPORT); + context_invalidate_state(&context_gl->c, STATE_SCISSORRECT); + if (!context_gl->c.gl_info->supported[ARB_CLIP_CONTROL]) { - context_invalidate_state(context, STATE_RASTERIZER); - context_invalidate_state(context, STATE_POINTSPRITECOORDORIGIN); - context_invalidate_state(context, STATE_TRANSFORM(WINED3D_TS_PROJECTION)); + context_invalidate_state(&context_gl->c, STATE_RASTERIZER); + context_invalidate_state(&context_gl->c, STATE_POINTSPRITECOORDORIGIN); + context_invalidate_state(&context_gl->c, STATE_TRANSFORM(WINED3D_TS_PROJECTION)); } - context_invalidate_state(context, STATE_SHADER(WINED3D_SHADER_TYPE_DOMAIN)); - if (context->gl_info->supported[ARB_FRAGMENT_COORD_CONVENTIONS]) - context_invalidate_state(context, STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL)); - context->render_offscreen = offscreen; + context_invalidate_state(&context_gl->c, STATE_SHADER(WINED3D_SHADER_TYPE_DOMAIN)); + if (context_gl->c.gl_info->supported[ARB_FRAGMENT_COORD_CONVENTIONS]) + context_invalidate_state(&context_gl->c, STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL)); + context_gl->c.render_offscreen = offscreen; } GLenum wined3d_context_gl_get_offscreen_gl_buffer(const struct wined3d_context_gl *context_gl) @@ -3928,7 +3928,7 @@ static BOOL context_apply_draw_state(struct wined3d_context *context, return FALSE; } - context_set_render_offscreen(context, TRUE); + wined3d_context_gl_set_render_offscreen(context_gl, TRUE); } /* Preload resources before FBO setup. Texture preload in particular may @@ -4126,6 +4126,7 @@ static void context_setup_target(struct wined3d_context *context, struct wined3d_texture *texture, unsigned int sub_resource_idx) { BOOL old_render_offscreen = context->render_offscreen, render_offscreen; + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); render_offscreen = wined3d_resource_is_offscreen(&texture->resource); if (context->current_rt.texture == texture @@ -4181,7 +4182,7 @@ static void context_setup_target(struct wined3d_context *context, context->current_rt.texture = texture; context->current_rt.sub_resource_idx = sub_resource_idx; - context_set_render_offscreen(context, render_offscreen); + wined3d_context_gl_set_render_offscreen(context_gl, render_offscreen); } static void wined3d_context_gl_activate(struct wined3d_context_gl *context_gl, -- 2.11.0

1 0

[PATCH 2/5] wined3d: Pass a wined3d_context_gl structure to context_apply_draw_buffers().
by Henri Verbeet 17 Jun '19

17 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 6a787a290e5..66c7d79c19c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2444,9 +2444,9 @@ static inline GLenum draw_buffer_from_rt_mask(DWORD rt_mask) } /* Context activation is done by the caller. */ -static void context_apply_draw_buffers(struct wined3d_context *context, DWORD rt_mask) +static void wined3d_context_gl_apply_draw_buffers(struct wined3d_context_gl *context_gl, uint32_t rt_mask) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; GLenum draw_buffers[MAX_RENDER_TARGET_VIEWS]; if (!rt_mask) @@ -2775,7 +2775,7 @@ void wined3d_context_gl_apply_blit_state(struct wined3d_context_gl *context_gl, if (rt_mask != *cur_mask) { - context_apply_draw_buffers(context, rt_mask); + wined3d_context_gl_apply_draw_buffers(context_gl, rt_mask); *cur_mask = rt_mask; } @@ -3079,7 +3079,7 @@ BOOL wined3d_context_gl_apply_clear_state(struct wined3d_context_gl *context_gl, if (rt_mask != *cur_mask) { - context_apply_draw_buffers(&context_gl->c, rt_mask); + wined3d_context_gl_apply_draw_buffers(context_gl, rt_mask); *cur_mask = rt_mask; context_invalidate_state(&context_gl->c, STATE_FRAMEBUFFER); } @@ -3195,7 +3195,7 @@ void context_state_fb(struct wined3d_context *context, const struct wined3d_stat cur_mask = context_gl->current_fbo ? &context_gl->current_fbo->rt_mask : &context_gl->draw_buffers_mask; if (rt_mask != *cur_mask) { - context_apply_draw_buffers(context, rt_mask); + wined3d_context_gl_apply_draw_buffers(context_gl, rt_mask); *cur_mask = rt_mask; } context->constant_update_mask |= WINED3D_SHADER_CONST_PS_Y_CORR; @@ -3451,7 +3451,7 @@ void context_state_drawbuf(struct wined3d_context *context, const struct wined3d rt_mask = find_draw_buffers_mask(context_gl, state); if (rt_mask != *cur_mask) { - context_apply_draw_buffers(context, rt_mask); + wined3d_context_gl_apply_draw_buffers(context_gl, rt_mask); *cur_mask = rt_mask; } } -- 2.11.0

1 0

[PATCH 1/5] wined3d: Pass a wined3d_context_gl structure to context_create_fbo_entry().
by Henri Verbeet 17 Jun '19

17 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 6258771976a..6a787a290e5 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -514,12 +514,11 @@ static void wined3d_context_gl_generate_fbo_key(const struct wined3d_context_gl memset(&key->objects[buffers + 1], 0, (ARRAY_SIZE(key->objects) - buffers - 1) * sizeof(*key->objects)); } -static struct fbo_entry *context_create_fbo_entry(const struct wined3d_context *context, +static struct fbo_entry *wined3d_context_gl_create_fbo_entry(const struct wined3d_context_gl *context_gl, const struct wined3d_rendertarget_info *render_targets, const struct wined3d_rendertarget_info *depth_stencil, DWORD color_location, DWORD ds_location) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct fbo_entry *entry; entry = heap_alloc(sizeof(*entry)); @@ -691,7 +690,8 @@ static struct fbo_entry *wined3d_context_gl_find_fbo_entry(struct wined3d_contex if (context_gl->fbo_entry_count < WINED3D_MAX_FBO_ENTRIES) { - entry = context_create_fbo_entry(&context_gl->c, render_targets, depth_stencil, color_location, ds_location); + entry = wined3d_context_gl_create_fbo_entry(context_gl, + render_targets, depth_stencil, color_location, ds_location); list_add_head(&context_gl->fbo_list, &entry->entry); ++context_gl->fbo_entry_count; } -- 2.11.0

1 0

[PATCH 2/2] bcrypt: Add support for BCRYPT_RSA_SIGN_ALGORITHM.
by Hans Leidekker 17 Jun '19

17 Jun '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47371 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt_main.c | 1 + dlls/bcrypt/tests/bcrypt.c | 47 ++++++++++++++++++++++++++++++++++++++ include/bcrypt.h | 2 ++ 3 files changed, 50 insertions(+) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 86073bbab0..3846341644 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -193,6 +193,7 @@ NTSTATUS WINAPI BCryptOpenAlgorithmProvider( BCRYPT_ALG_HANDLE *handle, LPCWSTR else if (!strcmpW( id, BCRYPT_MD5_ALGORITHM )) alg_id = ALG_ID_MD5; else if (!strcmpW( id, BCRYPT_RNG_ALGORITHM )) alg_id = ALG_ID_RNG; else if (!strcmpW( id, BCRYPT_RSA_ALGORITHM )) alg_id = ALG_ID_RSA; + else if (!strcmpW( id, BCRYPT_RSA_SIGN_ALGORITHM )) alg_id = ALG_ID_RSA; else if (!strcmpW( id, BCRYPT_SHA1_ALGORITHM )) alg_id = ALG_ID_SHA1; else if (!strcmpW( id, BCRYPT_SHA256_ALGORITHM )) alg_id = ALG_ID_SHA256; else if (!strcmpW( id, BCRYPT_SHA384_ALGORITHM )) alg_id = ALG_ID_SHA384; diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 8e57d53e21..11e274bc5f 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -1808,6 +1808,52 @@ static void test_RSA(void) ok(!ret, "pBCryptCloseAlgorithmProvider failed: %08x\n", ret); } +static void test_RSA_SIGN(void) +{ + BCRYPT_PKCS1_PADDING_INFO pad; + BCRYPT_ALG_HANDLE alg = NULL; + BCRYPT_KEY_HANDLE key = NULL; + NTSTATUS ret; + + ret = pBCryptOpenAlgorithmProvider(&alg, BCRYPT_RSA_SIGN_ALGORITHM, NULL, 0); + if (ret) + { + win_skip("Failed to open RSA_SIGN provider: %08x, skipping test\n", ret); + return; + } + + ret = pBCryptImportKeyPair(alg, NULL, BCRYPT_RSAPUBLIC_BLOB, &key, rsaPublicBlob, sizeof(rsaPublicBlob), 0); + ok(!ret, "pBCryptImportKeyPair failed: %08x\n", ret); + + pad.pszAlgId = BCRYPT_SHA1_ALGORITHM; + ret = pBCryptVerifySignature(key, &pad, rsaHash, sizeof(rsaHash), rsaSignature, sizeof(rsaSignature), BCRYPT_PAD_PKCS1); + ok(!ret, "pBCryptVerifySignature failed: %08x\n", ret); + + ret = pBCryptVerifySignature(key, NULL, rsaHash, sizeof(rsaHash), rsaSignature, sizeof(rsaSignature), BCRYPT_PAD_PKCS1); + ok(ret == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", ret); + + pad.pszAlgId = BCRYPT_SHA1_ALGORITHM; + ret = pBCryptVerifySignature(key, &pad, rsaHash, sizeof(rsaHash), rsaSignature, sizeof(rsaSignature), 0); + ok(ret == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", ret); + + ret = pBCryptVerifySignature(key, NULL, rsaHash, sizeof(rsaHash), rsaSignature, sizeof(rsaSignature), 0); + ok(ret == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", ret); + + pad.pszAlgId = BCRYPT_AES_ALGORITHM; + ret = pBCryptVerifySignature(key, &pad, rsaHash, sizeof(rsaHash), rsaSignature, sizeof(rsaSignature), BCRYPT_PAD_PKCS1); + ok(ret == STATUS_NOT_SUPPORTED, "Expected STATUS_NOT_SUPPORTED, got %08x\n", ret); + + pad.pszAlgId = NULL; + ret = pBCryptVerifySignature(key, &pad, rsaHash, sizeof(rsaHash), rsaSignature, sizeof(rsaSignature), BCRYPT_PAD_PKCS1); + ok(ret == STATUS_INVALID_SIGNATURE, "Expected STATUS_INVALID_SIGNATURE, got %08x\n", ret); + + ret = pBCryptDestroyKey(key); + ok(!ret, "pBCryptDestroyKey failed: %08x\n", ret); + + ret = pBCryptCloseAlgorithmProvider(alg, 0); + ok(!ret, "pBCryptCloseAlgorithmProvider failed: %08x\n", ret); +} + static BYTE eccprivkey[] = { 0x45, 0x43, 0x4b, 0x32, 0x20, 0x00, 0x00, 0x00, 0xfb, 0xbd, 0x3d, 0x20, 0x1b, 0x6d, 0x66, 0xb3, @@ -1963,6 +2009,7 @@ START_TEST(bcrypt) test_key_import_export(); test_ECDSA(); test_RSA(); + test_RSA_SIGN(); test_ECDH(); test_BCryptEnumContextFunctions(); diff --git a/include/bcrypt.h b/include/bcrypt.h index 8947d130f9..4638e51dcf 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -76,6 +76,7 @@ typedef LONG NTSTATUS; #define BCRYPT_MD5_ALGORITHM L"MD5" #define BCRYPT_RNG_ALGORITHM L"RNG" #define BCRYPT_RSA_ALGORITHM L"RSA" +#define BCRYPT_RSA_SIGN_ALGORITHM L"RSA_SIGN" #define BCRYPT_SHA1_ALGORITHM L"SHA1" #define BCRYPT_SHA256_ALGORITHM L"SHA256" #define BCRYPT_SHA384_ALGORITHM L"SHA384" @@ -129,6 +130,7 @@ static const WCHAR BCRYPT_MD4_ALGORITHM[] = {'M','D','4',0}; static const WCHAR BCRYPT_MD5_ALGORITHM[] = {'M','D','5',0}; static const WCHAR BCRYPT_RNG_ALGORITHM[] = {'R','N','G',0}; static const WCHAR BCRYPT_RSA_ALGORITHM[] = {'R','S','A',0}; +static const WCHAR BCRYPT_RSA_SIGN_ALGORITHM[] = {'R','S','A','_','S','I','G','N',0}; static const WCHAR BCRYPT_SHA1_ALGORITHM[] = {'S','H','A','1',0}; static const WCHAR BCRYPT_SHA256_ALGORITHM[] = {'S','H','A','2','5','6',0}; static const WCHAR BCRYPT_SHA384_ALGORITHM[] = {'S','H','A','3','8','4',0}; -- 2.20.1

1 0

[PATCH 1/2] bcrypt: Add stub implementations of BCryptEnumContextFunctions and BCryptFreeBuffer.
by Hans Leidekker 17 Jun '19

17 Jun '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt.spec | 4 ++-- dlls/bcrypt/bcrypt_main.c | 12 ++++++++++++ dlls/bcrypt/tests/bcrypt.c | 19 +++++++++++++++++++ dlls/ncrypt/ncrypt.spec | 4 ++-- include/bcrypt.h | 11 +++++++++++ include/ncrypt.h | 5 +++++ 6 files changed, 51 insertions(+), 4 deletions(-) diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec index 4946ee5d79..1ea3760ba2 100644 --- a/dlls/bcrypt/bcrypt.spec +++ b/dlls/bcrypt/bcrypt.spec @@ -17,14 +17,14 @@ @ stdcall BCryptEncrypt(ptr ptr long ptr ptr long ptr long ptr long) @ stdcall BCryptEnumAlgorithms(long ptr ptr long) @ stub BCryptEnumContextFunctionProviders -@ stub BCryptEnumContextFunctions +@ stdcall BCryptEnumContextFunctions(long wstr long ptr ptr) @ stub BCryptEnumContexts @ stub BCryptEnumProviders @ stub BCryptEnumRegisteredProviders @ stdcall BCryptExportKey(ptr ptr wstr ptr long ptr long) @ stdcall BCryptFinalizeKeyPair(ptr long) @ stdcall BCryptFinishHash(ptr ptr long long) -@ stub BCryptFreeBuffer +@ stdcall BCryptFreeBuffer(ptr) @ stdcall BCryptGenRandom(ptr ptr long long) @ stdcall BCryptGenerateKeyPair(ptr ptr long long) @ stdcall BCryptGenerateSymmetricKey(ptr ptr ptr long ptr long long) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 399626d19b..86073bbab0 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -68,6 +68,18 @@ NTSTATUS WINAPI BCryptRemoveContextFunctionProvider(ULONG table, LPCWSTR context return STATUS_NOT_IMPLEMENTED; } +NTSTATUS WINAPI BCryptEnumContextFunctions( ULONG table, const WCHAR *ctx, ULONG iface, ULONG *buflen, + CRYPT_CONTEXT_FUNCTIONS **buffer ) +{ + FIXME( "%u, %s, %u, %p, %p\n", table, debugstr_w(ctx), iface, buflen, buffer ); + return STATUS_NOT_IMPLEMENTED; +} + +void WINAPI BCryptFreeBuffer( void *buffer ) +{ + FIXME( "%p\n", buffer ); +} + NTSTATUS WINAPI BCryptRegisterProvider(LPCWSTR provider, ULONG flags, PCRYPT_PROVIDER_REG reg) { FIXME("%s, %08x, %p: stub\n", debugstr_w(provider), flags, reg); diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index a8bc43ce3d..8e57d53e21 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -23,6 +23,7 @@ #define WIN32_NO_STATUS #include <windows.h> #include <bcrypt.h> +#include <ncrypt.h> #include "wine/test.h" @@ -39,9 +40,11 @@ static NTSTATUS (WINAPI *pBCryptDuplicateHash)(BCRYPT_HASH_HANDLE, BCRYPT_HASH_H static NTSTATUS (WINAPI *pBCryptDuplicateKey)(BCRYPT_KEY_HANDLE, BCRYPT_KEY_HANDLE *, UCHAR *, ULONG, ULONG); static NTSTATUS (WINAPI *pBCryptEncrypt)(BCRYPT_KEY_HANDLE, PUCHAR, ULONG, VOID *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG *, ULONG); +static NTSTATUS (WINAPI *pBCryptEnumContextFunctions)(ULONG, const WCHAR *, ULONG, ULONG *, CRYPT_CONTEXT_FUNCTIONS **); static NTSTATUS (WINAPI *pBCryptExportKey)(BCRYPT_KEY_HANDLE, BCRYPT_KEY_HANDLE, LPCWSTR, PUCHAR, ULONG, ULONG *, ULONG); static NTSTATUS (WINAPI *pBCryptFinalizeKeyPair)(BCRYPT_KEY_HANDLE, ULONG); static NTSTATUS (WINAPI *pBCryptFinishHash)(BCRYPT_HASH_HANDLE, PUCHAR, ULONG, ULONG); +static void (WINAPI *pBCryptFreeBuffer)(void *); static NTSTATUS (WINAPI *pBCryptGenerateKeyPair)(BCRYPT_ALG_HANDLE, BCRYPT_KEY_HANDLE *, ULONG, ULONG); static NTSTATUS (WINAPI *pBCryptGenerateSymmetricKey)(BCRYPT_ALG_HANDLE, BCRYPT_KEY_HANDLE *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG); @@ -1896,6 +1899,19 @@ static void test_ECDH(void) pBCryptCloseAlgorithmProvider(alg, 0); } +static void test_BCryptEnumContextFunctions(void) +{ + static const WCHAR sslW[] = {'S','S','L',0}; + CRYPT_CONTEXT_FUNCTIONS *buffer; + NTSTATUS status; + ULONG buflen; + + buffer = NULL; + status = pBCryptEnumContextFunctions( CRYPT_LOCAL, sslW, NCRYPT_SCHANNEL_INTERFACE, &buflen, &buffer ); + todo_wine ok( status == STATUS_SUCCESS, "got %08x\n", status); + if (status == STATUS_SUCCESS) pBCryptFreeBuffer( buffer ); +} + START_TEST(bcrypt) { HMODULE module; @@ -1916,9 +1932,11 @@ START_TEST(bcrypt) pBCryptDuplicateHash = (void *)GetProcAddress(module, "BCryptDuplicateHash"); pBCryptDuplicateKey = (void *)GetProcAddress(module, "BCryptDuplicateKey"); pBCryptEncrypt = (void *)GetProcAddress(module, "BCryptEncrypt"); + pBCryptEnumContextFunctions = (void *)GetProcAddress(module, "BCryptEnumContextFunctions"); pBCryptExportKey = (void *)GetProcAddress(module, "BCryptExportKey"); pBCryptFinalizeKeyPair = (void *)GetProcAddress(module, "BCryptFinalizeKeyPair"); pBCryptFinishHash = (void *)GetProcAddress(module, "BCryptFinishHash"); + pBCryptFreeBuffer = (void *)GetProcAddress(module, "BCryptFreeBuffer"); pBCryptGenerateKeyPair = (void *)GetProcAddress(module, "BCryptGenerateKeyPair"); pBCryptGenerateSymmetricKey = (void *)GetProcAddress(module, "BCryptGenerateSymmetricKey"); pBCryptGenRandom = (void *)GetProcAddress(module, "BCryptGenRandom"); @@ -1946,6 +1964,7 @@ START_TEST(bcrypt) test_ECDSA(); test_RSA(); test_ECDH(); + test_BCryptEnumContextFunctions(); FreeLibrary(module); } diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec index d35f8a9316..dfe715db9c 100644 --- a/dlls/ncrypt/ncrypt.spec +++ b/dlls/ncrypt/ncrypt.spec @@ -18,14 +18,14 @@ @ stdcall BCryptEncrypt(ptr ptr long ptr ptr long ptr long ptr long) bcrypt.BCryptEncrypt @ stdcall BCryptEnumAlgorithms(long ptr ptr long) bcrypt.BCryptEnumAlgorithms @ stub BCryptEnumContextFunctionProviders -@ stub BCryptEnumContextFunctions +@ stdcall BCryptEnumContextFunctions(long wstr long ptr ptr) bcrypt.BCryptEnumContextFunctions @ stub BCryptEnumContexts @ stub BCryptEnumProviders @ stub BCryptEnumRegisteredProviders @ stdcall BCryptExportKey(ptr ptr wstr ptr long ptr long) bcrypt.BCryptExportKey @ stdcall BCryptFinalizeKeyPair(ptr long) bcrypt.BCryptFinalizeKeyPair @ stdcall BCryptFinishHash(ptr ptr long long) bcrypt.BCryptFinishHash -@ stub BCryptFreeBuffer +@ stdcall BCryptFreeBuffer(ptr) bcrypt.BCryptFreeBuffer @ stdcall BCryptGenRandom(ptr ptr long long) bcrypt.BCryptGenRandom @ stdcall BCryptGenerateKeyPair(ptr ptr long long) bcrypt.BCryptGenerateKeyPair @ stdcall BCryptGenerateSymmetricKey(ptr ptr ptr long ptr long long) bcrypt.BCryptGenerateSymmetricKey diff --git a/include/bcrypt.h b/include/bcrypt.h index 0151afdc36..8947d130f9 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -293,6 +293,15 @@ typedef PVOID BCRYPT_SECRET_HANDLE; /* Flags for BCryptCreateHash */ #define BCRYPT_HASH_REUSABLE_FLAG 0x00000020 +#define CRYPT_LOCAL 0x00000001 +#define CRYPT_DOMAIN 0x00000002 + +typedef struct _CRYPT_CONTEXT_FUNCTIONS +{ + ULONG cFunctions; + WCHAR **rgpszFunctions; +} CRYPT_CONTEXT_FUNCTIONS, *PCRYPT_CONTEXT_FUNCTIONS; + NTSTATUS WINAPI BCryptCloseAlgorithmProvider(BCRYPT_ALG_HANDLE, ULONG); NTSTATUS WINAPI BCryptCreateHash(BCRYPT_ALG_HANDLE, BCRYPT_HASH_HANDLE *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG); NTSTATUS WINAPI BCryptDecrypt(BCRYPT_KEY_HANDLE, PUCHAR, ULONG, VOID *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG *, ULONG); @@ -304,8 +313,10 @@ NTSTATUS WINAPI BCryptDestroySecret(BCRYPT_SECRET_HANDLE); NTSTATUS WINAPI BCryptDuplicateHash(BCRYPT_HASH_HANDLE, BCRYPT_HASH_HANDLE *, UCHAR *, ULONG, ULONG); NTSTATUS WINAPI BCryptEncrypt(BCRYPT_KEY_HANDLE, PUCHAR, ULONG, VOID *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG *, ULONG); NTSTATUS WINAPI BCryptEnumAlgorithms(ULONG, ULONG *, BCRYPT_ALGORITHM_IDENTIFIER **, ULONG); +NTSTATUS WINAPI BCryptEnumContextFunctions(ULONG, const WCHAR *, ULONG, ULONG *, CRYPT_CONTEXT_FUNCTIONS **); NTSTATUS WINAPI BCryptFinalizeKeyPair(BCRYPT_KEY_HANDLE, ULONG); NTSTATUS WINAPI BCryptFinishHash(BCRYPT_HASH_HANDLE, PUCHAR, ULONG, ULONG); +void WINAPI BCryptFreeBuffer(void *); NTSTATUS WINAPI BCryptGenerateKeyPair(BCRYPT_ALG_HANDLE, BCRYPT_KEY_HANDLE *, ULONG, ULONG); NTSTATUS WINAPI BCryptGenerateSymmetricKey(BCRYPT_ALG_HANDLE, BCRYPT_KEY_HANDLE *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG); NTSTATUS WINAPI BCryptGenRandom(BCRYPT_ALG_HANDLE, PUCHAR, ULONG, ULONG); diff --git a/include/ncrypt.h b/include/ncrypt.h index 2bfdae0652..85ced7a2fb 100644 --- a/include/ncrypt.h +++ b/include/ncrypt.h @@ -38,6 +38,11 @@ typedef ULONG_PTR NCRYPT_KEY_HANDLE; typedef ULONG_PTR NCRYPT_HASH_HANDLE; typedef ULONG_PTR NCRYPT_SECRET_HANDLE; +#define NCRYPT_KEY_STORAGE_INTERFACE 0x00010001 +#define NCRYPT_SCHANNEL_INTERFACE 0x00010002 +#define NCRYPT_SCHANNEL_SIGNATURE_INTERFACE 0x00010003 +#define NCRYPT_KEY_PROTECTION_INTERFACE 0x00010004 + SECURITY_STATUS WINAPI NCryptCreatePersistedKey(NCRYPT_PROV_HANDLE, NCRYPT_KEY_HANDLE *, const WCHAR *, const WCHAR *, DWORD, DWORD); SECURITY_STATUS WINAPI NCryptDecrypt(NCRYPT_KEY_HANDLE, BYTE *, DWORD, void *, BYTE *, DWORD, DWORD *, DWORD); SECURITY_STATUS WINAPI NCryptEncrypt(NCRYPT_KEY_HANDLE, BYTE *, DWORD, void *, BYTE *, DWORD, DWORD *, DWORD); -- 2.20.1

1 0

[PATCH v2] advapi32: Dont read a value that might be uninitialized. (Coverity)
by Alistair Leslie-Hughes 17 Jun '19

17 Jun '19

Supersedes 166626. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/advapi32/registry.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 9269898c6b..2d2c1be4dc 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -2118,7 +2118,7 @@ LSTATUS WINAPI RegGetValueW( HKEY hKey, LPCWSTR pszSubKey, LPCWSTR pszValue, DWORD dwFlags, LPDWORD pdwType, PVOID pvData, LPDWORD pcbData ) { - DWORD dwType, cbData = pcbData ? *pcbData : 0; + DWORD dwType, cbData = (pvData && pcbData) ? *pcbData : 0; PVOID pvBuf = NULL; LONG ret; @@ -2214,7 +2214,7 @@ LSTATUS WINAPI RegGetValueA( HKEY hKey, LPCSTR pszSubKey, LPCSTR pszValue, DWORD dwFlags, LPDWORD pdwType, PVOID pvData, LPDWORD pcbData ) { - DWORD dwType, cbData = pcbData ? *pcbData : 0; + DWORD dwType, cbData = (pvData && pcbData) ? *pcbData : 0; PVOID pvBuf = NULL; LONG ret; -- 2.17.1

1 0

[PATCH] wininet: Remove unsued flag HTTP_ADDHDR_FLAG_COALESCE.
by Alistair Leslie-Hughes 17 Jun '19

17 Jun '19

This flag has the same value as HTTP_ADDHDR_FLAG_COALESCE_WITH_COMMA which is used in multiple places. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wininet/http.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 54bb569eb9..cbc95fb8ae 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -137,7 +137,6 @@ static const WCHAR emptyW[] = {0}; #define HTTP_ADDHDR_FLAG_ADD 0x20000000 #define HTTP_ADDHDR_FLAG_ADD_IF_NEW 0x10000000 -#define HTTP_ADDHDR_FLAG_COALESCE 0x40000000 #define HTTP_ADDHDR_FLAG_COALESCE_WITH_COMMA 0x40000000 #define HTTP_ADDHDR_FLAG_COALESCE_WITH_SEMICOLON 0x01000000 #define HTTP_ADDHDR_FLAG_REPLACE 0x80000000 @@ -6047,7 +6046,7 @@ static LPWSTR * HTTP_InterpretHttpHeader(LPCWSTR buffer) * */ -#define COALESCEFLAGS (HTTP_ADDHDR_FLAG_COALESCE|HTTP_ADDHDR_FLAG_COALESCE_WITH_COMMA|HTTP_ADDHDR_FLAG_COALESCE_WITH_SEMICOLON) +#define COALESCEFLAGS (HTTP_ADDHDR_FLAG_COALESCE_WITH_COMMA|HTTP_ADDHDR_FLAG_COALESCE_WITH_SEMICOLON) static DWORD HTTP_ProcessHeader(http_request_t *request, LPCWSTR field, LPCWSTR value, DWORD dwModifier) { -- 2.17.1

1 0

[PATCH] advapi32: Dont read a value that might be uninitialized. (Coverity)
by Alistair Leslie-Hughes 17 Jun '19

17 Jun '19

Supersedes 166626. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/advapi32/registry.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 9269898c6b..4f7f0ee7d5 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -2214,7 +2214,7 @@ LSTATUS WINAPI RegGetValueA( HKEY hKey, LPCSTR pszSubKey, LPCSTR pszValue, DWORD dwFlags, LPDWORD pdwType, PVOID pvData, LPDWORD pcbData ) { - DWORD dwType, cbData = pcbData ? *pcbData : 0; + DWORD dwType, cbData = (pvData && pcbData) ? *pcbData : 0; PVOID pvBuf = NULL; LONG ret; -- 2.17.1

2 1