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

Józef Kucia : vkd3d: Begin and end conditional rendering outside render passes.
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: vkd3d Branch: master Commit: 9939712560b124715debe9d7fb19adb1868b66c9 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9939712560b124715debe9d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jun 18 10:07:49 2019 +0200 vkd3d: Begin and end conditional rendering outside render passes. The Vulkan spec says: "Conditional rendering must also either begin and end inside the same subpass of a render pass instance, or must both begin and end outside of a render pass instance (i.e. contain entire render pass instances)." Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 31a5d20..5b877db 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4941,11 +4941,14 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetPredication(ID3D12GraphicsCo vk_procs = &list->device->vk_procs; + /* FIXME: Add support for conditional rendering in render passes. */ + d3d12_command_list_end_current_render_pass(list); + if (resource) { VkConditionalRenderingBeginInfoEXT cond_info; - if (aligned_buffer_offset & (sizeof(UINT64) - 1)) + if (aligned_buffer_offset & (sizeof(uint64_t) - 1)) { WARN("Unaligned predicate argument buffer offset %#"PRIx64".\n", aligned_buffer_offset); return; @@ -4957,7 +4960,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetPredication(ID3D12GraphicsCo return; } - FIXME("Predication doesn't support clear and copy commands, " + FIXME_ONCE("Predication doesn't support clear and copy commands, " "and predication values are treated as 32-bit values.\n"); cond_info.sType = VK_STRUCTURE_TYPE_CONDITIONAL_RENDERING_BEGIN_INFO_EXT;

1 0

Józef Kucia : vkd3d: End conditional rendering before ending command buffer.
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: vkd3d Branch: master Commit: 16c62ded81da43f04c39a299eeeeddc6afaab982 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=16c62ded81da43f04c39a29… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jun 18 10:07:50 2019 +0200 vkd3d: End conditional rendering before ending command buffer. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 5b877db..99f607a 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2254,6 +2254,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_list_Close(ID3D12GraphicsCommandL vk_procs = &list->device->vk_procs; d3d12_command_list_end_current_render_pass(list); + if (list->is_predicated) + VK_CALL(vkCmdEndConditionalRenderingEXT(list->vk_command_buffer)); if ((vr = VK_CALL(vkEndCommandBuffer(list->vk_command_buffer))) < 0) {

1 0

Józef Kucia : vkd3d: Set VK_BUFFER_USAGE_CONDITIONAL_RENDERING_BIT_EXT for buffers.
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: vkd3d Branch: master Commit: 7f963c124d879e63a2d58fe5a5250aa0b948d3c0 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7f963c124d879e63a2d58fe… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jun 18 10:07:51 2019 +0200 vkd3d: Set VK_BUFFER_USAGE_CONDITIONAL_RENDERING_BIT_EXT for buffers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/resource.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index d005fa8..bcf523e 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -523,10 +523,16 @@ HRESULT vkd3d_create_buffer(struct d3d12_device *device, | VK_BUFFER_USAGE_VERTEX_BUFFER_BIT | VK_BUFFER_USAGE_INDIRECT_BUFFER_BIT; - if (heap_type == D3D12_HEAP_TYPE_DEFAULT && device->vk_info.EXT_transform_feedback) + if (heap_type == D3D12_HEAP_TYPE_DEFAULT) { - buffer_info.usage |= VK_BUFFER_USAGE_TRANSFORM_FEEDBACK_BUFFER_BIT_EXT - | VK_BUFFER_USAGE_TRANSFORM_FEEDBACK_COUNTER_BUFFER_BIT_EXT; + if (device->vk_info.EXT_conditional_rendering) + buffer_info.usage |= VK_BUFFER_USAGE_CONDITIONAL_RENDERING_BIT_EXT; + + if (device->vk_info.EXT_transform_feedback) + { + buffer_info.usage |= VK_BUFFER_USAGE_TRANSFORM_FEEDBACK_BUFFER_BIT_EXT + | VK_BUFFER_USAGE_TRANSFORM_FEEDBACK_COUNTER_BUFFER_BIT_EXT; + } } if (heap_type == D3D12_HEAP_TYPE_UPLOAD)

1 0

Hans Leidekker : bcrypt: Add support for BCRYPT_RSA_SIGN_ALGORITHM.
by Alexandre Julliard 17 Jun '19

17 Jun '19

Module: wine Branch: master Commit: 4c649116a5b47b9953046060f5f7a039a04e59c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c649116a5b47b9953046060… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 17 11:52:49 2019 +0200 bcrypt: Add support for BCRYPT_RSA_SIGN_ALGORITHM. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47371 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 86073bb..3846341 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 8e57d53..11e274b 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 8947d13..4638e51 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};

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_create_fbo_entry().
by Alexandre Julliard 17 Jun '19

17 Jun '19

Module: wine Branch: master Commit: 3c448b5dacaebf7483219e6809d5e525a6f9ffca URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c448b5dacaebf7483219e68… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 17 15:20:10 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_create_fbo_entry(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 6258771..6a787a2 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; }

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_apply_draw_buffers().
by Alexandre Julliard 17 Jun '19

17 Jun '19

Module: wine Branch: master Commit: fdc2812d044779f7590a4a1e6e8dd9b60e9d2d09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fdc2812d044779f7590a4a1e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 17 15:20:11 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_apply_draw_buffers(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 6a787a2..66c7d79 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; } }

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_set_render_offscreen().
by Alexandre Julliard 17 Jun '19

17 Jun '19

Module: wine Branch: master Commit: adc4a9a34552cfc293f517c564c27d84599916e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=adc4a9a34552cfc293f517c5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 17 15:20:12 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_set_render_offscreen(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 66c7d79..0aaeac7 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,

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_apply_blit_projection().
by Alexandre Julliard 17 Jun '19

17 Jun '19

Module: wine Branch: master Commit: cf48248b09668e929ccca43ea80e4806b5616814 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf48248b09668e929ccca43e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 17 15:20:13 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_apply_blit_projection(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 0aaeac7..ea9f176 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. */

1 0

Henri Verbeet : wined3d: Use texture2d_load_sysmem() in texture1d_load_location().
by Alexandre Julliard 17 Jun '19

17 Jun '19

Module: wine Branch: master Commit: 410cf7d24cd8136354b87bcaa33fdb78a989ca1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=410cf7d24cd8136354b87bca… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 17 15:20:14 2019 +0430 wined3d: Use texture2d_load_sysmem() in texture1d_load_location(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 62 ++------------------------- dlls/wined3d/texture.c | 97 +++++++++++++++++++++++------------------- dlls/wined3d/wined3d_private.h | 38 +++++++++++------ 3 files changed, 81 insertions(+), 116 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=410cf7d24cd8136354b8…

1 0

Zebediah Figura : ntdll: Implement RtlCreateUserStack() and RtlFreeUserStack().
by Alexandre Julliard 17 Jun '19

17 Jun '19

Module: wine Branch: master Commit: 90c3b78becee20c944f27be2f0d6f1bc598a7d24 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90c3b78becee20c944f27be2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jun 14 10:32:43 2019 -0500 ntdll: Implement RtlCreateUserStack() and RtlFreeUserStack(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 7 ++++++- dlls/ntdll/ntdll.spec | 3 ++- dlls/ntdll/ntdll_misc.h | 2 +- dlls/ntdll/thread.c | 7 ++++++- dlls/ntdll/virtual.c | 46 ++++++++++++++++++++++++++++++++++++++++++---- include/winternl.h | 12 +++++++----- 6 files changed, 64 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 3f422a9..3d747ed 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3787,6 +3787,7 @@ void __wine_process_init(void) ANSI_STRING func_name; UNICODE_STRING nt_name; void * (CDECL *init_func)(void); + INITIAL_TEB stack; thread_init(); @@ -3838,11 +3839,15 @@ void __wine_process_init(void) RemoveEntryList( &wm->ldr.InMemoryOrderModuleList ); InsertHeadList( &NtCurrentTeb()->Peb->LdrData->InMemoryOrderModuleList, &wm->ldr.InMemoryOrderModuleList ); - if ((status = virtual_alloc_thread_stack( NtCurrentTeb(), 0, 0, NULL )) != STATUS_SUCCESS) + if ((status = virtual_alloc_thread_stack( &stack, 0, 0, NULL )) != STATUS_SUCCESS) { ERR( "Main exe initialization for %s failed, status %x\n", debugstr_w(wm->ldr.FullDllName.Buffer), status ); NtTerminateProcess( GetCurrentProcess(), status ); } + NtCurrentTeb()->Tib.StackBase = stack.StackBase; + NtCurrentTeb()->Tib.StackLimit = stack.StackLimit; + NtCurrentTeb()->DeallocationStack = stack.DeallocationStack; + server_init_process_done(); } diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index aeb9735..e0def22 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -526,6 +526,7 @@ @ stdcall RtlCreateUnicodeStringFromAsciiz(ptr str) @ stdcall RtlCreateUserProcess(ptr long ptr ptr ptr long long long long ptr) @ stub RtlCreateUserSecurityObject +@ stdcall RtlCreateUserStack(long long long long long ptr) @ stdcall RtlCreateUserThread(long ptr long ptr long long ptr ptr ptr ptr) @ stub RtlCustomCPToUnicodeN @ stub RtlCutoverTimeToSystemTime @@ -644,7 +645,7 @@ @ stdcall RtlFreeSid (ptr) @ stdcall RtlFreeThreadActivationContextStack() @ stdcall RtlFreeUnicodeString(ptr) -@ stub RtlFreeUserThreadStack +@ stdcall RtlFreeUserStack(ptr) @ stdcall RtlGUIDFromString(ptr ptr) @ stub RtlGenerate8dot3Name @ stdcall RtlGetAce(ptr long ptr) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index f8c377e..f847503 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -175,7 +175,7 @@ extern NTSTATUS virtual_map_section( HANDLE handle, PVOID *addr_ptr, ULONG zero_ pe_image_info_t *image_info ) DECLSPEC_HIDDEN; extern void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info ) DECLSPEC_HIDDEN; extern NTSTATUS virtual_create_builtin_view( void *base ) DECLSPEC_HIDDEN; -extern NTSTATUS virtual_alloc_thread_stack( TEB *teb, SIZE_T reserve_size, +extern NTSTATUS virtual_alloc_thread_stack( INITIAL_TEB *stack, SIZE_T reserve_size, SIZE_T commit_size, SIZE_T *pthread_size ) DECLSPEC_HIDDEN; extern void virtual_clear_thread_stack( void *stack_end ) DECLSPEC_HIDDEN; extern BOOL virtual_handle_stack_fault( void *addr ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 96aa6be..f837062 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -415,6 +415,7 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, SECURITY_DESCRIPTOR *descr, SIZE_T extra_stack = PTHREAD_STACK_MIN; data_size_t len = 0; struct object_attributes *objattr = NULL; + INITIAL_TEB stack; if (process != NtCurrentProcess()) { @@ -506,9 +507,13 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, SECURITY_DESCRIPTOR *descr, info->entry_point = start; info->entry_arg = param; - if ((status = virtual_alloc_thread_stack( teb, stack_reserve, stack_commit, &extra_stack ))) + if ((status = virtual_alloc_thread_stack( &stack, stack_reserve, stack_commit, &extra_stack ))) goto error; + teb->Tib.StackBase = stack.StackBase; + teb->Tib.StackLimit = stack.StackLimit; + teb->DeallocationStack = stack.DeallocationStack; + thread_data = (struct ntdll_thread_data *)&teb->GdiTebBatch; thread_data->request_fd = request_pipe[1]; thread_data->reply_fd = -1; diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 86377af..5c12d87 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1927,7 +1927,7 @@ NTSTATUS virtual_create_builtin_view( void *module ) /*********************************************************************** * virtual_alloc_thread_stack */ -NTSTATUS virtual_alloc_thread_stack( TEB *teb, SIZE_T reserve_size, SIZE_T commit_size, SIZE_T *pthread_size ) +NTSTATUS virtual_alloc_thread_stack( INITIAL_TEB *stack, SIZE_T reserve_size, SIZE_T commit_size, SIZE_T *pthread_size ) { struct file_view *view; NTSTATUS status; @@ -1981,9 +1981,11 @@ NTSTATUS virtual_alloc_thread_stack( TEB *teb, SIZE_T reserve_size, SIZE_T commi } /* note: limit is lower than base since the stack grows down */ - teb->DeallocationStack = view->base; - teb->Tib.StackBase = (char *)view->base + view->size; - teb->Tib.StackLimit = (char *)view->base + 2 * page_size; + stack->OldStackBase = 0; + stack->OldStackLimit = 0; + stack->DeallocationStack = view->base; + stack->StackBase = (char *)view->base + view->size; + stack->StackLimit = (char *)view->base + 2 * page_size; done: server_leave_uninterrupted_section( &csVirtual, &sigset ); return status; @@ -2004,6 +2006,42 @@ void virtual_clear_thread_stack( void *stack_end ) if (force_exec_prot) mprotect( stack, size, PROT_READ | PROT_WRITE | PROT_EXEC ); } +/********************************************************************** + * RtlCreateUserStack (NTDLL.@) + */ +NTSTATUS WINAPI RtlCreateUserStack( SIZE_T commit, SIZE_T reserve, ULONG zero_bits, + SIZE_T commit_align, SIZE_T reserve_align, INITIAL_TEB *stack ) +{ + TRACE("commit %#lx, reserve %#lx, zero_bits %u, commit_align %#lx, reserve_align %#lx, stack %p\n", + commit, reserve, zero_bits, commit_align, reserve_align, stack); + + if (!commit_align || !reserve_align) + return STATUS_INVALID_PARAMETER; + + if (!commit || !reserve) + { + IMAGE_NT_HEADERS *nt = RtlImageNtHeader( NtCurrentTeb()->Peb->ImageBaseAddress ); + if (!reserve) reserve = nt->OptionalHeader.SizeOfStackReserve; + if (!commit) commit = nt->OptionalHeader.SizeOfStackCommit; + } + + reserve = (reserve + reserve_align - 1) & ~(reserve_align - 1); + commit = (commit + commit_align - 1) & ~(commit_align - 1); + + return virtual_alloc_thread_stack( stack, reserve, commit, NULL ); +} + +/********************************************************************** + * RtlFreeUserStack (NTDLL.@) + */ +void WINAPI RtlFreeUserStack( void *stack ) +{ + SIZE_T size = 0; + + TRACE("stack %p\n", stack); + + NtFreeVirtualMemory( NtCurrentProcess(), &stack, &size, MEM_RELEASE ); +} /*********************************************************************** * virtual_handle_fault diff --git a/include/winternl.h b/include/winternl.h index e7f89b0..b87aa22 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2104,11 +2104,11 @@ typedef struct _DIRECTORY_BASIC_INFORMATION { } DIRECTORY_BASIC_INFORMATION, *PDIRECTORY_BASIC_INFORMATION; typedef struct _INITIAL_TEB { - PVOID StackBase; - PVOID StackLimit; - PVOID StackCommit; - PVOID StackCommitMax; - PVOID StackReserved; + void *OldStackBase; + void *OldStackLimit; + void *StackBase; + void *StackLimit; + void *DeallocationStack; } INITIAL_TEB, *PINITIAL_TEB; typedef enum _PORT_INFORMATION_CLASS { @@ -2618,6 +2618,7 @@ NTSYSAPI BOOLEAN WINAPI RtlCreateUnicodeString(PUNICODE_STRING,LPCWSTR); NTSYSAPI BOOLEAN WINAPI RtlCreateUnicodeStringFromAsciiz(PUNICODE_STRING,LPCSTR); NTSYSAPI NTSTATUS WINAPI RtlCreateUserProcess(UNICODE_STRING*,ULONG,RTL_USER_PROCESS_PARAMETERS*,SECURITY_DESCRIPTOR*,SECURITY_DESCRIPTOR*,HANDLE,BOOLEAN,HANDLE,HANDLE,RTL_USER_PROCESS_INFORMATION*); NTSYSAPI NTSTATUS WINAPI RtlCreateUserThread(HANDLE,SECURITY_DESCRIPTOR*,BOOLEAN,PVOID,SIZE_T,SIZE_T,PRTL_THREAD_START_ROUTINE,void*,HANDLE*,CLIENT_ID*); +NTSYSAPI NTSTATUS WINAPI RtlCreateUserStack(SIZE_T,SIZE_T,ULONG,SIZE_T,SIZE_T,INITIAL_TEB*); NTSYSAPI void WINAPI RtlDeactivateActivationContext(DWORD,ULONG_PTR); NTSYSAPI PVOID WINAPI RtlDecodePointer(PVOID); NTSYSAPI NTSTATUS WINAPI RtlDecompressBuffer(USHORT,PUCHAR,ULONG,PUCHAR,ULONG,PULONG); @@ -2691,6 +2692,7 @@ NTSYSAPI void WINAPI RtlFreeOemString(POEM_STRING); NTSYSAPI DWORD WINAPI RtlFreeSid(PSID); NTSYSAPI void WINAPI RtlFreeThreadActivationContextStack(void); NTSYSAPI void WINAPI RtlFreeUnicodeString(PUNICODE_STRING); +NTSYSAPI void WINAPI RtlFreeUserStack(void*); NTSYSAPI NTSTATUS WINAPI RtlGetAce(PACL,DWORD,LPVOID *); NTSYSAPI NTSTATUS WINAPI RtlGetActiveActivationContext(HANDLE*); NTSYSAPI NTSTATUS WINAPI RtlGetCompressionWorkSpaceSize(USHORT,PULONG,PULONG);

1 0