June 2020 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Get rid of the "d3d_initialized" check in device_resource_released().
by Alexandre Julliard June 3, 2020

June 3, 2020

Module: wine Branch: master Commit: cc6d90b8236ce5ba73b09e6f5eeb164e506a07a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc6d90b8236ce5ba73b09e6f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 3 15:58:05 2020 +0430 wined3d: Get rid of the "d3d_initialized" check in device_resource_released(). This used to protect against accessing the framebuffer state on the no3d adapter; that's no longer a concern. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4544e28bc4..2ce3e346ef 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5493,18 +5493,15 @@ void device_resource_released(struct wined3d_device *device, struct wined3d_reso TRACE("device %p, resource %p, type %s.\n", device, resource, debug_d3dresourcetype(type)); - if (device->d3d_initialized) + for (i = 0; i < ARRAY_SIZE(device->state.fb.render_targets); ++i) { - for (i = 0; i < ARRAY_SIZE(device->state.fb.render_targets); ++i) - { - if ((rtv = device->state.fb.render_targets[i]) && rtv->resource == resource) - ERR("Resource %p is still in use as render target %u.\n", resource, i); - } - - if ((rtv = device->state.fb.depth_stencil) && rtv->resource == resource) - ERR("Resource %p is still in use as depth/stencil buffer.\n", resource); + if ((rtv = device->state.fb.render_targets[i]) && rtv->resource == resource) + ERR("Resource %p is still in use as render target %u.\n", resource, i); } + if ((rtv = device->state.fb.depth_stencil) && rtv->resource == resource) + ERR("Resource %p is still in use as depth/stencil buffer.\n", resource); + switch (type) { case WINED3D_RTYPE_TEXTURE_1D:

1 0

Henri Verbeet : wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in ffp_blit_supported().
by Alexandre Julliard June 3, 2020

June 3, 2020

Module: wine Branch: master Commit: 2b2a6ebdd1fad8fa050ff9d59cfb11f7f6e8d3ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b2a6ebdd1fad8fa050ff9d5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 3 15:58:09 2020 +0430 wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in ffp_blit_supported(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index f0b25ce90d..fcb9ff8a1c 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -5211,7 +5211,7 @@ static bool ffp_blit_supported(enum wined3d_blit_op blit_op, const struct wined3 if (blit_op == WINED3D_BLIT_OP_RAW_BLIT && dst_format->id == src_format->id) { - if (dst_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) + if (dst_format->depth_size || dst_format->stencil_size) blit_op = WINED3D_BLIT_OP_DEPTH_BLIT; else blit_op = WINED3D_BLIT_OP_COLOR_BLIT;

1 0

Henri Verbeet : wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in wined3d_texture_blt().
by Alexandre Julliard June 3, 2020

June 3, 2020

Module: wine Branch: master Commit: 97a250075ad440b75c7ea9e4e2b413385a13edbe URL: https://source.winehq.org/git/wine.git/?a=commit;h=97a250075ad440b75c7ea9e4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 3 15:58:10 2020 +0430 wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in wined3d_texture_blt(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index fcb9ff8a1c..eb43f9975e 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -3829,7 +3829,6 @@ HRESULT CDECL wined3d_texture_blt(struct wined3d_texture *dst_texture, unsigned { struct wined3d_box src_box = {src_rect->left, src_rect->top, src_rect->right, src_rect->bottom, 0, 1}; struct wined3d_box dst_box = {dst_rect->left, dst_rect->top, dst_rect->right, dst_rect->bottom, 0, 1}; - unsigned int dst_format_flags, src_format_flags = 0; HRESULT hr; TRACE("dst_texture %p, dst_sub_resource_idx %u, dst_rect %s, src_texture %p, " @@ -3849,12 +3848,10 @@ HRESULT CDECL wined3d_texture_blt(struct wined3d_texture *dst_texture, unsigned && filter != WINED3D_TEXF_LINEAR) return WINED3DERR_INVALIDCALL; - dst_format_flags = dst_texture->resource.format_flags; if (FAILED(hr = wined3d_texture_check_box_dimensions(dst_texture, dst_sub_resource_idx % dst_texture->level_count, &dst_box))) return hr; - src_format_flags = src_texture->resource.format_flags; if (FAILED(hr = wined3d_texture_check_box_dimensions(src_texture, src_sub_resource_idx % src_texture->level_count, &src_box))) return hr; @@ -3866,8 +3863,8 @@ HRESULT CDECL wined3d_texture_blt(struct wined3d_texture *dst_texture, unsigned return WINEDDERR_SURFACEBUSY; } - if ((src_format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) - != (dst_format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL))) + if (!src_texture->resource.format->depth_size != !dst_texture->resource.format->depth_size + || !src_texture->resource.format->stencil_size != !dst_texture->resource.format->stencil_size) { WARN("Rejecting depth/stencil blit between incompatible formats.\n"); return WINED3DERR_INVALIDCALL;

1 0

Henri Verbeet : wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in texture2d_blt().
by Alexandre Julliard June 3, 2020

June 3, 2020

Module: wine Branch: master Commit: 2ae6de5287541fea1f24b206b54b94fae6e06573 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ae6de5287541fea1f24b206… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 3 15:58:11 2020 +0430 wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in texture2d_blt(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0c95f7a43a..652f6070b9 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1483,11 +1483,11 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_ struct wined3d_swapchain *src_swapchain, *dst_swapchain; const struct wined3d_color_key *colour_key = NULL; DWORD src_location, dst_location, valid_locations; - DWORD src_ds_flags, dst_ds_flags; struct wined3d_context *context; enum wined3d_blit_op blit_op; BOOL scale, convert, resolve; RECT src_rect, dst_rect; + bool src_ds, dst_ds; static const DWORD simple_blit = WINED3D_BLT_SRC_CKEY | WINED3D_BLT_SRC_CKEY_OVERRIDE @@ -1561,12 +1561,10 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_ convert = src_texture->resource.format->id != dst_texture->resource.format->id; resolve = src_texture->resource.multisample_type != dst_texture->resource.multisample_type; - dst_ds_flags = dst_texture->resource.format_flags - & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); - src_ds_flags = src_texture->resource.format_flags - & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); + dst_ds = dst_texture->resource.format->depth_size || dst_texture->resource.format->stencil_size; + src_ds = src_texture->resource.format->depth_size || src_texture->resource.format->stencil_size; - if (src_ds_flags || dst_ds_flags) + if (src_ds || dst_ds) { TRACE("Depth/stencil blit.\n");

1 0

Henri Verbeet : wined3d: Get rid of the "d3d_initialized" check in context_resource_released().
by Alexandre Julliard June 3, 2020

June 3, 2020

Module: wine Branch: master Commit: c125c65846b843ab5f3369a4fa38956d5aca5a21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c125c65846b843ab5f3369a4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 3 15:58:04 2020 +0430 wined3d: Get rid of the "d3d_initialized" check in context_resource_released(). When this was introduced in commit 401e99b0c074af848379b2602df37fb1e6c7536b, it protected against calling the equivalent of context_acquire() on the equivalent of the no3d adapter. Commit 94d33d3e861d8e01b4edcb940e8ab1aa98359520 removed the call in question. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 7959199e1f..3a263e1f6b 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -36,9 +36,6 @@ void context_resource_released(const struct wined3d_device *device, struct wined { unsigned int i; - if (!device->d3d_initialized) - return; - for (i = 0; i < device->context_count; ++i) { struct wined3d_context *context = device->contexts[i];

1 0

Vijay Kiran Kamuju : winspool.drv: Implement AddPrintProcessorA via AddPrintProcessorW.
by Alexandre Julliard June 3, 2020

June 3, 2020

Module: wine Branch: master Commit: 992a0ae7b90d92bcda52d82672ece1d3c7d4b0ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=992a0ae7b90d92bcda52d826… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Jun 3 09:42:49 2020 +0100 winspool.drv: Implement AddPrintProcessorA via AddPrintProcessorW. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=26171 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/info.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 593f091c2d..1a8d572f43 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -5403,9 +5403,25 @@ BOOL WINAPI AddPrinterDriverW(LPWSTR pName, DWORD level, LPBYTE pDriverInfo) BOOL WINAPI AddPrintProcessorA(LPSTR pName, LPSTR pEnvironment, LPSTR pPathName, LPSTR pPrintProcessorName) { - FIXME("(%s,%s,%s,%s): stub\n", debugstr_a(pName), debugstr_a(pEnvironment), + UNICODE_STRING NameW, EnvW, PathW, ProcessorW; + BOOL ret; + + TRACE("(%s,%s,%s,%s)\n", debugstr_a(pName), debugstr_a(pEnvironment), debugstr_a(pPathName), debugstr_a(pPrintProcessorName)); - return FALSE; + + asciitounicode(&NameW, pName); + asciitounicode(&EnvW, pEnvironment); + asciitounicode(&PathW, pPathName); + asciitounicode(&ProcessorW, pPrintProcessorName); + + ret = AddPrintProcessorW(NameW.Buffer, EnvW.Buffer, PathW.Buffer, ProcessorW.Buffer); + + RtlFreeUnicodeString(&ProcessorW); + RtlFreeUnicodeString(&PathW); + RtlFreeUnicodeString(&EnvW); + RtlFreeUnicodeString(&NameW); + + return ret; } /*****************************************************************************

1 0

Henri Verbeet : wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in texture2d_depth_blt_fbo().
by Alexandre Julliard June 3, 2020

June 3, 2020

Module: wine Branch: master Commit: 8d7c39b860f203d623d5a47ee8a00991114f9fdd URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d7c39b860f203d623d5a47e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 3 15:58:12 2020 +0430 wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in texture2d_depth_blt_fbo(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index eb43f9975e..cd3d4b4912 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -450,7 +450,7 @@ static void texture2d_depth_blt_fbo(const struct wined3d_device *device, struct { struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context_gl->gl_info; - DWORD src_mask, dst_mask; + GLbitfield src_mask, dst_mask; GLbitfield gl_mask; TRACE("device %p, src_texture %p, src_sub_resource_idx %u, src_location %s, src_rect %s, " @@ -458,8 +458,17 @@ static void texture2d_depth_blt_fbo(const struct wined3d_device *device, struct src_texture, src_sub_resource_idx, wined3d_debug_location(src_location), wine_dbgstr_rect(src_rect), dst_texture, dst_sub_resource_idx, wined3d_debug_location(dst_location), wine_dbgstr_rect(dst_rect)); - src_mask = src_texture->resource.format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); - dst_mask = dst_texture->resource.format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); + src_mask = 0; + if (src_texture->resource.format->depth_size) + src_mask |= GL_DEPTH_BUFFER_BIT; + if (src_texture->resource.format->stencil_size) + src_mask |= GL_STENCIL_BUFFER_BIT; + + dst_mask = 0; + if (dst_texture->resource.format->depth_size) + dst_mask |= GL_DEPTH_BUFFER_BIT; + if (dst_texture->resource.format->stencil_size) + dst_mask |= GL_STENCIL_BUFFER_BIT; if (src_mask != dst_mask) { @@ -475,12 +484,7 @@ static void texture2d_depth_blt_fbo(const struct wined3d_device *device, struct debug_d3dformat(src_texture->resource.format->id)); return; } - - gl_mask = 0; - if (src_mask & WINED3DFMT_FLAG_DEPTH) - gl_mask |= GL_DEPTH_BUFFER_BIT; - if (src_mask & WINED3DFMT_FLAG_STENCIL) - gl_mask |= GL_STENCIL_BUFFER_BIT; + gl_mask = src_mask; /* Make sure the locations are up-to-date. Loading the destination * surface isn't required if the entire surface is overwritten. */

1 0

Henri Verbeet : wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in glsl_blitter_supported().
by Alexandre Julliard June 3, 2020

June 3, 2020

Module: wine Branch: master Commit: ce4b63dc8802e93bd72a4bd967845a9bfc447144 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce4b63dc8802e93bd72a4bd9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 3 15:58:08 2020 +0430 wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in glsl_blitter_supported(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ddb76143b5..66e90b1768 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -12975,7 +12975,7 @@ static BOOL glsl_blitter_supported(enum wined3d_blit_op blit_op, const struct wi if (blit_op == WINED3D_BLIT_OP_RAW_BLIT && dst_format->id == src_format->id) { - if (dst_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) + if (dst_format->depth_size || dst_format->stencil_size) blit_op = WINED3D_BLIT_OP_DEPTH_BLIT; else blit_op = WINED3D_BLIT_OP_COLOR_BLIT;

1 0

Henri Verbeet : wined3d: Get rid of the "d3d_initialized" check in wined3d_device_reset().
by Alexandre Julliard June 3, 2020

June 3, 2020

Module: wine Branch: master Commit: 2200b841d566580eeb77655c1a1fc2a797855fe6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2200b841d566580eeb77655c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 3 15:58:03 2020 +0430 wined3d: Get rid of the "d3d_initialized" check in wined3d_device_reset(). We require an implicit swapchain, so "d3d_initialized" is always true. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9b59371bb2..4544e28bc4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5385,8 +5385,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, wined3d_cs_emit_unload_resource(device->cs, resource); } - if (device->d3d_initialized) - device->adapter->adapter_ops->adapter_uninit_3d(device); + device->adapter->adapter_ops->adapter_uninit_3d(device); memset(&device->state, 0, sizeof(device->state)); state_init(&device->state, &device->adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); @@ -5403,7 +5402,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, wined3d_device_set_depth_stencil_view(device, view); } - if (device->d3d_initialized && reset_state) + if (reset_state) hr = device->adapter->adapter_ops->adapter_init_3d(device); /* All done. There is no need to reload resources or shaders, this will happen automatically on the

1 0

Hans Leidekker : bcrypt: Add support for importing and exporting DSS private keys.
by Alexandre Julliard June 3, 2020

June 3, 2020

Module: wine Branch: master Commit: 7cf9a75dfa77de408261aef689c8f60fee17e46e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7cf9a75dfa77de408261aef6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 3 10:50:37 2020 +0200 bcrypt: Add support for importing and exporting DSS private keys. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_internal.h | 6 +++ dlls/bcrypt/bcrypt_main.c | 47 ++++++++++++++++++ dlls/bcrypt/gnutls.c | 112 ++++++++++++++++++++++++++++++++++++++++++ dlls/bcrypt/tests/bcrypt.c | 36 ++++++++++++++ include/bcrypt.h | 12 +++++ 5 files changed, 213 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7cf9a75dfa77de408261…

1 0