March 2018 - Wine-commits - list.winehq.org

Hans Leidekker : bcrypt/tests: Add more tests for BCryptGenerateSymmetricKey and BCryptDuplicateKey.
by Alexandre Julliard 22 Mar '18

22 Mar '18

Module: wine Branch: master Commit: aabc55c491be9df24fd471ab002be1a16b597b59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aabc55c491be9df24fd471ab… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Mar 22 11:33:39 2018 +0100 bcrypt/tests: Add more tests for BCryptGenerateSymmetricKey and BCryptDuplicateKey. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/tests/bcrypt.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index d33c096..0bd91af 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -516,6 +516,11 @@ static void test_BCryptGenerateSymmetricKey(void) ret = pBCryptGetProperty(aes, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + key = (void *)0xdeadbeef; + ret = pBCryptGenerateSymmetricKey(NULL, &key, NULL, 0, secret, sizeof(secret), 0); + ok(ret == STATUS_INVALID_HANDLE, "got %08x\n", ret); + ok(key == (void *)0xdeadbeef, "got %p\n", key); + key = NULL; buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); ret = pBCryptGenerateSymmetricKey(aes, &key, buf, len, secret, sizeof(secret), 0); @@ -551,8 +556,10 @@ static void test_BCryptGenerateSymmetricKey(void) for (i = 0; i < 16; i++) ok(ciphertext[i] == expected[i], "%u: %02x != %02x\n", i, ciphertext[i], expected[i]); + key2 = (void *)0xdeadbeef; ret = pBCryptDuplicateKey(NULL, &key2, NULL, 0, 0); ok(ret == STATUS_INVALID_HANDLE, "got %08x\n", ret); + ok(key2 == (void *)0xdeadbeef, "got %p\n", key2); if (0) /* crashes on some Windows versions */ { @@ -660,9 +667,11 @@ static void test_BCryptEncrypt(void) ret = pBCryptGetProperty(aes, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + key = NULL; buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); ret = pBCryptGenerateSymmetricKey(aes, &key, buf, len, secret, sizeof(secret), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(key != NULL, "key not set\n"); /* input size is a multiple of block size */ size = 0; @@ -771,9 +780,11 @@ static void test_BCryptEncrypt(void) ret = pBCryptGetProperty(aes, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + key = NULL; buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); ret = pBCryptGenerateSymmetricKey(aes, &key, buf, len, secret, sizeof(secret), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(key != NULL, "key not set\n"); memset(&auth_info, 0, sizeof(auth_info)); auth_info.cbSize = sizeof(auth_info); @@ -913,9 +924,11 @@ static void test_BCryptDecrypt(void) ret = pBCryptGetProperty(aes, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + key = NULL; buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); ret = pBCryptGenerateSymmetricKey(aes, &key, buf, len, secret, sizeof(secret), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(key != NULL, "key not set\n"); /* input size is a multiple of block size */ size = 0; @@ -1012,9 +1025,11 @@ static void test_BCryptDecrypt(void) ret = BCryptSetProperty(aes, BCRYPT_CHAINING_MODE, (UCHAR*)BCRYPT_CHAIN_MODE_GCM, sizeof(BCRYPT_CHAIN_MODE_GCM), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + key = NULL; buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); ret = pBCryptGenerateSymmetricKey(aes, &key, buf, len, secret, sizeof(secret), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(key != NULL, "key not set\n"); memset(&auth_info, 0, sizeof(auth_info)); auth_info.cbSize = sizeof(auth_info);

1 0

Andrew Wesie : bcrypt: Fix BCryptEncrypt with AES_GCM and no input and no output.
by Alexandre Julliard 22 Mar '18

22 Mar '18

Module: wine Branch: master Commit: 5118eb3ab5e3ba063e55472f4bacdce9311a273d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5118eb3ab5e3ba063e55472f… Author: Andrew Wesie <awesie(a)gmail.com> Date: Thu Mar 22 11:33:40 2018 +0100 bcrypt: Fix BCryptEncrypt with AES_GCM and no input and no output. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 2 +- dlls/bcrypt/tests/bcrypt.c | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index b21dc1f..e05e94c 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1440,7 +1440,7 @@ NTSTATUS WINAPI BCryptEncrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp *ret_len = input_len; if (flags & BCRYPT_BLOCK_PADDING) return STATUS_INVALID_PARAMETER; - if (!output) return STATUS_SUCCESS; + if (input && !output) return STATUS_SUCCESS; if (output_len < *ret_len) return STATUS_BUFFER_TOO_SMALL; if (auth_info->pbAuthData && (status = key_set_auth_data( key, auth_info->pbAuthData, auth_info->cbAuthData ))) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 0bd91af..d38e581 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -647,6 +647,9 @@ static void test_BCryptEncrypt(void) {0x9a,0x92,0x32,0x2c,0x61,0x2a,0xae,0xef,0x66,0x2a,0xfb,0x55,0xe9,0x48,0xdf,0xbd}; static UCHAR expected_tag3[] = {0x17,0x9d,0xc0,0x7a,0xf0,0xcf,0xaa,0xd5,0x1c,0x11,0xc4,0x4b,0xd6,0xa3,0x3e,0x77}; + static UCHAR expected_tag4[] = + {0x4c,0x42,0x83,0x9e,0x8d,0x40,0xf1,0x19,0xd6,0x2b,0x1c,0x66,0x03,0x2b,0x39,0x63}; + BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO auth_info; UCHAR *buf, ciphertext[48], ivbuf[16], tag[16]; BCRYPT_AUTH_TAG_LENGTHS_STRUCT tag_length; @@ -842,6 +845,21 @@ static void test_BCryptEncrypt(void) for (i = 0; i < 16; i++) ok(tag[i] == expected_tag3[i], "%u: %02x != %02x\n", i, tag[i], expected_tag3[i]); + memset(tag, 0xff, sizeof(tag)); + ret = pBCryptEncrypt(key, data2, 0, &auth_info, ivbuf, 16, NULL, 0, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(!size, "got %u\n", size); + for (i = 0; i < 16; i++) + ok(tag[i] == 0xff, "%u: %02x != %02x\n", i, tag[i], 0xff); + + memset(tag, 0xff, sizeof(tag)); + ret = pBCryptEncrypt(key, NULL, 0, &auth_info, ivbuf, 16, NULL, 0, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(!size, "got %u\n", size); + ok(!memcmp(tag, expected_tag4, sizeof(expected_tag4)), "wrong tag\n"); + for (i = 0; i < 16; i++) + ok(tag[i] == expected_tag4[i], "%u: %02x != %02x\n", i, tag[i], expected_tag4[i]); + /* test with padding */ memcpy(ivbuf, iv, sizeof(iv)); memset(ciphertext, 0, sizeof(ciphertext));

1 0

Henri Verbeet : wined3d: Get rid of the "StrictDrawOrdering" setting.
by Alexandre Julliard 22 Mar '18

22 Mar '18

Module: wine Branch: master Commit: 70f017ac4d40642195947f6e03aff83c246dede8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70f017ac4d40642195947f6e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 22 14:40:43 2018 +0430 wined3d: Get rid of the "StrictDrawOrdering" setting. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 5 ++--- dlls/wined3d/buffer.c | 2 -- dlls/wined3d/context.c | 6 ------ dlls/wined3d/device.c | 5 ++--- dlls/wined3d/surface.c | 14 +++----------- dlls/wined3d/texture.c | 3 --- dlls/wined3d/wined3d_main.c | 8 -------- dlls/wined3d/wined3d_private.h | 1 - 8 files changed, 7 insertions(+), 37 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e9c9d7d..4b4cd4e 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7886,9 +7886,8 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl /* Leave the opengl state valid for blitting */ arbfp_blit_unset(context->gl_info); - if (wined3d_settings.strict_draw_ordering - || (dst_texture->swapchain && (dst_texture->swapchain->front_buffer == dst_texture))) - context->gl_info->gl_ops.gl.p_glFlush(); /* Flush to ensure ordering across contexts. */ + if (dst_texture->swapchain && (dst_texture->swapchain->front_buffer == dst_texture)) + context->gl_info->gl_ops.gl.p_glFlush(); return dst_location; } diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 1055326..5b92470 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1183,8 +1183,6 @@ static void wined3d_buffer_unmap(struct wined3d_buffer *buffer) } GL_EXTCALL(glUnmapBuffer(buffer->buffer_type_hint)); - if (wined3d_settings.strict_draw_ordering) - gl_info->gl_ops.gl.p_glFlush(); /* Flush to ensure ordering across contexts. */ context_release(context); buffer_clear_dirty_areas(buffer); diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 34102c7..db32f1d 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -4322,9 +4322,6 @@ void dispatch_compute(struct wined3d_device *device, const struct wined3d_state GL_EXTCALL(glMemoryBarrier(GL_ALL_BARRIER_BITS)); checkGLcall("glMemoryBarrier"); - if (wined3d_settings.strict_draw_ordering) - gl_info->gl_ops.gl.p_glFlush(); /* Flush to ensure ordering across contexts. */ - context_release(context); } @@ -4985,8 +4982,5 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s for (i = 0; i < context->buffer_fence_count; ++i) wined3d_fence_issue(context->buffer_fences[i], device); - if (wined3d_settings.strict_draw_ordering) - gl_info->gl_ops.gl.p_glFlush(); /* Flush to ensure ordering across contexts. */ - context_release(context); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c5517f5..d4e39db 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -457,9 +457,8 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c } } - if (wined3d_settings.strict_draw_ordering || (flags & WINED3DCLEAR_TARGET - && target->swapchain && target->swapchain->front_buffer == target)) - gl_info->gl_ops.gl.p_glFlush(); /* Flush to ensure ordering across contexts. */ + if (flags & WINED3DCLEAR_TARGET && target->swapchain && target->swapchain->front_buffer == target) + gl_info->gl_ops.gl.p_glFlush(); context_release(context); } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 2a725e6..ea6a984 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -337,9 +337,6 @@ static void texture2d_depth_blt_fbo(const struct wined3d_device *device, struct gl_info->fbo_ops.glBlitFramebuffer(src_rect->left, src_rect->top, src_rect->right, src_rect->bottom, dst_rect->left, dst_rect->top, dst_rect->right, dst_rect->bottom, gl_mask, GL_NEAREST); checkGLcall("glBlitFramebuffer()"); - - if (wined3d_settings.strict_draw_ordering) - gl_info->gl_ops.gl.p_glFlush(); /* Flush to ensure ordering across contexts. */ } static BOOL is_multisample_location(const struct wined3d_texture *texture, DWORD location) @@ -489,8 +486,7 @@ static void texture2d_blt_fbo(const struct wined3d_device *device, struct wined3 dst_rect->left, dst_rect->top, dst_rect->right, dst_rect->bottom, GL_COLOR_BUFFER_BIT, gl_filter); checkGLcall("glBlitFramebuffer()"); - if (wined3d_settings.strict_draw_ordering || (dst_location == WINED3D_LOCATION_DRAWABLE - && dst_texture->swapchain->front_buffer == dst_texture)) + if (dst_location == WINED3D_LOCATION_DRAWABLE && dst_texture->swapchain->front_buffer == dst_texture) gl_info->gl_ops.gl.p_glFlush(); if (restore_texture) @@ -1741,9 +1737,6 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_texture *dst_texture, un checkGLcall("glDeleteTextures(1, &backup)"); } - if (wined3d_settings.strict_draw_ordering) - gl_info->gl_ops.gl.p_glFlush(); /* Flush to ensure ordering across contexts. */ - context_release(context); /* The texture is now most up to date - If the surface is a render target @@ -2662,9 +2655,8 @@ static DWORD ffp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit checkGLcall("glDisable(GL_TEXTURE_RECTANGLE_ARB)"); } - if (wined3d_settings.strict_draw_ordering - || (dst_texture->swapchain && dst_texture->swapchain->front_buffer == dst_texture)) - gl_info->gl_ops.gl.p_glFlush(); /* Flush to ensure ordering across contexts. */ + if (dst_texture->swapchain && dst_texture->swapchain->front_buffer == dst_texture) + gl_info->gl_ops.gl.p_glFlush(); /* Restore the color key parameters */ wined3d_texture_set_color_key(src_texture, WINED3D_CKEY_SRC_BLT, diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 187e2a2..9e6b599 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1931,9 +1931,6 @@ void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int s } heap_free(converted_mem); - if (wined3d_settings.strict_draw_ordering) - gl_info->gl_ops.gl.p_glFlush(); - if (gl_info->quirks & WINED3D_QUIRK_FBO_TEX_UPDATE) { struct wined3d_device *device = texture->resource.device; diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index b57bcdc..56fae6b 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -83,7 +83,6 @@ struct wined3d_settings wined3d_settings = NULL, /* No wine logo by default */ TRUE, /* Prefer multisample textures to multisample renderbuffers. */ ~0u, /* Don't force a specific sample count by default. */ - FALSE, /* No strict draw ordering. */ FALSE, /* Don't range check relative addressing indices in float constants. */ ~0U, /* No VS shader model limit by default. */ ~0U, /* No HS shader model limit by default. */ @@ -290,13 +289,6 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) if (!get_config_key_dword(hkey, appkey, "SampleCount", &wined3d_settings.sample_count)) ERR_(winediag)("Forcing sample count to %u. This may not be compatible with all applications.\n", wined3d_settings.sample_count); - if (!get_config_key(hkey, appkey, "StrictDrawOrdering", buffer, size) - && !strcmp(buffer,"enabled")) - { - ERR_(winediag)("\"StrictDrawOrdering\" is deprecated, please use \"csmt\" instead.\n"); - TRACE("Enforcing strict draw ordering.\n"); - wined3d_settings.strict_draw_ordering = TRUE; - } if (!get_config_key(hkey, appkey, "CheckFloatConstants", buffer, size) && !strcmp(buffer, "enabled")) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fdbcd7c..5e8734e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -395,7 +395,6 @@ struct wined3d_settings char *logo; unsigned int multisample_textures; unsigned int sample_count; - BOOL strict_draw_ordering; BOOL check_float_constants; unsigned int max_sm_vs; unsigned int max_sm_hs;

1 0

Henri Verbeet : wined3d: Simplify context_resource_released().
by Alexandre Julliard 22 Mar '18

22 Mar '18

Module: wine Branch: master Commit: e5ab987d601ed23e63d22d33580af404ae3879ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5ab987d601ed23e63d22d33… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 22 14:40:44 2018 +0430 wined3d: Simplify context_resource_released(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 30 +++++++++--------------------- dlls/wined3d/resource.c | 2 +- dlls/wined3d/wined3d_private.h | 3 +-- 3 files changed, 11 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index db32f1d..04756be 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1055,34 +1055,22 @@ static void context_queue_fbo_entry_destruction(struct wined3d_context *context, list_add_head(&context->fbo_destroy_list, &entry->entry); } -void context_resource_released(const struct wined3d_device *device, - struct wined3d_resource *resource, enum wined3d_resource_type type) +void context_resource_released(const struct wined3d_device *device, struct wined3d_resource *resource) { - struct wined3d_texture *texture; - UINT i; + unsigned int i; if (!device->d3d_initialized) return; - switch (type) + for (i = 0; i < device->context_count; ++i) { - case WINED3D_RTYPE_TEXTURE_2D: - case WINED3D_RTYPE_TEXTURE_3D: - texture = texture_from_resource(resource); - - for (i = 0; i < device->context_count; ++i) - { - struct wined3d_context *context = device->contexts[i]; - if (context->current_rt.texture == texture) - { - context->current_rt.texture = NULL; - context->current_rt.sub_resource_idx = 0; - } - } - break; + struct wined3d_context *context = device->contexts[i]; - default: - break; + if (&context->current_rt.texture->resource == resource) + { + context->current_rt.texture = NULL; + context->current_rt.sub_resource_idx = 0; + } } } diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 8968c16..a95d6f5 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -222,7 +222,7 @@ static void wined3d_resource_destroy_object(void *object) struct wined3d_resource *resource = object; wined3d_resource_free_sysmem(resource); - context_resource_released(resource->device, resource, resource->type); + context_resource_released(resource->device, resource); wined3d_resource_release(resource); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5e8734e..506f7db 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2171,8 +2171,7 @@ void *context_map_bo_address(struct wined3d_context *context, const struct wined struct wined3d_context *context_reacquire(const struct wined3d_device *device, struct wined3d_context *context) DECLSPEC_HIDDEN; void context_release(struct wined3d_context *context) DECLSPEC_HIDDEN; -void context_resource_released(const struct wined3d_device *device, - struct wined3d_resource *resource, enum wined3d_resource_type type) DECLSPEC_HIDDEN; +void context_resource_released(const struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void context_restore(struct wined3d_context *context, struct wined3d_texture *texture, unsigned int sub_resource_idx) DECLSPEC_HIDDEN; BOOL context_set_current(struct wined3d_context *ctx) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Simplify device_resource_released() a little.
by Alexandre Julliard 22 Mar '18

22 Mar '18

Module: wine Branch: master Commit: f31ed9837a7285b80bb5d6fa76372ad9168bd798 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f31ed9837a7285b80bb5d6fa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 22 14:40:45 2018 +0430 wined3d: Simplify device_resource_released() a little. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 56 +++++++++++++++++++++++---------------------------- 1 file changed, 25 insertions(+), 31 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d4e39db..d2728d8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5073,55 +5073,49 @@ void device_resource_released(struct wined3d_device *device, struct wined3d_reso case WINED3D_RTYPE_TEXTURE_3D: for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) { - struct wined3d_texture *texture = texture_from_resource(resource); - - if (device->state.textures[i] == texture) + if (&device->state.textures[i]->resource == resource) { - ERR("Texture %p is still in use, stage %u.\n", texture, i); + ERR("Texture resource %p is still in use, stage %u.\n", resource, i); device->state.textures[i] = NULL; } - if (device->recording && device->update_state->textures[i] == texture) + if (device->recording && &device->update_state->textures[i]->resource == resource) { - ERR("Texture %p is still in use by recording stateblock %p, stage %u.\n", - texture, device->recording, i); + ERR("Texture resource %p is still in use by recording stateblock %p, stage %u.\n", + resource, device->recording, i); device->update_state->textures[i] = NULL; } } break; case WINED3D_RTYPE_BUFFER: + for (i = 0; i < MAX_STREAMS; ++i) { - struct wined3d_buffer *buffer = buffer_from_resource(resource); - - for (i = 0; i < MAX_STREAMS; ++i) + if (&device->state.streams[i].buffer->resource == resource) { - if (device->state.streams[i].buffer == buffer) - { - ERR("Buffer %p is still in use, stream %u.\n", buffer, i); - device->state.streams[i].buffer = NULL; - } - - if (device->recording && device->update_state->streams[i].buffer == buffer) - { - ERR("Buffer %p is still in use by stateblock %p, stream %u.\n", - buffer, device->recording, i); - device->update_state->streams[i].buffer = NULL; - } + ERR("Buffer resource %p is still in use, stream %u.\n", resource, i); + device->state.streams[i].buffer = NULL; } - if (device->state.index_buffer == buffer) + if (device->recording && &device->update_state->streams[i].buffer->resource == resource) { - ERR("Buffer %p is still in use as index buffer.\n", buffer); - device->state.index_buffer = NULL; + ERR("Buffer resource %p is still in use by stateblock %p, stream %u.\n", + resource, device->recording, i); + device->update_state->streams[i].buffer = NULL; } + } - if (device->recording && device->update_state->index_buffer == buffer) - { - ERR("Buffer %p is still in use by stateblock %p as index buffer.\n", - buffer, device->recording); - device->update_state->index_buffer = NULL; - } + if (&device->state.index_buffer->resource == resource) + { + ERR("Buffer resource %p is still in use as index buffer.\n", resource); + device->state.index_buffer = NULL; + } + + if (device->recording && &device->update_state->index_buffer->resource == resource) + { + ERR("Buffer resource %p is still in use by stateblock %p as index buffer.\n", + resource, device->recording); + device->update_state->index_buffer = NULL; } break;

1 0

Henri Verbeet : wined3d: Use gl_info from the wined3d_shader_context in shader_hw_sample().
by Alexandre Julliard 22 Mar '18

22 Mar '18

Module: wine Branch: master Commit: 9d2f4cdbdd5db84cc67e7d6c032c7df0cd5bc0f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d2f4cdbdd5db84cc67e7d6c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 22 14:40:46 2018 +0430 wined3d: Use gl_info from the wined3d_shader_context in shader_hw_sample(). For simplicity. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 4b4cd4e..23f69a2 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1416,9 +1416,6 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD struct shader_arb_ctx_priv *priv = ins->ctx->backend_data; const char *mod; BOOL pshader = shader_is_pshader_version(ins->ctx->reg_maps->shader_version.type); - const struct wined3d_shader *shader; - const struct wined3d_device *device; - const struct wined3d_gl_info *gl_info; const char *tex_dst = dst_str; struct color_fixup_masks masks; @@ -1432,12 +1429,8 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD break; case WINED3D_SHADER_RESOURCE_TEXTURE_2D: - shader = ins->ctx->shader; - device = shader->device; - gl_info = &device->adapter->gl_info; - if (pshader && priv->cur_ps_args->super.np2_fixup & (1u << sampler_idx) - && gl_info->supported[ARB_TEXTURE_RECTANGLE]) + && ins->ctx->gl_info->supported[ARB_TEXTURE_RECTANGLE]) tex_type = "RECT"; else tex_type = "2D";

1 0

Józef Kucia : wined3d: Implement updating swap interval through wined3d_swapchain_present().
by Alexandre Julliard 22 Mar '18

22 Mar '18

Module: wine Branch: master Commit: 6aeb444e4ca7f8e60c503858bc52e4a75b150f7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6aeb444e4ca7f8e60c503858… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 22 08:48:31 2018 +0100 wined3d: Implement updating swap interval through wined3d_swapchain_present(). Based on a patch by Michael Müller. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/d3d8_private.h | 1 + dlls/d3d8/device.c | 4 ++++ dlls/d3d8/swapchain.c | 3 ++- dlls/d3d9/d3d9_private.h | 1 + dlls/d3d9/device.c | 23 +++++++++++++++++------ dlls/d3d9/swapchain.c | 3 ++- dlls/dxgi/swapchain.c | 10 +++++++--- dlls/wined3d/cs.c | 11 ++++++++++- dlls/wined3d/surface.c | 3 ++- dlls/wined3d/swapchain.c | 7 ++++--- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 4 ++-- include/wine/wined3d.h | 4 ++-- 13 files changed, 55 insertions(+), 21 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6aeb444e4ca7f8e60c50…

1 0

Józef Kucia : wined3d: Remove swap interval from swapchain description.
by Alexandre Julliard 22 Mar '18

22 Mar '18

Module: wine Branch: master Commit: 81459fb8a2ddedcab68683991611e463c4fee516 URL: https://source.winehq.org/git/wine.git/?a=commit;h=81459fb8a2ddedcab6868399… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 22 08:48:32 2018 +0100 wined3d: Remove swap interval from swapchain description. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/d3d8_private.h | 2 +- dlls/d3d8/device.c | 48 ++++++++++++----------------------------- dlls/d3d8/swapchain.c | 8 +++---- dlls/d3d9/d3d9_private.h | 4 ++-- dlls/d3d9/device.c | 49 ++++++++++++------------------------------ dlls/d3d9/swapchain.c | 33 +++++++++++++++++++++++----- dlls/dxgi/factory.c | 1 - dlls/wined3d/cs.c | 7 ++---- dlls/wined3d/device.c | 3 --- dlls/wined3d/surface.c | 4 ++-- dlls/wined3d/swapchain.c | 15 +++++-------- dlls/wined3d/wined3d_private.h | 4 +++- include/wine/wined3d.h | 9 ++++---- 13 files changed, 79 insertions(+), 108 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=81459fb8a2ddedcab686…

1 0

Józef Kucia : dxgi/tests: Add basic test for sync intervals.
by Alexandre Julliard 22 Mar '18

22 Mar '18

Module: wine Branch: master Commit: 3c53b193f7f36cb7ebd6cab42524de87f1ffb0df URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c53b193f7f36cb7ebd6cab4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 22 08:48:33 2018 +0100 dxgi/tests: Add basic test for sync intervals. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/device.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 8351a32..8172269 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -3353,6 +3353,63 @@ static void test_swapchain_parameters(void) DestroyWindow(window); } +static void test_swapchain_present(void) +{ + DXGI_SWAP_CHAIN_DESC swapchain_desc; + IDXGISwapChain *swapchain; + IDXGIAdapter *adapter; + IDXGIFactory *factory; + IDXGIDevice *device; + unsigned int i; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device(0))) + { + skip("Failed to create device.\n"); + return; + } + + hr = IDXGIDevice_GetAdapter(device, &adapter); + ok(SUCCEEDED(hr), "Failed to get adapter, hr %#x.\n", hr); + hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); + ok(SUCCEEDED(hr), "Failed to get parent, hr %#x.\n", hr); + IDXGIAdapter_Release(adapter); + + swapchain_desc.BufferDesc.Width = 800; + swapchain_desc.BufferDesc.Height = 600; + swapchain_desc.BufferDesc.RefreshRate.Numerator = 60; + swapchain_desc.BufferDesc.RefreshRate.Denominator = 60; + swapchain_desc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + swapchain_desc.BufferDesc.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED; + swapchain_desc.BufferDesc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED; + swapchain_desc.SampleDesc.Count = 1; + swapchain_desc.SampleDesc.Quality = 0; + swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; + swapchain_desc.BufferCount = 1; + swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); + swapchain_desc.Windowed = TRUE; + swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + swapchain_desc.Flags = 0; + + hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); + ok(SUCCEEDED(hr), "Failed to create swapchain, hr %#x.\n", hr); + + for (i = 0; i < 10; ++i) + { + hr = IDXGISwapChain_Present(swapchain, i, 0); + ok(hr == (i <= 4 ? S_OK : DXGI_ERROR_INVALID_CALL), + "Got unexpected hr %#x for sync interval %u.\n", hr, i); + } + hr = IDXGISwapChain_Present(swapchain, 0, 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + IDXGISwapChain_Release(swapchain); + refcount = IDXGIDevice_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(swapchain_desc.OutputWindow); +} + static void test_maximum_frame_latency(void) { IDXGIDevice1 *device1; @@ -3654,6 +3711,7 @@ START_TEST(device) test_private_data(); test_swapchain_resize(); test_swapchain_parameters(); + test_swapchain_present(); test_maximum_frame_latency(); test_output_desc(); test_object_wrapping();

1 0

Henri Verbeet : usp10: Use usp10_array_reserve() in usp10_language_add_feature_list().
by Alexandre Julliard 22 Mar '18

22 Mar '18

Module: wine Branch: master Commit: 0fe041305ec8346eb02579cc67812e8b29aa0b2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fe041305ec8346eb02579cc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 22 14:40:47 2018 +0430 usp10: Use usp10_array_reserve() in usp10_language_add_feature_list(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/opentype.c | 9 ++------- dlls/usp10/usp10_internal.h | 3 ++- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 8827265..b627aa2 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -2818,15 +2818,10 @@ static void usp10_language_add_feature_list(LoadedLanguage *language, char table TRACE("table_type %#x, %u features.\n", table_type, count); - if (!count) + if (!count || !usp10_array_reserve((void **)&language->features, &language->features_size, + language->feature_count + count, sizeof(*language->features))) return; - if (!language->feature_count) - language->features = heap_alloc(count * sizeof(*language->features)); - else - language->features = HeapReAlloc(GetProcessHeap(), 0, language->features, - (language->feature_count + count) * sizeof(*language->features)); - for (i = 0; i < count; ++i) { const OT_FeatureRecord *record; diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 99d7cd1..369a66d 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -163,8 +163,9 @@ typedef struct { OPENTYPE_TAG tag; const void *table[USP10_LANGUAGE_TABLE_COUNT]; BOOL features_initialized; - INT feature_count; LoadedFeature *features; + SIZE_T features_size; + SIZE_T feature_count; } LoadedLanguage; enum usp10_script_table

1 0