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

[PATCH 2/5] wined3d: Introduce wined3d_buffer_ops.buffer_prepare_location().
by Henri Verbeet 15 Aug '19

15 Aug '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/buffer.c | 86 ++++++++++++++++++++++++++++++------------ dlls/wined3d/wined3d_private.h | 2 + 2 files changed, 64 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index eeea57d2cfd..d3fcdd41fe1 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -593,31 +593,9 @@ static void buffer_conversion_upload(struct wined3d_buffer *buffer, struct wined } static BOOL wined3d_buffer_prepare_location(struct wined3d_buffer *buffer, - struct wined3d_context *context, DWORD location) + struct wined3d_context *context, unsigned int location) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - struct wined3d_buffer_gl *buffer_gl = wined3d_buffer_gl(buffer); - - switch (location) - { - case WINED3D_LOCATION_SYSMEM: - return wined3d_resource_prepare_sysmem(&buffer->resource); - - case WINED3D_LOCATION_BUFFER: - if (buffer_gl->buffer_object) - return TRUE; - - if (!(buffer->flags & WINED3D_BUFFER_USE_BO)) - { - WARN("Trying to create BO for buffer %p with no WINED3D_BUFFER_USE_BO.\n", buffer); - return FALSE; - } - return wined3d_buffer_gl_create_buffer_object(buffer_gl, context_gl); - - default: - ERR("Invalid location %s.\n", wined3d_debug_location(location)); - return FALSE; - } + return buffer->buffer_ops->buffer_prepare_location(buffer, context, location); } BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, @@ -1434,6 +1412,17 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d return WINED3D_OK; } +static BOOL wined3d_buffer_no3d_prepare_location(struct wined3d_buffer *buffer, + struct wined3d_context *context, unsigned int location) +{ + if (location == WINED3D_LOCATION_SYSMEM) + return wined3d_resource_prepare_sysmem(&buffer->resource); + + FIXME("Unhandled location %s.\n", wined3d_debug_location(location)); + + return FALSE; +} + static void wined3d_buffer_no3d_upload_ranges(struct wined3d_buffer *buffer, struct wined3d_context *context, const void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_map_range *ranges) { @@ -1448,6 +1437,7 @@ static void wined3d_buffer_no3d_download_ranges(struct wined3d_buffer *buffer, s static const struct wined3d_buffer_ops wined3d_buffer_no3d_ops = { + wined3d_buffer_no3d_prepare_location, wined3d_buffer_no3d_upload_ranges, wined3d_buffer_no3d_download_ranges, }; @@ -1462,6 +1452,34 @@ HRESULT wined3d_buffer_no3d_init(struct wined3d_buffer *buffer_no3d, struct wine return wined3d_buffer_init(buffer_no3d, device, desc, data, parent, parent_ops, &wined3d_buffer_no3d_ops); } +static BOOL wined3d_buffer_gl_prepare_location(struct wined3d_buffer *buffer, + struct wined3d_context *context, unsigned int location) +{ + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); + struct wined3d_buffer_gl *buffer_gl = wined3d_buffer_gl(buffer); + + switch (location) + { + case WINED3D_LOCATION_SYSMEM: + return wined3d_resource_prepare_sysmem(&buffer->resource); + + case WINED3D_LOCATION_BUFFER: + if (buffer_gl->buffer_object) + return TRUE; + + if (!(buffer->flags & WINED3D_BUFFER_USE_BO)) + { + WARN("Trying to create BO for buffer %p with no WINED3D_BUFFER_USE_BO.\n", buffer); + return FALSE; + } + return wined3d_buffer_gl_create_buffer_object(buffer_gl, context_gl); + + default: + ERR("Invalid location %s.\n", wined3d_debug_location(location)); + return FALSE; + } +} + /* Context activation is done by the caller. */ static void wined3d_buffer_gl_upload_ranges(struct wined3d_buffer *buffer, struct wined3d_context *context, const void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_map_range *ranges) @@ -1504,6 +1522,7 @@ static void wined3d_buffer_gl_download_ranges(struct wined3d_buffer *buffer, str static const struct wined3d_buffer_ops wined3d_buffer_gl_ops = { + wined3d_buffer_gl_prepare_location, wined3d_buffer_gl_upload_ranges, wined3d_buffer_gl_download_ranges, }; @@ -1522,6 +1541,24 @@ HRESULT wined3d_buffer_gl_init(struct wined3d_buffer_gl *buffer_gl, struct wined return wined3d_buffer_init(&buffer_gl->b, device, desc, data, parent, parent_ops, &wined3d_buffer_gl_ops); } +static BOOL wined3d_buffer_vk_prepare_location(struct wined3d_buffer *buffer, + struct wined3d_context *context, unsigned int location) +{ + switch (location) + { + case WINED3D_LOCATION_SYSMEM: + return wined3d_resource_prepare_sysmem(&buffer->resource); + + case WINED3D_LOCATION_BUFFER: + /* The Vulkan buffer is created during resource creation. */ + return TRUE; + + default: + FIXME("Unhandled location %s.\n", wined3d_debug_location(location)); + return FALSE; + } +} + static void wined3d_buffer_vk_upload_ranges(struct wined3d_buffer *buffer, struct wined3d_context *context, const void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_map_range *ranges) { @@ -1536,6 +1573,7 @@ static void wined3d_buffer_vk_download_ranges(struct wined3d_buffer *buffer, str static const struct wined3d_buffer_ops wined3d_buffer_vk_ops = { + wined3d_buffer_vk_prepare_location, wined3d_buffer_vk_upload_ranges, wined3d_buffer_vk_download_ranges, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b37f2c10203..fea31302ee0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4130,6 +4130,8 @@ struct wined3d_map_range struct wined3d_buffer_ops { + BOOL (*buffer_prepare_location)(struct wined3d_buffer *buffer, + struct wined3d_context *context, unsigned int location); void (*buffer_upload_ranges)(struct wined3d_buffer *buffer, struct wined3d_context *context, const void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_map_range *ranges); void (*buffer_download_ranges)(struct wined3d_buffer *buffer, struct wined3d_context *context, void *data, -- 2.11.0

1 0

[PATCH 1/5] wined3d: Introduce wined3d_resource_prepare_sysmem().
by Henri Verbeet 15 Aug '19

15 Aug '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/buffer.c | 9 ++------- dlls/wined3d/resource.c | 10 +++++++++- dlls/wined3d/texture.c | 15 ++++----------- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 16 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index b5f44c56ec3..eeea57d2cfd 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -601,12 +601,7 @@ static BOOL wined3d_buffer_prepare_location(struct wined3d_buffer *buffer, switch (location) { case WINED3D_LOCATION_SYSMEM: - if (buffer->resource.heap_memory) - return TRUE; - - if (!wined3d_resource_allocate_sysmem(&buffer->resource)) - return FALSE; - return TRUE; + return wined3d_resource_prepare_sysmem(&buffer->resource); case WINED3D_LOCATION_BUFFER: if (buffer_gl->buffer_object) @@ -1419,7 +1414,7 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d if (buffer->locations & WINED3D_LOCATION_SYSMEM || !(buffer->flags & WINED3D_BUFFER_USE_BO)) { - if (!wined3d_resource_allocate_sysmem(&buffer->resource)) + if (!wined3d_resource_prepare_sysmem(&buffer->resource)) return E_OUTOFMEMORY; } diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 2897ab143c1..bba940f42cb 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -395,7 +395,7 @@ void CDECL wined3d_resource_preload(struct wined3d_resource *resource) wined3d_cs_emit_preload_resource(resource->device->cs, resource); } -BOOL wined3d_resource_allocate_sysmem(struct wined3d_resource *resource) +static BOOL wined3d_resource_allocate_sysmem(struct wined3d_resource *resource) { void **p; SIZE_T align = RESOURCE_ALIGNMENT - 1 + sizeof(*p); @@ -415,6 +415,14 @@ BOOL wined3d_resource_allocate_sysmem(struct wined3d_resource *resource) return TRUE; } +BOOL wined3d_resource_prepare_sysmem(struct wined3d_resource *resource) +{ + if (resource->heap_memory) + return TRUE; + + return wined3d_resource_allocate_sysmem(resource); +} + void wined3d_resource_free_sysmem(struct wined3d_resource *resource) { void **p = resource->heap_memory; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 4d411bf33f2..7cde07ce817 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1505,14 +1505,6 @@ void wined3d_texture_gl_set_compatible_renderbuffer(struct wined3d_texture_gl *t checkGLcall("set compatible renderbuffer"); } -static BOOL wined3d_texture_prepare_sysmem(struct wined3d_texture *texture) -{ - if (texture->resource.heap_memory) - return TRUE; - - return wined3d_resource_allocate_sysmem(&texture->resource); -} - HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT width, UINT height, enum wined3d_format_id format_id, enum wined3d_multisample_type multisample_type, UINT multisample_quality, void *mem, UINT pitch) @@ -1638,7 +1630,8 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT } else { - wined3d_texture_prepare_sysmem(texture); + if (!wined3d_resource_prepare_sysmem(&texture->resource)) + ERR("Failed to allocate resource memory.\n"); valid_location = WINED3D_LOCATION_SYSMEM; } @@ -1813,7 +1806,7 @@ BOOL wined3d_texture_prepare_location(struct wined3d_texture *texture, unsigned switch (location) { case WINED3D_LOCATION_SYSMEM: - return wined3d_texture_prepare_sysmem(texture); + return wined3d_resource_prepare_sysmem(&texture->resource); case WINED3D_LOCATION_USER_MEMORY: if (!texture->user_memory) @@ -3296,7 +3289,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc if (desc->resource_type != WINED3D_RTYPE_TEXTURE_3D || !wined3d_texture_use_pbo(texture, gl_info)) { - if (!wined3d_resource_allocate_sysmem(&texture->resource)) + if (!wined3d_resource_prepare_sysmem(&texture->resource)) { wined3d_texture_cleanup_sync(texture); return E_OUTOFMEMORY; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3446a848bb7..b37f2c10203 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3437,7 +3437,6 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * unsigned int size, void *parent, const struct wined3d_parent_ops *parent_ops, const struct wined3d_resource_ops *resource_ops) DECLSPEC_HIDDEN; void resource_unload(struct wined3d_resource *resource) DECLSPEC_HIDDEN; -BOOL wined3d_resource_allocate_sysmem(struct wined3d_resource *resource) DECLSPEC_HIDDEN; void wined3d_resource_free_sysmem(struct wined3d_resource *resource) DECLSPEC_HIDDEN; const struct wined3d_format *wined3d_resource_get_decompress_format( const struct wined3d_resource *resource) DECLSPEC_HIDDEN; @@ -3445,6 +3444,7 @@ unsigned int wined3d_resource_get_sample_count(const struct wined3d_resource *re GLbitfield wined3d_resource_gl_map_flags(DWORD d3d_flags) DECLSPEC_HIDDEN; GLenum wined3d_resource_gl_legacy_map_flags(DWORD d3d_flags) DECLSPEC_HIDDEN; BOOL wined3d_resource_is_offscreen(struct wined3d_resource *resource) DECLSPEC_HIDDEN; +BOOL wined3d_resource_prepare_sysmem(struct wined3d_resource *resource) DECLSPEC_HIDDEN; void wined3d_resource_update_draw_binding(struct wined3d_resource *resource) DECLSPEC_HIDDEN; /* Tests show that the start address of resources is 32 byte aligned */ -- 2.11.0

1 0

[PATCH v2] ddraw/tests: Run the tests in parallel.
by Henri Verbeet 15 Aug '19

15 Aug '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v2: Get rid of a leftover debug line. This supersedes patch 168626. dlls/ddraw/tests/ddraw1.c | 187 +++++++++++++++++++++++++---------- dlls/ddraw/tests/ddraw2.c | 204 ++++++++++++++++++++++++++------------ dlls/ddraw/tests/ddraw4.c | 229 +++++++++++++++++++++++++++++-------------- dlls/ddraw/tests/ddraw7.c | 243 ++++++++++++++++++++++++++++++---------------- 4 files changed, 593 insertions(+), 270 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index cc228028e17..6f5fc64ca83 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -28,6 +28,13 @@ static BOOL is_ddraw64 = sizeof(DWORD) != sizeof(DWORD *); static DEVMODEW registry_mode; +static BOOL use_mt; + +static struct test_entry +{ + void (*test)(void); +} *mt_tests; +static size_t mt_tests_size, mt_test_count; static HRESULT (WINAPI *pDwmIsCompositionEnabled)(BOOL *); @@ -49,6 +56,63 @@ struct create_window_thread_param HANDLE thread; }; +static void queue_test(void (*test)(void)) +{ + if (mt_test_count >= mt_tests_size) + { + mt_tests_size = max(16, mt_tests_size * 2); + mt_tests = heap_realloc(mt_tests, mt_tests_size * sizeof(*mt_tests)); + } + mt_tests[mt_test_count++].test = test; +} + +static DWORD WINAPI thread_func(void *ctx) +{ + LONG *i = ctx, j; + + while (*i < mt_test_count) + { + j = *i; + if (InterlockedCompareExchange(i, j + 1, j) == j) + mt_tests[j].test(); + } + + return 0; +} + +static void run_queued_tests(void) +{ + unsigned int thread_count, i; + HANDLE *threads; + SYSTEM_INFO si; + LONG test_idx; + + if (!use_mt) + { + for (i = 0; i < mt_test_count; ++i) + { + mt_tests[i].test(); + } + + return; + } + + GetSystemInfo(&si); + thread_count = si.dwNumberOfProcessors; + threads = heap_calloc(thread_count, sizeof(*threads)); + for (i = 0, test_idx = 0; i < thread_count; ++i) + { + threads[i] = CreateThread(NULL, 0, thread_func, &test_idx, 0, NULL); + ok(!!threads[i], "Failed to create thread %u.\n", i); + } + WaitForMultipleObjects(thread_count, threads, TRUE, INFINITE); + for (i = 0; i < thread_count; ++i) + { + CloseHandle(threads[i]); + } + heap_free(threads); +} + static BOOL compare_color(D3DCOLOR c1, D3DCOLOR c2, BYTE max_diff) { if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) return FALSE; @@ -13069,8 +13133,19 @@ START_TEST(ddraw1) { DDDEVICEIDENTIFIER identifier; DEVMODEW current_mode; + unsigned int argc, i; IDirectDraw *ddraw; HMODULE dwmapi; + char **argv; + + use_mt = !getenv("WINETEST_NO_MT_D3D"); + + argc = winetest_get_mainargs(&argv); + for (i = 2; i < argc; ++i) + { + if (!strcmp(argv[i], "--single")) + use_mt = FALSE; + } if (!(ddraw = create_ddraw())) { @@ -13103,78 +13178,84 @@ START_TEST(ddraw1) if ((dwmapi = LoadLibraryA("dwmapi.dll"))) pDwmIsCompositionEnabled = (void *)GetProcAddress(dwmapi, "DwmIsCompositionEnabled"); + queue_test(test_clipper_blt); + queue_test(test_surface_interface_mismatch); + queue_test(test_viewport_object); + queue_test(test_zenable); + queue_test(test_ck_rgba); + queue_test(test_ck_default); + queue_test(test_surface_qi); + queue_test(test_device_qi); + queue_test(test_initialize); + queue_test(test_coop_level_surf_create); + queue_test(test_coop_level_multi_window); + queue_test(test_clear_rect_count); + queue_test(test_unsupported_formats); + queue_test(test_rt_caps); + queue_test(test_surface_lock); + queue_test(test_surface_discard); + queue_test(test_sysmem_overlay); + queue_test(test_pixel_format); + queue_test(test_create_surface_pitch); + queue_test(test_mipmap); + queue_test(test_palette_complex); + queue_test(test_p8_blit); + queue_test(test_material); + queue_test(test_lighting); + queue_test(test_specular_lighting); + queue_test(test_surface_desc_lock); + queue_test(test_texturemapblend); + queue_test(test_viewport_clear_rect); + queue_test(test_color_fill); + queue_test(test_range_colorkey); + queue_test(test_shademode); + queue_test(test_lockrect_invalid); + queue_test(test_yv12_overlay); + queue_test(test_overlay_rect); + queue_test(test_blt); + queue_test(test_blt_z_alpha); + queue_test(test_getdc); + queue_test(test_transform_vertices); + queue_test(test_surface_desc_size); + queue_test(test_texture_load); + queue_test(test_ck_operation); + queue_test(test_depth_readback); + queue_test(test_clear); + queue_test(test_enum_surfaces); + queue_test(test_execute_data); + queue_test(test_viewport); + queue_test(test_find_device); + queue_test(test_alphatest); + queue_test(test_clipper_refcount); + queue_test(test_d32_support); + + run_queued_tests(); + + /* These tests don't work reliably when run in parallel. */ + test_colorkey_precision(); + test_offscreen_overlay(); + test_caps(); + /* These tests use full-screen/exclusive mode, so shouldn't run in + * parallel. */ test_coop_level_create_device_window(); - test_clipper_blt(); test_coop_level_d3d_state(); - test_surface_interface_mismatch(); test_coop_level_threaded(); - test_viewport_object(); - test_zenable(); - test_ck_rgba(); - test_ck_default(); test_ck_complex(); - test_surface_qi(); - test_device_qi(); test_wndproc(); test_window_style(); test_redundant_mode_set(); test_coop_level_mode_set(); test_coop_level_mode_set_multi(); - test_initialize(); - test_coop_level_surf_create(); - test_coop_level_multi_window(); - test_clear_rect_count(); test_coop_level_activateapp(); - test_unsupported_formats(); - test_rt_caps(); test_primary_caps(); - test_surface_lock(); - test_surface_discard(); test_flip(); - test_sysmem_overlay(); test_primary_palette(); test_surface_attachment(); - test_pixel_format(); - test_create_surface_pitch(); - test_mipmap(); - test_palette_complex(); - test_p8_blit(); - test_material(); - test_lighting(); - test_specular_lighting(); test_palette_gdi(); test_palette_alpha(); test_lost_device(); - test_surface_desc_lock(); - test_texturemapblend(); - test_viewport_clear_rect(); - test_color_fill(); - test_colorkey_precision(); - test_range_colorkey(); - test_shademode(); - test_lockrect_invalid(); - test_yv12_overlay(); - test_offscreen_overlay(); - test_overlay_rect(); - test_blt(); - test_blt_z_alpha(); test_cross_device_blt(); - test_getdc(); - test_transform_vertices(); test_display_mode_surface_pixel_format(); - test_surface_desc_size(); - test_texture_load(); - test_ck_operation(); - test_depth_readback(); - test_clear(); - test_enum_surfaces(); - test_execute_data(); - test_viewport(); - test_find_device(); test_killfocus(); test_gdi_surface(); - test_alphatest(); - test_clipper_refcount(); - test_caps(); - test_d32_support(); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 595157b486f..bf1c99e501f 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -17,11 +17,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include <math.h> - #define COBJMACROS + #include "wine/test.h" +#include "wine/heap.h" #include <limits.h> #include <math.h> #include "ddrawi.h" @@ -29,6 +28,13 @@ static BOOL is_ddraw64 = sizeof(DWORD) != sizeof(DWORD *); static DEVMODEW registry_mode; +static BOOL use_mt; + +static struct test_entry +{ + void (*test)(void); +} *mt_tests; +static size_t mt_tests_size, mt_test_count; static HRESULT (WINAPI *pDwmIsCompositionEnabled)(BOOL *); @@ -50,6 +56,63 @@ struct create_window_thread_param HANDLE thread; }; +static void queue_test(void (*test)(void)) +{ + if (mt_test_count >= mt_tests_size) + { + mt_tests_size = max(16, mt_tests_size * 2); + mt_tests = heap_realloc(mt_tests, mt_tests_size * sizeof(*mt_tests)); + } + mt_tests[mt_test_count++].test = test; +} + +static DWORD WINAPI thread_func(void *ctx) +{ + LONG *i = ctx, j; + + while (*i < mt_test_count) + { + j = *i; + if (InterlockedCompareExchange(i, j + 1, j) == j) + mt_tests[j].test(); + } + + return 0; +} + +static void run_queued_tests(void) +{ + unsigned int thread_count, i; + HANDLE *threads; + SYSTEM_INFO si; + LONG test_idx; + + if (!use_mt) + { + for (i = 0; i < mt_test_count; ++i) + { + mt_tests[i].test(); + } + + return; + } + + GetSystemInfo(&si); + thread_count = si.dwNumberOfProcessors; + threads = heap_calloc(thread_count, sizeof(*threads)); + for (i = 0, test_idx = 0; i < thread_count; ++i) + { + threads[i] = CreateThread(NULL, 0, thread_func, &test_idx, 0, NULL); + ok(!!threads[i], "Failed to create thread %u.\n", i); + } + WaitForMultipleObjects(thread_count, threads, TRUE, INFINITE); + for (i = 0; i < thread_count; ++i) + { + CloseHandle(threads[i]); + } + heap_free(threads); +} + static BOOL compare_color(D3DCOLOR c1, D3DCOLOR c2, BYTE max_diff) { if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) return FALSE; @@ -13953,8 +14016,19 @@ START_TEST(ddraw2) { DDDEVICEIDENTIFIER identifier; DEVMODEW current_mode; + unsigned int argc, i; IDirectDraw2 *ddraw; HMODULE dwmapi; + char **argv; + + use_mt = !getenv("WINETEST_NO_MT_D3D"); + + argc = winetest_get_mainargs(&argv); + for (i = 2; i < argc; ++i) + { + if (!strcmp(argv[i], "--single")) + use_mt = FALSE; + } if (!(ddraw = create_ddraw())) { @@ -13987,85 +14061,91 @@ START_TEST(ddraw2) if ((dwmapi = LoadLibraryA("dwmapi.dll"))) pDwmIsCompositionEnabled = (void *)GetProcAddress(dwmapi, "DwmIsCompositionEnabled"); + queue_test(test_clipper_blt); + queue_test(test_surface_interface_mismatch); + queue_test(test_depth_blit); + queue_test(test_texture_load_ckey); + queue_test(test_viewport_object); + queue_test(test_zenable); + queue_test(test_ck_rgba); + queue_test(test_ck_default); + queue_test(test_surface_qi); + queue_test(test_device_qi); + queue_test(test_initialize); + queue_test(test_coop_level_surf_create); + queue_test(test_coop_level_multi_window); + queue_test(test_clear_rect_count); + queue_test(test_lighting_interface_versions); + queue_test(test_unsupported_formats); + queue_test(test_rt_caps); + queue_test(test_surface_lock); + queue_test(test_surface_discard); + queue_test(test_set_surface_desc); + queue_test(test_user_memory_getdc); + queue_test(test_sysmem_overlay); + queue_test(test_pixel_format); + queue_test(test_create_surface_pitch); + queue_test(test_mipmap); + queue_test(test_palette_complex); + queue_test(test_p8_blit); + queue_test(test_material); + queue_test(test_lighting); + queue_test(test_specular_lighting); + queue_test(test_surface_desc_lock); + queue_test(test_texturemapblend); + queue_test(test_viewport_clear_rect); + queue_test(test_color_fill); + queue_test(test_range_colorkey); + queue_test(test_shademode); + queue_test(test_lockrect_invalid); + queue_test(test_yv12_overlay); + queue_test(test_overlay_rect); + queue_test(test_blt); + queue_test(test_blt_z_alpha); + queue_test(test_getdc); + queue_test(test_draw_primitive); + queue_test(test_edge_antialiasing_blending); + queue_test(test_transform_vertices); + queue_test(test_surface_desc_size); + queue_test(test_ck_operation); + queue_test(test_set_render_state); + queue_test(test_depth_readback); + queue_test(test_clear); + queue_test(test_enum_surfaces); + queue_test(test_viewport); + queue_test(test_find_device); + queue_test(test_alphatest); + queue_test(test_clipper_refcount); + queue_test(test_d32_support); + + run_queued_tests(); + + /* These tests don't work reliably when run in parallel. */ + test_colorkey_precision(); + test_offscreen_overlay(); + test_caps(); + /* These tests use full-screen/exclusive mode, so shouldn't run in + * parallel. */ test_coop_level_create_device_window(); - test_clipper_blt(); test_coop_level_d3d_state(); - test_surface_interface_mismatch(); test_coop_level_threaded(); - test_depth_blit(); - test_texture_load_ckey(); - test_viewport_object(); - test_zenable(); - test_ck_rgba(); - test_ck_default(); test_ck_complex(); - test_surface_qi(); - test_device_qi(); test_wndproc(); test_window_style(); test_redundant_mode_set(); test_coop_level_mode_set(); test_coop_level_mode_set_multi(); - test_initialize(); - test_coop_level_surf_create(); - test_coop_level_multi_window(); - test_clear_rect_count(); test_coop_level_versions(); - test_lighting_interface_versions(); test_coop_level_activateapp(); - test_unsupported_formats(); - test_rt_caps(); test_primary_caps(); - test_surface_lock(); - test_surface_discard(); test_flip(); - test_set_surface_desc(); - test_user_memory_getdc(); - test_sysmem_overlay(); test_primary_palette(); test_surface_attachment(); - test_pixel_format(); - test_create_surface_pitch(); - test_mipmap(); - test_palette_complex(); - test_p8_blit(); - test_material(); - test_lighting(); - test_specular_lighting(); test_palette_gdi(); test_palette_alpha(); test_lost_device(); - test_surface_desc_lock(); - test_texturemapblend(); - test_viewport_clear_rect(); - test_color_fill(); - test_colorkey_precision(); - test_range_colorkey(); - test_shademode(); - test_lockrect_invalid(); - test_yv12_overlay(); - test_offscreen_overlay(); - test_overlay_rect(); - test_blt(); - test_blt_z_alpha(); test_cross_device_blt(); - test_getdc(); - test_draw_primitive(); - test_edge_antialiasing_blending(); - test_transform_vertices(); test_display_mode_surface_pixel_format(); - test_surface_desc_size(); - test_ck_operation(); - test_set_render_state(); - test_depth_readback(); - test_clear(); - test_enum_surfaces(); - test_viewport(); - test_find_device(); test_killfocus(); test_gdi_surface(); - test_alphatest(); - test_clipper_refcount(); - test_caps(); - test_d32_support(); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 567a8f38c01..4cb67421722 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -30,6 +30,13 @@ HRESULT WINAPI GetSurfaceFromDC(HDC dc, struct IDirectDrawSurface **surface, HDC static BOOL is_ddraw64 = sizeof(DWORD) != sizeof(DWORD *); static DEVMODEW registry_mode; +static BOOL use_mt; + +static struct test_entry +{ + void (*test)(void); +} *mt_tests; +static size_t mt_tests_size, mt_test_count; static HRESULT (WINAPI *pDwmIsCompositionEnabled)(BOOL *); @@ -56,6 +63,63 @@ struct create_window_thread_param HANDLE thread; }; +static void queue_test(void (*test)(void)) +{ + if (mt_test_count >= mt_tests_size) + { + mt_tests_size = max(16, mt_tests_size * 2); + mt_tests = heap_realloc(mt_tests, mt_tests_size * sizeof(*mt_tests)); + } + mt_tests[mt_test_count++].test = test; +} + +static DWORD WINAPI thread_func(void *ctx) +{ + LONG *i = ctx, j; + + while (*i < mt_test_count) + { + j = *i; + if (InterlockedCompareExchange(i, j + 1, j) == j) + mt_tests[j].test(); + } + + return 0; +} + +static void run_queued_tests(void) +{ + unsigned int thread_count, i; + HANDLE *threads; + SYSTEM_INFO si; + LONG test_idx; + + if (!use_mt) + { + for (i = 0; i < mt_test_count; ++i) + { + mt_tests[i].test(); + } + + return; + } + + GetSystemInfo(&si); + thread_count = si.dwNumberOfProcessors; + threads = heap_calloc(thread_count, sizeof(*threads)); + for (i = 0, test_idx = 0; i < thread_count; ++i) + { + threads[i] = CreateThread(NULL, 0, thread_func, &test_idx, 0, NULL); + ok(!!threads[i], "Failed to create thread %u.\n", i); + } + WaitForMultipleObjects(thread_count, threads, TRUE, INFINITE); + for (i = 0; i < thread_count; ++i) + { + CloseHandle(threads[i]); + } + heap_free(threads); +} + static BOOL compare_float(float f, float g, unsigned int ulps) { int x = *(int *)&f; @@ -16508,8 +16572,19 @@ START_TEST(ddraw4) { DDDEVICEIDENTIFIER identifier; DEVMODEW current_mode; + unsigned int argc, i; IDirectDraw4 *ddraw; HMODULE dwmapi; + char **argv; + + use_mt = !getenv("WINETEST_NO_MT_D3D"); + + argc = winetest_get_mainargs(&argv); + for (i = 2; i < argc; ++i) + { + if (!strcmp(argv[i], "--single")) + use_mt = FALSE; + } if (!(ddraw = create_ddraw())) { @@ -16542,100 +16617,106 @@ START_TEST(ddraw4) if ((dwmapi = LoadLibraryA("dwmapi.dll"))) pDwmIsCompositionEnabled = (void *)GetProcAddress(dwmapi, "DwmIsCompositionEnabled"); - test_process_vertices(); + queue_test(test_process_vertices); + queue_test(test_clipper_blt); + queue_test(test_surface_interface_mismatch); + queue_test(test_depth_blit); + queue_test(test_texture_load_ckey); + queue_test(test_viewport_object); + queue_test(test_zenable); + queue_test(test_ck_rgba); + queue_test(test_ck_default); + queue_test(test_surface_qi); + queue_test(test_device_qi); + queue_test(test_initialize); + queue_test(test_coop_level_surf_create); + queue_test(test_vb_discard); + queue_test(test_coop_level_multi_window); + queue_test(test_draw_strided); + queue_test(test_lighting); + queue_test(test_specular_lighting); + queue_test(test_clear_rect_count); + queue_test(test_lighting_interface_versions); + queue_test(test_texturemanage); + queue_test(test_block_formats_creation); + queue_test(test_unsupported_formats); + queue_test(test_rt_caps); + queue_test(test_surface_lock); + queue_test(test_surface_discard); + queue_test(test_set_surface_desc); + queue_test(test_user_memory_getdc); + queue_test(test_sysmem_overlay); + queue_test(test_private_data); + queue_test(test_pixel_format); + queue_test(test_create_surface_pitch); + queue_test(test_mipmap); + queue_test(test_palette_complex); + queue_test(test_p8_blit); + queue_test(test_material); + queue_test(test_vb_writeonly); + queue_test(test_surface_desc_lock); + queue_test(test_texturemapblend); + queue_test(test_signed_formats); + queue_test(test_color_fill); + queue_test(test_texcoordindex); + queue_test(test_range_colorkey); + queue_test(test_shademode); + queue_test(test_lockrect_invalid); + queue_test(test_yv12_overlay); + queue_test(test_overlay_rect); + queue_test(test_blt); + queue_test(test_blt_z_alpha); + queue_test(test_color_clamping); + queue_test(test_getdc); + queue_test(test_draw_primitive); + queue_test(test_edge_antialiasing_blending); + queue_test(test_transform_vertices); + queue_test(test_surface_desc_size); + queue_test(test_get_surface_from_dc); + queue_test(test_ck_operation); + queue_test(test_vb_refcount); + queue_test(test_compute_sphere_visibility); + queue_test(test_texture_stages_limits); + queue_test(test_set_render_state); + queue_test(test_depth_readback); + queue_test(test_clear); + queue_test(test_enum_surfaces); + queue_test(test_viewport); + queue_test(test_find_device); + queue_test(test_sysmem_draw); + queue_test(test_alphatest); + queue_test(test_clipper_refcount); + queue_test(test_d32_support); + + run_queued_tests(); + + /* These tests don't work reliably when run in parallel. */ + test_colorkey_precision(); + test_offscreen_overlay(); + test_map_synchronisation(); + test_caps(); + /* These tests use full-screen/exclusive mode, so shouldn't run in + * parallel. */ test_coop_level_create_device_window(); - test_clipper_blt(); test_coop_level_d3d_state(); - test_surface_interface_mismatch(); test_coop_level_threaded(); - test_depth_blit(); - test_texture_load_ckey(); - test_viewport_object(); - test_zenable(); - test_ck_rgba(); - test_ck_default(); test_ck_complex(); - test_surface_qi(); - test_device_qi(); test_wndproc(); test_window_style(); test_redundant_mode_set(); test_coop_level_mode_set(); test_coop_level_mode_set_multi(); - test_initialize(); - test_coop_level_surf_create(); - test_vb_discard(); - test_coop_level_multi_window(); - test_draw_strided(); - test_lighting(); - test_specular_lighting(); - test_clear_rect_count(); test_coop_level_versions(); - test_lighting_interface_versions(); test_coop_level_activateapp(); - test_texturemanage(); - test_block_formats_creation(); - test_unsupported_formats(); - test_rt_caps(); test_primary_caps(); - test_surface_lock(); - test_surface_discard(); test_flip(); - test_set_surface_desc(); - test_user_memory_getdc(); - test_sysmem_overlay(); test_primary_palette(); test_surface_attachment(); - test_private_data(); - test_pixel_format(); - test_create_surface_pitch(); - test_mipmap(); - test_palette_complex(); - test_p8_blit(); - test_material(); test_palette_gdi(); test_palette_alpha(); - test_vb_writeonly(); test_lost_device(); - test_surface_desc_lock(); - test_texturemapblend(); - test_signed_formats(); - test_color_fill(); - test_texcoordindex(); - test_colorkey_precision(); - test_range_colorkey(); - test_shademode(); - test_lockrect_invalid(); - test_yv12_overlay(); - test_offscreen_overlay(); - test_overlay_rect(); - test_blt(); - test_blt_z_alpha(); test_cross_device_blt(); - test_color_clamping(); - test_getdc(); - test_draw_primitive(); - test_edge_antialiasing_blending(); - test_transform_vertices(); test_display_mode_surface_pixel_format(); - test_surface_desc_size(); - test_get_surface_from_dc(); - test_ck_operation(); - test_vb_refcount(); - test_compute_sphere_visibility(); - test_texture_stages_limits(); - test_set_render_state(); - test_map_synchronisation(); - test_depth_readback(); - test_clear(); - test_enum_surfaces(); - test_viewport(); - test_find_device(); test_killfocus(); - test_sysmem_draw(); test_gdi_surface(); - test_alphatest(); - test_clipper_refcount(); - test_caps(); - test_d32_support(); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 116e34a1768..b5601bcc118 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -30,6 +30,13 @@ HRESULT WINAPI GetSurfaceFromDC(HDC dc, struct IDirectDrawSurface **surface, HDC static HRESULT (WINAPI *pDirectDrawCreateEx)(GUID *guid, void **ddraw, REFIID iid, IUnknown *outer_unknown); static BOOL is_ddraw64 = sizeof(DWORD) != sizeof(DWORD *); static DEVMODEW registry_mode; +static BOOL use_mt; + +static struct test_entry +{ + void (*test)(void); +} *mt_tests; +static size_t mt_tests_size, mt_test_count; static HRESULT (WINAPI *pDwmIsCompositionEnabled)(BOOL *); @@ -56,6 +63,63 @@ struct create_window_thread_param HANDLE thread; }; +static void queue_test(void (*test)(void)) +{ + if (mt_test_count >= mt_tests_size) + { + mt_tests_size = max(16, mt_tests_size * 2); + mt_tests = heap_realloc(mt_tests, mt_tests_size * sizeof(*mt_tests)); + } + mt_tests[mt_test_count++].test = test; +} + +static DWORD WINAPI thread_func(void *ctx) +{ + LONG *i = ctx, j; + + while (*i < mt_test_count) + { + j = *i; + if (InterlockedCompareExchange(i, j + 1, j) == j) + mt_tests[j].test(); + } + + return 0; +} + +static void run_queued_tests(void) +{ + unsigned int thread_count, i; + HANDLE *threads; + SYSTEM_INFO si; + LONG test_idx; + + if (!use_mt) + { + for (i = 0; i < mt_test_count; ++i) + { + mt_tests[i].test(); + } + + return; + } + + GetSystemInfo(&si); + thread_count = si.dwNumberOfProcessors; + threads = heap_calloc(thread_count, sizeof(*threads)); + for (i = 0, test_idx = 0; i < thread_count; ++i) + { + threads[i] = CreateThread(NULL, 0, thread_func, &test_idx, 0, NULL); + ok(!!threads[i], "Failed to create thread %u.\n", i); + } + WaitForMultipleObjects(thread_count, threads, TRUE, INFINITE); + for (i = 0; i < thread_count; ++i) + { + CloseHandle(threads[i]); + } + heap_free(threads); +} + static BOOL compare_float(float f, float g, unsigned int ulps) { int x = *(int *)&f; @@ -16480,7 +16544,18 @@ START_TEST(ddraw7) DDDEVICEIDENTIFIER2 identifier; HMODULE module, dwmapi; DEVMODEW current_mode; + unsigned int argc, i; IDirectDraw7 *ddraw; + char **argv; + + use_mt = !getenv("WINETEST_NO_MT_D3D"); + + argc = winetest_get_mainargs(&argv); + for (i = 2; i < argc; ++i) + { + if (!strcmp(argv[i], "--single")) + use_mt = FALSE; + } module = GetModuleHandleA("ddraw.dll"); if (!(pDirectDrawCreateEx = (void *)GetProcAddress(module, "DirectDrawCreateEx"))) @@ -16520,107 +16595,113 @@ START_TEST(ddraw7) if ((dwmapi = LoadLibraryA("dwmapi.dll"))) pDwmIsCompositionEnabled = (void *)GetProcAddress(dwmapi, "DwmIsCompositionEnabled"); - test_process_vertices(); + queue_test(test_process_vertices); + queue_test(test_clipper_blt); + queue_test(test_surface_interface_mismatch); + queue_test(test_depth_blit); + queue_test(test_texture_load_ckey); + queue_test(test_zenable); + queue_test(test_ck_rgba); + queue_test(test_ck_default); + queue_test(test_surface_qi); + queue_test(test_device_qi); + queue_test(test_initialize); + queue_test(test_coop_level_surf_create); + queue_test(test_vb_discard); + queue_test(test_coop_level_multi_window); + queue_test(test_draw_strided); + queue_test(test_lighting); + queue_test(test_specular_lighting); + queue_test(test_clear_rect_count); + queue_test(test_fog_special); + queue_test(test_lighting_interface_versions); + queue_test(test_texturemanage); + queue_test(test_block_formats_creation); + queue_test(test_unsupported_formats); + queue_test(test_rt_caps); + queue_test(test_surface_lock); + queue_test(test_surface_discard); + queue_test(test_set_surface_desc); + queue_test(test_user_memory_getdc); + queue_test(test_sysmem_overlay); + queue_test(test_private_data); + queue_test(test_pixel_format); + queue_test(test_create_surface_pitch); + queue_test(test_mipmap); + queue_test(test_palette_complex); + queue_test(test_p8_blit); + queue_test(test_material); + queue_test(test_vb_writeonly); + queue_test(test_resource_priority); + queue_test(test_surface_desc_lock); + queue_test(test_fog_interpolation); + queue_test(test_fog_process_vertices); + queue_test(test_negative_fixedfunction_fog); + queue_test(test_table_fog_zw); + queue_test(test_signed_formats); + queue_test(test_color_fill); + queue_test(test_texcoordindex); + queue_test(test_range_colorkey); + queue_test(test_shademode); + queue_test(test_lockrect_invalid); + queue_test(test_yv12_overlay); + queue_test(test_overlay_rect); + queue_test(test_blt); + queue_test(test_blt_z_alpha); + queue_test(test_color_clamping); + queue_test(test_getdc); + queue_test(test_draw_primitive); + queue_test(test_edge_antialiasing_blending); + queue_test(test_surface_desc_size); + queue_test(test_get_surface_from_dc); + queue_test(test_ck_operation); + queue_test(test_vb_refcount); + queue_test(test_compute_sphere_visibility); + queue_test(test_clip_planes_limits); + queue_test(test_texture_stages_limits); + queue_test(test_set_render_state); + queue_test(test_depth_readback); + queue_test(test_clear); + queue_test(test_enum_surfaces); + queue_test(test_viewport); + queue_test(test_device_load); + queue_test(test_color_vertex); + queue_test(test_sysmem_draw); + queue_test(test_multiply_transform); + queue_test(test_alphatest); + queue_test(test_clipper_refcount); + queue_test(test_begin_end_state_block); + queue_test(test_d32_support); + + run_queued_tests(); + + /* These tests don't work reliably when run in parallel. */ + test_colorkey_precision(); + test_offscreen_overlay(); + test_map_synchronisation(); + test_caps(); + /* These tests use full-screen/exclusive mode, so shouldn't run in + * parallel. */ test_coop_level_create_device_window(); - test_clipper_blt(); test_coop_level_d3d_state(); - test_surface_interface_mismatch(); test_coop_level_threaded(); - test_depth_blit(); - test_texture_load_ckey(); - test_zenable(); - test_ck_rgba(); - test_ck_default(); test_ck_complex(); - test_surface_qi(); - test_device_qi(); test_wndproc(); test_window_style(); test_redundant_mode_set(); test_coop_level_mode_set(); test_coop_level_mode_set_multi(); - test_initialize(); - test_coop_level_surf_create(); - test_vb_discard(); - test_coop_level_multi_window(); - test_draw_strided(); - test_lighting(); - test_specular_lighting(); - test_clear_rect_count(); test_coop_level_versions(); - test_fog_special(); - test_lighting_interface_versions(); test_coop_level_activateapp(); - test_texturemanage(); - test_block_formats_creation(); - test_unsupported_formats(); - test_rt_caps(); test_primary_caps(); - test_surface_lock(); - test_surface_discard(); test_flip(); - test_set_surface_desc(); - test_user_memory_getdc(); - test_sysmem_overlay(); test_primary_palette(); test_surface_attachment(); - test_private_data(); - test_pixel_format(); - test_create_surface_pitch(); - test_mipmap(); - test_palette_complex(); - test_p8_blit(); - test_material(); test_palette_gdi(); test_palette_alpha(); - test_vb_writeonly(); test_lost_device(); - test_resource_priority(); - test_surface_desc_lock(); - test_fog_interpolation(); - test_fog_process_vertices(); - test_negative_fixedfunction_fog(); - test_table_fog_zw(); - test_signed_formats(); - test_color_fill(); - test_texcoordindex(); - test_colorkey_precision(); - test_range_colorkey(); - test_shademode(); - test_lockrect_invalid(); - test_yv12_overlay(); - test_offscreen_overlay(); - test_overlay_rect(); - test_blt(); - test_blt_z_alpha(); test_cross_device_blt(); - test_color_clamping(); - test_getdc(); - test_draw_primitive(); - test_edge_antialiasing_blending(); test_display_mode_surface_pixel_format(); - test_surface_desc_size(); - test_get_surface_from_dc(); - test_ck_operation(); - test_vb_refcount(); - test_compute_sphere_visibility(); - test_clip_planes_limits(); - test_texture_stages_limits(); - test_set_render_state(); - test_map_synchronisation(); - test_depth_readback(); - test_clear(); - test_enum_surfaces(); - test_viewport(); - test_device_load(); - test_color_vertex(); test_killfocus(); - test_sysmem_draw(); test_gdi_surface(); - test_multiply_transform(); - test_alphatest(); - test_clipper_refcount(); - test_begin_end_state_block(); - test_caps(); - test_d32_support(); } -- 2.11.0

4 3

wine-4.0.2-rc1 Available
by Michael Stefaniuc 15 Aug '19

15 Aug '19

Hello guys, I have pushed wine-4.0.2-rc1 (with tag) to https://github.com/mstefani/wine-stable/tree/stable https://people.redhat.com/mstefani/wine/stable/ It was a painful process to test this version which accounts for the delay in getting it out. Interesting stuff in this release is that I have cherry-picked 3 commits that introduced regressions. Those regressions are fixed and cherry-picked too: bd7a48c25114 ==> bug 46792 ==> fixed by 9fc282d682cf ff92a993ad63 ==> bug 46811 ==> fixed by 9fc282d682cf 88580a3ad6e6 ==> bug 47009 ==> fixed by 3d9363446fad The important stuff from the ANNOUNCE file: What's new in this release (see below for details): - Various bug fixes ---------------------------------------------------------------- Bugs fixed in 4.0.2 (total 65): 15934 Can't see Worms 2 intro films as they play (mciavi32 missing support to MCI_MCIAVI_PLAY_FULLSCREEN) 18099 No keyboard response in Super Mario 3 remake 19098 Regedit randomly crashes when deleting registry keys 21403 Shiva Editor/Evochron: Mercenary refuse to run with built-in dinput/dinput8.dll 23455 FileAlyzer 1.6.0.4, Affinity-installer-1.6.5.123 can't load PE images (needs imagehlp.ImageLoad and imagehlp.ImageUnload implementation) 26445 URLDownloadToFileW does not support FTP URLs 28847 LabChart Reader 7.x crashes due to missing wmvcore 'IWMProfileManager2', CLSID '{7a924e51-73c1-494d-8019-23d37ed9b89a}' 33845 Warframe (Steam) updater fails to replace 'Launcher.exe', reports sharing violation 33904 Face Noir demo crashes on start without native d3dx9_36 ('D3DXLoadSkinMeshFromXof' must return 'ID3DXSkinInfo' interface even with no skinning info present) 36764 Rogue Squadron 3D 1.3: Unable to setup controller in-game 37784 wine-mono does not appear in "wine uninstaller" list on a 64-bit prefix 37871 GOG.com downloader (.NET 3.5 app) wants wininet.GetUrlCacheConfigInfoA/W implementation 38087 Settlers III: mouse not working on start screen and menu (after fixing raw input bug 33479) 43356 Mass Effect (1) Steam freezes since Steam Update from 8th of July 2017 43411 Older directx games (The Sims, Revenant) - Screen not redrawing properly (needs Set/GetClipStatus implementation) 44423 Office 2007/2010 32bit - links not working 45429 Inno Setup v5.x based game-installers using 'wintb' plugin fail with: 'Runtime error 229 at <address>' (Win7+ ITaskbarList3 ThumbBar/Thumbnail semi-stubs needed) 45543 Multiple games and applications crash in dwrite due to invalid index access to cluster array (Rekordbox 5.3.0, SpellForce 3) 45703 Microsoft Office 365 applications crash on startup (Microsoft AppV ISV virtual filesystem technology requires several native and core API to be hot-patchable) 45878 Aruba digital signature crashes on missing hid.dll.HidD_FlushQueue 46019 Multiple NSIS 2.x based installers fail due to invalid module handle passed to 'kernel32.FreeLibrary', causing code dll unmapped as data dll (Adobe Digital Editions 4.5.x, ConceptDraw Office 4) 46115 Cursor in unity games moving down and to the right one pixel on any mouse interaction 46187 Windows PowerShell Core 6.2 Preview 2 for ARM32 crashes due to unhandled trap_no 0 (write watch access causes SIGSEGV) 46189 Windows PowerShell Core 6.2 Preview 2 for ARM32 crashes due to ntdll 'set_cpu_context' not restoring Thumb mode during return from exception handling 46316 Hauppauge Capture version 36187 crashes during install 46371 FFXI + Ashita random crash ingame 46579 F.E.A.R. 2: Project Origin screen is completely light grey while playing intro movie 46626 UPlay fails to start : "Error at hooking API LoadStringA" (UPlay's hooking engine can't handle ENDBR32 instruction inserted at non-hotpatch API entries due to distro build environments '-fcf-protection') 46706 Eventide H9 Control crashes on unimplemented function bthprops.cpl.BluetoothFindDeviceClose 46711 Since 3.3 other HID devices than Joysticks not supported anymore 46712 Atelier Firis config tool crashes with "Unhandled page fault on execute access" 46713 School days HQ occasional divide by zero 46721 Two quotes together (in outer quotes) not parsed correctly in argv 46754 Multiple application installers fail in VBscripts due to IWshEnvironment::Item property returning BSTR with embedded null terminator (PostgreSQL 9.3) 46761 BigNox VM VirtualBox Support Driver 'YSDrv.sys' (part of NoxPlayer 6.x) crashes on unimplemented function ntoskrnl.exe.MmBuildMdlForNonPagedPool 46772 Creo Elements/Direct Modeling Express 6.0 installer fails with VBScript parser error: parser_lex '_' not followed by newline 46800 LINE (Powered by Naver): LINE v5.12.XXX series crashes after few seconds 46807 The Sims hangs when opening menus 46811 Inquisitor: black screen after start in fullscreen mode 46812 PS4 Remote Play installer 2.8.x fails, claims 'You need the Media Feature Pack' (MsiGetDatabaseState is called from a custom action) 46845 Freelancer: character glitches in cutscenes after loading a saved game 46848 PTC Mathcad Prime 3.0 Web installer crashes on unimplemented function api-ms-win-crt-convert-l1-1-0.dll.wctrans 46863 If prefix contains "windows" drive information not available in 64-bit prefix 46881 Power World Simulator installer needs unimplemented function msi.dll.MsiSourceListForceResolutionW 46894 SIMATIC WinCC V15.1 Runtime installer (.NET 4.0) fails in CoreLib::GetPhysicalMemoryAmountWmi() (missing 'DeviceLocator' property of 'Win32_PhysicalMemory' WMI class) 46895 SIMATIC WinCC V15.1 Runtime installer (.NET 4.0) fails due to missing 'OperatingSystemSKU' property of 'Win32_OperatingSystem' WMI class 46899 SIMATIC WinCC V15.1 Runtime installer: user can't accept license terms (richedit20 ITextRange::ScrollIntoView lacks handling of 'tomEnd') 46902 SIMATIC WinCC V15.1 Runtime installer: S7Inst64.exe sub-installer crashes on unimplemented function msvcr110.dll._wcsnset_s 46903 SIMATIC WinCC V15.1 Runtime installer: AdHocSigner.exe tool crashes on unimplemented functions mssign32.dll.SignerSignEx and SignerFreeSignerContext 46906 SIMATIC WinCC V15.1 Runtime installer: SeCon tool 'SeCon_Win32.exe' crashes due to hnetcfg 'INetFwRules::get__NewEnum' not initializing out parameter 46908 Support msvcp mtx_init 'mtx_try' flag (0x2) to create a mutex object that supports test and return 46909 Missing (black) textures in Black & White 46923 X-Tension, X-Beyond The Frontier: Dynamic light breaks after opening up a menu 46928 Atelier Firis config tool doesn't show up when launched through Steam 46939 propvarutil.h: missing extern "C" 46953 Watch_Dogs crashes after intro 46971 Multiple Steam games crash with Wine 4.6 (Steam Game Overlay Renderer hook engine requires several API to be hot-patchable) (Sniper Elite V2, Sniper Elite 3, Brawlhalla) 46989 Grand Prix Legends: Wheel (Wheel, Gas, Brake) axes inputs aren't recognized 46996 Improvements to the 7.1 and 5.1 to stereo conversion 47009 msi x64 installation file created by Visual Studio cannot be uninstalled 47022 Multiple performance monitor applications fail to display system physical/committed virtual memory usage (Sysinternals Process Explorer v16.x, builtin Taskmgr) 47031 widl generates invalid typelib when importing types from multiple typelibs 47051 Microsoft Excel 2016 (Office 365) crashes on startup (Microsoft AppV ISV virtual filesystem technology requires kernel32.CreateActCtxW to be hot-patchable) 47065 Vocaloid 5 (.NET 4.x app) crashes on startup (needs 'Win32_OperatingSystem' WMI class 'SystemDrive' property) 47183 Grand Prix Legends: Only the first two axes are recognized ---------------------------------------------------------------- Changes since 4.0.1: Alexandre Julliard (2): kernel32: Validate handle before freeing a LOAD_LIBRARY_AS_DATAFILE module. ntdll: Check for time conversion error to silence a compiler warning. Alistair Leslie-Hughes (6): regedit: Grow the buffer when modifying a DWORD value. urlmon: Pass unescaped URLs to InternetOpenUrl in ftp protocol handler. hid: Implement HidD_FlushQueue(). dinput: Ensure Cursor is visible on config dialog. dinput: Allow enumeration of joysticks with DirectX 3. dinput: Handle setting DIPROP_CALIBRATIONMODE mode in generic implementation. Andrey Gusev (2): dxgi: Add DECLSPEC_HOTPATCH to d3d11_swapchain_Present(). setupapi: Add DECLSPEC_HOTPATCH to SetupDiEnumDeviceInfo(). André Hentschel (5): ntdll: Add stub for RtlInstallFunctionTableCallback on ARM/ARM64. ntdll: Adjust PC according to THUMB/ARM flag. kernel32: Add forward for RtlInstallFunctionTableCallback on ARM/ARM64. include: Fix vararg standard call types for ARM. ntdll: Translate signal to trap when trap code is 0 on ARM. Austin English (1): propvarutil.h: Add extern "C" if __cplusplus is defined. Brendan McGrath (1): kernel32: Allow double quote style escape in argv. Bruno Jesus (1): mciavi32: Add Support for MCI_MCIAVI_PLAY_FULLSCREEN. Claudio Fontana (1): kernel32: Allow empty profile section and key name strings. Dmitry Timoshkov (1): wininet: Return proper cache path from GetUrlCacheConfigInfo. Gijs Vermeulen (8): wmvcore: Upgrade to IWMProfileManager2. ntoskrnl.exe: Add MmBuildMdlForNonPagedPool stub. msvcr120: Add [to]wctrans. hnetcfg: Initialize INetFwRules::get__NewEnum out parameter. msvcrt: Implement _wcsnset_s. mssign32: Add SignerSignEx stub. mssign32: Implement SignerFreeSignerContext. riched20: Handle tomEnd in ITextRange::ScrollIntoView. Hans Leidekker (3): wbemprox: Implement Win32_PhysicalMemory.DeviceLocator. wbemprox: Implement Win32_OperatingSystem.OperatingSystemSKU. wbemprox: Implement Win32_OperatingSystem.SystemDrive. Henri Verbeet (1): wined3d: Also update the "src_texture_gl" pointer when using a staging texture in the blitter. Józef Kucia (1): dxgi: Do not forward d3d11_swapchain_Present() to d3d11_swapchain_Present1(). Louis Lenders (8): bthprops.cpl: Add BluetoothFindDeviceClose stub. explorerframe: Return S_OK in ITaskbarList3 SetThumbnailTooltip method. explorerframe: Return S_OK in ITaskbarList3 ThumbBarAddButtons. explorerframe: Return S_OK in ITaskbarList3 ThumbBarUpdateButtons method. msi: Add MsiSourceListForceResolution{A,W} stub. ntdll: Add DECLSPEC_HOTPATCH to NtQueryDirectoryFile. ntdll: Add DECLSPEC_HOTPATCH to NtQueryValueKey. kernel32: Add DECLSPEC_HOTPATCH to CreateActCtx. Mark Jansen (1): imagehlp/tests: Add tests for ImageLoad, ImageUnload, GetImageUnusedHeaderBytes. Matteo Bruni (8): d3d9: Release system memory wined3d buffer only after the draw buffer is destroyed. d3d8: Release system memory wined3d buffer only after the draw buffer is destroyed. d3d9: Return failure in CheckDeviceFormat() for unsupported adapter formats. d3d8: Return failure in CheckDeviceFormat() for unsupported adapter formats. wined3d: Set display mode to a suitable adapter format. d3d9: Validate vertex stride in Draw[Indexed]PrimitiveUP(). d3d8: Validate vertex stride in Draw[Indexed]PrimitiveUP(). wined3d: Avoid a GCC 8 warning. Michael Müller (2): imagehlp: Implement ImageLoad and cleanup ImageUnload. d3dx9/tests: Add initial tests for dummy skin info interface. Nikola Pavlica (2): dsound: Revised 5.1 to stereo downmix. dsound: Added 7.1 to stereo downmix. Nikolay Sivov (4): user32: Do not touch some of the values on 64-bit with SetWindowLong(). user32: Make GetWindowLong() fail for some values on 64-bit. wshom.ocx: Fix string length returned from Check returned BSTR length. dwrite/layout: Fix invalid index access to cluster array. Paul Gofman (4): ddraw: Deny adding the same light to viewports multiple times. ddraw: Fix ddraw[1-4] light activation / deactivation. ddraw: Improve d3d_device7_GetClipStatus() stub. xaudio2_7: Also preserve %ebx in call_on_voice_processing_pass_start(). Piotr Caban (5): msvcrt: Don't detect overflow in atol implementation. msvcrt: Use correct locale when comparing strings in getenv. msvcp90: Add support for more creation flags in _Mtx class. msvcp140: Don't forward __ExceptionPtrDestroy to msvcr120. msvcr110: Fix __crtGetShowWindowMode implementation. Sebastian Lackner (4): server: Improve handling of cursor position clipping for empty rectangle. winex11: Forward all clipping requests to the right thread. dinput: Do not wait for hook thread startup in IDirectInput8::Initialize. dinput: Avoid deadlock when CS are acquired in different order. Thomas J. Moore (1): ntdll: Also try to stat() the drive root. Tim Schumacher (2): winejoystick: Add support for wheel axes. dinput: Map wheel, gas, and brake axes as well. Vijay Kiran Kamuju (3): d3dx9: Generate ID3DXSkinInfo in D3DXLoadSkinMeshFromXof() when needed. ntdll: Report system information SystemPerformanceInformation info class. wpcap: Fix compile warnings for redefinition of PCAP_OPENFLAG_PROMISCUOUS. Vincent Povirk (1): uninstaller: Re-exec as 64-bit in wow64. Vlad Bespalov (1): user32: Make LoadString[AW] patchable. Zebediah Figura (12): mshtml: Open pages in the native browser in HlinkTarget_Navigate(). vbscript: Handle carriage return in more places. hid: Fix length argument to GetOverlappedResult(). msi/tests: Test calling more functions from custom actions. msi: Return MSIDBSTATE_ERROR when MsiGetDatabaseState() is called from a custom action. msi: Fix handling of architecture in MSIREG_{Open, Delete}UninstallKey(). winebus.sys: Retrieve hidraw device strings from the parent USB device. hid: Implement HidD_GetIndexedString(). devenum: Return S_FALSE from CreateClassEnumerator() if no devices exist. d3d9/tests: Add more tests for reset state after DrawIndexedPrimitiveUP(). d3d8/tests: Port test_draw_primitive() from d3d9. widl: Correctly set the import library offset for all imported types. Zhiyi Zhang (2): kernel32: Open replaced file without GENERIC_WRITE in ReplaceFileW(). dinput: Fix a possible deadlock at exit. -- Michael Stefaniuc mstefani(a)winehq.org

1 0

[PATCH] mscorwks: Prefer the native version.
by Zebediah Figura 15 Aug '19

15 Aug '19

Fixes: 12d5b6899b4c03dfb597f0e1ddc6a14c07dca91e Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47622 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/mscorwks/mscorwks_main.c | 36 +++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 dlls/mscorwks/mscorwks_main.c diff --git a/dlls/mscorwks/mscorwks_main.c b/dlls/mscorwks/mscorwks_main.c new file mode 100644 index 00000000000..ac7708087f6 --- /dev/null +++ b/dlls/mscorwks/mscorwks_main.c @@ -0,0 +1,36 @@ +/* + * .NET workstation runtime + * + * Copyright 2019 Zebediah Figura for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + } + + return TRUE; +} -- 2.20.1

1 0

[PATCH 3/3] winemac.drv: Indicate whether the drop point is non-client area.
by Akihiro Sagawa 15 Aug '19

15 Aug '19

Not compile tested. Please refer to part 1 of this series for details. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winemac.drv/dragdrop.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)

1 0

[PATCH 2/3] winemac.drv: Translate the WM_DROPFILES point into client coordinates whenever possible.
by Akihiro Sagawa 15 Aug '19

15 Aug '19

Not compile tested. This is winemac.drv port of 846a8f6c8dcf7ad0bc72437d7ea79cc9e00c8ab7. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winemac.drv/dragdrop.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

1 0

[PATCH 1/3] [v2] winex11.drv: Indicate whether the drop point is non-client area.
by Akihiro Sagawa 15 Aug '19

15 Aug '19

In v2, rewrite commit message. For instance, the menu bar is non-client area, fNC should be TRUE. If you need a demo, please try https://bugs.winehq.org/attachment.cgi?id=64905&action=edit . Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winex11.drv/xdnd.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)

1 0

[PATCH 3/6] riched20: Don't force an update after scrolling.
by Huw Davies 15 Aug '19

15 Aug '19

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/paint.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 675e0f7a12..4adb6b0d3b 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -1081,7 +1081,6 @@ void ME_ScrollAbs(ME_TextEditor *editor, int x, int y) ITextHost_TxScrollWindowEx(editor->texthost, scrollX, scrollY, &editor->rcFormat, &editor->rcFormat, NULL, NULL, SW_INVALIDATE); - ME_Repaint(editor); if (editor->hWnd) { -- 2.18.0

2 2

[PATCH 6/6] riched20: Only invalidate the selection if it's not hidden.
by Huw Davies 15 Aug '19

15 Aug '19

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 118c64652e..b10f719bb0 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2153,9 +2153,9 @@ int set_selection( ME_TextEditor *editor, int to, int from ) TRACE("%d - %d\n", to, from ); - ME_InvalidateSelection( editor ); + if (!editor->bHideSelection) ME_InvalidateSelection( editor ); end = set_selection_cursors( editor, to, from ); - ME_InvalidateSelection( editor ); + if (!editor->bHideSelection) ME_InvalidateSelection( editor ); update_caret( editor ); ME_SendSelChange( editor ); -- 2.18.0

2 1