wine-devel August 2019

wine-devel@winehq.org

66 participants
557 discussions

[PATCH 4/5] ddraw/tests: Run the tests in parallel.
by Henri Verbeet 14 Aug '19

14 Aug '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/tests/ddraw1.c | 187 +++++++++++++++++++++++++---------- dlls/ddraw/tests/ddraw2.c | 204 ++++++++++++++++++++++++++------------ dlls/ddraw/tests/ddraw4.c | 229 +++++++++++++++++++++++++++++-------------- dlls/ddraw/tests/ddraw7.c | 244 +++++++++++++++++++++++++++++++--------------- 4 files changed, 594 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..d2cbcaa9411 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,19 @@ 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"); + use_mt = FALSE; + + 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 +16596,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

2 1

[PATCH v2 1/3] powrprof/tests: Test NtPowerInformation() with SystemExecutionState.
by Chip Davis 14 Aug '19

14 Aug '19

Test interaction between SetThreadExecutionState(), PowerSetRequest(), and this parameter. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- Notes: v2: Test that, when a thread terminates, its execution state is cleaned up. configure.ac | 1 + dlls/powrprof/tests/Makefile.in | 4 + dlls/powrprof/tests/powrprof.c | 219 ++++++++++++++++++++++++++++++++ include/powrprof.h | 5 + 4 files changed, 229 insertions(+) create mode 100644 dlls/powrprof/tests/Makefile.in create mode 100644 dlls/powrprof/tests/powrprof.c diff --git a/configure.ac b/configure.ac index c69c5ecb45b..a3b0f1eac01 100644 --- a/configure.ac +++ b/configure.ac @@ -3578,6 +3578,7 @@ WINE_CONFIG_MAKEFILE(dlls/pdh/tests) WINE_CONFIG_MAKEFILE(dlls/photometadatahandler) WINE_CONFIG_MAKEFILE(dlls/pidgen) WINE_CONFIG_MAKEFILE(dlls/powrprof) +WINE_CONFIG_MAKEFILE(dlls/powrprof/tests) WINE_CONFIG_MAKEFILE(dlls/printui) WINE_CONFIG_MAKEFILE(dlls/prntvpt) WINE_CONFIG_MAKEFILE(dlls/propsys) diff --git a/dlls/powrprof/tests/Makefile.in b/dlls/powrprof/tests/Makefile.in new file mode 100644 index 00000000000..87aa06be502 --- /dev/null +++ b/dlls/powrprof/tests/Makefile.in @@ -0,0 +1,4 @@ +TESTDLL = powrprof.dll +IMPORTS = powrprof + +C_SRCS = powrprof.c diff --git a/dlls/powrprof/tests/powrprof.c b/dlls/powrprof/tests/powrprof.c new file mode 100644 index 00000000000..d744895cc48 --- /dev/null +++ b/dlls/powrprof/tests/powrprof.c @@ -0,0 +1,219 @@ +/* + * Copyright 2019 Chip Davis 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 <stdio.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "powrprof.h" + +#include "wine/test.h" + +HANDLE (WINAPI *pPowerCreateRequest)(REASON_CONTEXT *); +BOOL (WINAPI *pPowerSetRequest)(HANDLE, POWER_REQUEST_TYPE); +BOOL (WINAPI *pPowerClearRequest)(HANDLE, POWER_REQUEST_TYPE); + +static void test_system_execution_state(void) +{ + EXECUTION_STATE es, old_es; + NTSTATUS status; + + status = CallNtPowerInformation(SystemExecutionState, NULL, 0, &es, sizeof(es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + + old_es = SetThreadExecutionState(ES_SYSTEM_REQUIRED); + todo_wine ok(old_es == ES_CONTINUOUS, "unexpected execution state 0x%08x\n", old_es); + + old_es = es; + status = CallNtPowerInformation(SystemExecutionState, NULL, 0, &es, sizeof(es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + ok(es == old_es, "unexpected execution state 0x%08x vs 0x%08x\n", es, old_es); + + old_es = SetThreadExecutionState(ES_CONTINUOUS | ES_DISPLAY_REQUIRED); + todo_wine ok(old_es == ES_CONTINUOUS, "unexpected execution state 0x%08x\n", old_es); + + status = CallNtPowerInformation(SystemExecutionState, NULL, 0, &es, sizeof(es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + todo_wine ok(es & ES_DISPLAY_REQUIRED, "unexpected execution state 0x%08x\n", es); + + old_es = SetThreadExecutionState(ES_CONTINUOUS); + ok(old_es == (ES_CONTINUOUS|ES_DISPLAY_REQUIRED), "unexpected execution state 0x%08x\n", old_es); + + status = CallNtPowerInformation(SystemExecutionState, NULL, 0, &es, sizeof(es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + + old_es = SetThreadExecutionState(ES_DISPLAY_REQUIRED); + ok(old_es == ES_CONTINUOUS, "unexpected execution state 0x%08x\n", old_es); + + old_es = es; + status = CallNtPowerInformation(SystemExecutionState, NULL, 0, &es, sizeof(es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + ok(es == old_es, "unexpected execution state 0x%08x vs 0x%08x\n", es, old_es); +} + +static HANDLE events[2]; + +static DWORD CALLBACK execution_state_thread(LPVOID param) +{ + EXECUTION_STATE old_es; + + SetThreadExecutionState(ES_SYSTEM_REQUIRED); + SignalObjectAndWait(events[0], events[1], INFINITE, FALSE); + + old_es = SetThreadExecutionState(ES_DISPLAY_REQUIRED); + ok(old_es == ES_CONTINUOUS, "unexpected execution state 0x%08x\n", old_es); + SignalObjectAndWait(events[0], events[1], INFINITE, FALSE); + + old_es = SetThreadExecutionState(ES_CONTINUOUS | ES_SYSTEM_REQUIRED); + ok(old_es == ES_CONTINUOUS, "unexpected execution state 0x%08x\n", old_es); + SignalObjectAndWait(events[0], events[1], INFINITE, FALSE); + + old_es = SetThreadExecutionState(ES_CONTINUOUS | ES_DISPLAY_REQUIRED); + ok(old_es == (ES_CONTINUOUS|ES_SYSTEM_REQUIRED), "unexpected execution state 0x%08x\n", old_es); + SignalObjectAndWait(events[0], events[1], INFINITE, FALSE); + + return 0; +} + +static void test_system_execution_state_other_thread(void) +{ + HANDLE thread; + EXECUTION_STATE base_es, es; + NTSTATUS status; + + status = CallNtPowerInformation(SystemExecutionState, NULL, 0, &base_es, sizeof(base_es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + trace("base execution state = 0x%08x\n", base_es); + + events[0] = CreateEventW(NULL, FALSE, FALSE, NULL); + events[1] = CreateEventW(NULL, FALSE, FALSE, NULL); + thread = CreateThread(NULL, 0, execution_state_thread, NULL, 0, NULL); + ok(thread != NULL, "Failed to create thread, err %u\n", GetLastError()); + + WaitForSingleObject(events[0], INFINITE); + status = CallNtPowerInformation(SystemExecutionState, NULL, 0, &es, sizeof(es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + ok(es == base_es, "unexpected execution state 0x%08x\n", es); + es = SetThreadExecutionState(0); + ok(es == ES_CONTINUOUS, "unexpected execution state 0x%08x\n", es); + SignalObjectAndWait(events[1], events[0], INFINITE, FALSE); + + status = CallNtPowerInformation(SystemExecutionState, NULL, 0, &es, sizeof(es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + ok(es == base_es, "unexpected execution state 0x%08x\n", es); + es = SetThreadExecutionState(0); + ok(es == ES_CONTINUOUS, "unexpected execution state 0x%08x\n", es); + SignalObjectAndWait(events[1], events[0], INFINITE, FALSE); + + status = CallNtPowerInformation(SystemExecutionState, NULL, 0, &es, sizeof(es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + todo_wine ok(es & ES_SYSTEM_REQUIRED, "unexpected execution state 0x%08x\n", es); + es = SetThreadExecutionState(0); + todo_wine ok(es == ES_CONTINUOUS, "unexpected execution state 0x%08x\n", es); + SignalObjectAndWait(events[1], events[0], INFINITE, FALSE); + + status = CallNtPowerInformation(SystemExecutionState, NULL, 0, &es, sizeof(es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + todo_wine ok(es & ES_DISPLAY_REQUIRED, "unexpected execution state 0x%08x\n", es); + es = SetThreadExecutionState(0); + todo_wine ok(es == ES_CONTINUOUS, "unexpected execution state 0x%08x\n", es); + SignalObjectAndWait(events[1], thread, INFINITE, FALSE); + + status = CallNtPowerInformation(SystemExecutionState, NULL, 0, &es, sizeof(es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + ok(es == base_es, "unexpected execution state 0x%08x\n", es); + es = SetThreadExecutionState(0); + todo_wine ok(es == ES_CONTINUOUS, "unexpected execution state 0x%08x\n", es); + + CloseHandle(thread); + CloseHandle(events[0]); + CloseHandle(events[1]); +} + +static void test_system_execution_state_power_request() +{ + HANDLE req; + REASON_CONTEXT reason; + BOOL ret; + NTSTATUS status; + EXECUTION_STATE base_es, es; + static const WCHAR reasonW[] = {'W', 'i', 'n', 'e', ' ', 't', 'e', 's', 't', 0}; + + if (!pPowerCreateRequest) + { + win_skip("Power request objects unavailable\n"); + return; + } + + status = CallNtPowerInformation(SystemExecutionState, NULL, 0, &base_es, sizeof(base_es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + trace("base execution state = 0x%08x\n", base_es); + + reason.Version = 0; + reason.Flags = POWER_REQUEST_CONTEXT_SIMPLE_STRING; + reason.Reason.SimpleReasonString = reasonW; + req = pPowerCreateRequest(&reason); + todo_wine ok(req != INVALID_HANDLE_VALUE, "err %u\n", GetLastError()); + + ret = pPowerSetRequest(req, PowerRequestSystemRequired); + todo_wine ok(ret, "err %u\n", GetLastError()); + + status = CallNtPowerInformation(SystemExecutionState, NULL, 0, &es, sizeof(es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + todo_wine ok(es & ES_SYSTEM_REQUIRED, "unexpected execution state 0x%08x\n", es); + + ret = pPowerClearRequest(req, PowerRequestSystemRequired); + todo_wine ok(ret, "err %u\n", GetLastError()); + + status = CallNtPowerInformation(SystemExecutionState, NULL, 0, &es, sizeof(es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + ok(!(es & ES_SYSTEM_REQUIRED) || (base_es & ES_SYSTEM_REQUIRED), "unexpected execution state 0x%08x\n", es); + + ret = pPowerSetRequest(req, PowerRequestDisplayRequired); + todo_wine ok(ret, "err %u\n", GetLastError()); + + status = CallNtPowerInformation(SystemExecutionState, NULL, 0, &es, sizeof(es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + todo_wine ok(es & ES_DISPLAY_REQUIRED, "unexpected execution state 0x%08x\n", es); + + ret = CloseHandle(req); + todo_wine ok(ret, "err %u\n", GetLastError()); + + status = CallNtPowerInformation(SystemExecutionState, NULL, 0, &es, sizeof(es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + ok(!(es & ES_DISPLAY_REQUIRED) || (base_es & ES_DISPLAY_REQUIRED), "unexpected execution state 0x%08x\n", es); +} + +START_TEST(powrprof) +{ + HMODULE hkernel32; + + hkernel32 = GetModuleHandleA("kernel32.dll"); + pPowerCreateRequest = (void *)GetProcAddress(hkernel32, "PowerCreateRequest"); + pPowerSetRequest = (void *)GetProcAddress(hkernel32, "PowerSetRequest"); + pPowerClearRequest = (void *)GetProcAddress(hkernel32, "PowerClearRequest"); + + test_system_execution_state(); + test_system_execution_state_other_thread(); + test_system_execution_state_power_request(); +} diff --git a/include/powrprof.h b/include/powrprof.h index 318188e465e..421d9d4fc76 100644 --- a/include/powrprof.h +++ b/include/powrprof.h @@ -146,6 +146,11 @@ extern "C" { typedef BOOLEAN (CALLBACK* PWRSCHEMESENUMPROC)(UINT, DWORD, LPWSTR, DWORD, LPWSTR, PPOWER_POLICY, LPARAM); +#ifndef WINE_NTSTATUS_DECLARED +#define WINE_NTSTATUS_DECLARED +typedef LONG NTSTATUS; +#endif + NTSTATUS WINAPI CallNtPowerInformation(POWER_INFORMATION_LEVEL, PVOID, ULONG, PVOID, ULONG); BOOLEAN WINAPI CanUserWritePwrScheme(VOID); BOOLEAN WINAPI DeletePwrScheme(UINT); -- 2.21.0

1 2

[PATCH 2/5] dxgi/tests: Introduce create_window().
by Henri Verbeet 14 Aug '19

14 Aug '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index b35c79aab98..0f256d4ce20 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -517,6 +517,16 @@ static void wait_vidpn_exclusive_ownership_(unsigned int line, "Got unexpected status %#x, expected %#x.\n", status, expected); } +static HWND create_window(void) +{ + RECT r = {0, 0, 640, 480}; + + AdjustWindowRect(&r, WS_OVERLAPPEDWINDOW | WS_VISIBLE, FALSE); + + return CreateWindowA("static", "dxgi_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, r.right - r.left, r.bottom - r.top, NULL, NULL, NULL, NULL); +} + static IDXGIAdapter *create_adapter(void) { IDXGIFactory4 *factory4; @@ -2446,8 +2456,8 @@ static void test_default_fullscreen_target_output(void) hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); ok(SUCCEEDED(hr), "GetParent failed, hr %#x.\n", hr); - swapchain_desc.BufferDesc.Width = 100; - swapchain_desc.BufferDesc.Height = 100; + swapchain_desc.BufferDesc.Width = 640; + swapchain_desc.BufferDesc.Height = 480; swapchain_desc.BufferDesc.RefreshRate.Numerator = 60; swapchain_desc.BufferDesc.RefreshRate.Denominator = 60; swapchain_desc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; @@ -2457,8 +2467,7 @@ static void test_default_fullscreen_target_output(void) swapchain_desc.SampleDesc.Quality = 0; swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; swapchain_desc.BufferCount = 1; - swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", - WS_OVERLAPPEDWINDOW | WS_VISIBLE, 0, 0, 100, 100, 0, 0, 0, 0); + swapchain_desc.OutputWindow = create_window(); swapchain_desc.Windowed = TRUE; swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; swapchain_desc.Flags = 0; @@ -3488,8 +3497,7 @@ static void test_swapchain_resize(IUnknown *device, BOOL is_d3d12) get_factory(device, is_d3d12, &factory); - window = CreateWindowA("static", "dxgi_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); ret = GetClientRect(window, &client_rect); ok(ret, "Failed to get client rect.\n"); @@ -3861,8 +3869,7 @@ static void test_swapchain_parameters(void) skip("Failed to create device.\n"); return; } - window = CreateWindowA("static", "dxgi_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); hr = IDXGIDevice_QueryInterface(device, &IID_IUnknown, (void **)&obj); ok(hr == S_OK, "IDXGIDevice does not implement IUnknown.\n"); @@ -4339,7 +4346,7 @@ static void test_swapchain_backbuffer_index(IUnknown *device, BOOL is_d3d12) swapchain_desc.SampleDesc.Quality = 0; swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; swapchain_desc.BufferCount = 4; - swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); + swapchain_desc.OutputWindow = create_window(); swapchain_desc.Windowed = TRUE; swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; swapchain_desc.Flags = 0; @@ -4449,7 +4456,7 @@ static void test_swapchain_formats(IUnknown *device, BOOL is_d3d12) swapchain_desc.SampleDesc.Quality = 0; swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; swapchain_desc.BufferCount = 4; - swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); + swapchain_desc.OutputWindow = create_window(); swapchain_desc.Windowed = TRUE; swapchain_desc.Flags = 0; @@ -5208,8 +5215,8 @@ static void test_gamma_control(void) ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); IDXGIOutput_Release(output); - swapchain_desc.BufferDesc.Width = 800; - swapchain_desc.BufferDesc.Height = 600; + swapchain_desc.BufferDesc.Width = 640; + swapchain_desc.BufferDesc.Height = 480; swapchain_desc.BufferDesc.RefreshRate.Numerator = 60; swapchain_desc.BufferDesc.RefreshRate.Denominator = 60; swapchain_desc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; @@ -5219,7 +5226,7 @@ static void test_gamma_control(void) 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.OutputWindow = create_window(); swapchain_desc.Windowed = TRUE; swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; swapchain_desc.Flags = 0; -- 2.11.0

2 1

[PATCH 1/5] ddraw/tests: Fix some test failures on 64-bit ddraw.
by Henri Verbeet 14 Aug '19

14 Aug '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/tests/ddraw1.c | 54 ++++++++++++++++++++++++++----------------- dlls/ddraw/tests/ddraw2.c | 59 +++++++++++++++++++++++++++++------------------ dlls/ddraw/tests/ddraw7.c | 7 +++++- 3 files changed, 75 insertions(+), 45 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index acf8dd8e2f0..cc228028e17 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -12982,34 +12982,46 @@ static void test_caps(void) ok(!(~hal_caps.ddsCaps.dwCaps & caps_always), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); todo_wine_if(no3d) ok(!(~hal_caps.ddsCaps.dwCaps & caps_hal), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); - todo_wine ok(!hel_caps.ddsCaps.dwCaps, "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); + if (is_ddraw64) + { + ok(!(hel_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); + ok(!(~hel_caps.ddsCaps.dwCaps & caps_always), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); + todo_wine_if(!no3d) ok(!(hel_caps.ddsCaps.dwCaps & caps_hal), + "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); + } + else + { + todo_wine ok(!hel_caps.ddsCaps.dwCaps, "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); + } IDirectDraw_Release(ddraw); } hr = DirectDrawCreate((GUID *)DDCREATE_EMULATIONONLY, &ddraw, NULL); - ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); - - memset(&hal_caps, 0, sizeof(hal_caps)); - memset(&hel_caps, 0, sizeof(hel_caps)); - hal_caps.dwSize = sizeof(hal_caps); - hel_caps.dwSize = sizeof(hel_caps); - hr = IDirectDraw_GetCaps(ddraw, &hal_caps, &hel_caps); - ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); - ok(hal_caps.ddsOldCaps.dwCaps == hal_caps.ddsCaps.dwCaps, - "Got unexpected caps %#x, expected %#x.\n", - hal_caps.ddsOldCaps.dwCaps, hal_caps.ddsCaps.dwCaps); - ok(hel_caps.ddsOldCaps.dwCaps == hel_caps.ddsCaps.dwCaps, - "Got unexpected caps %#x, expected %#x.\n", - hel_caps.ddsOldCaps.dwCaps, hel_caps.ddsCaps.dwCaps); + ok(hr == (is_ddraw64 ? E_FAIL : DD_OK), "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + memset(&hal_caps, 0, sizeof(hal_caps)); + memset(&hel_caps, 0, sizeof(hel_caps)); + hal_caps.dwSize = sizeof(hal_caps); + hel_caps.dwSize = sizeof(hel_caps); + hr = IDirectDraw_GetCaps(ddraw, &hal_caps, &hel_caps); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(hal_caps.ddsOldCaps.dwCaps == hal_caps.ddsCaps.dwCaps, + "Got unexpected caps %#x, expected %#x.\n", + hal_caps.ddsOldCaps.dwCaps, hal_caps.ddsCaps.dwCaps); + ok(hel_caps.ddsOldCaps.dwCaps == hel_caps.ddsCaps.dwCaps, + "Got unexpected caps %#x, expected %#x.\n", + hel_caps.ddsOldCaps.dwCaps, hel_caps.ddsCaps.dwCaps); - todo_wine ok(!hal_caps.ddsCaps.dwCaps, "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); - ok(!(hel_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); - ok(!(~hel_caps.ddsCaps.dwCaps & caps_always), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); - todo_wine_if(!no3d) ok(!(hel_caps.ddsCaps.dwCaps & caps_hal), - "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); + todo_wine ok(!hal_caps.ddsCaps.dwCaps, "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); + ok(!(hel_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); + ok(!(~hel_caps.ddsCaps.dwCaps & caps_always), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); + todo_wine_if(!no3d) ok(!(hel_caps.ddsCaps.dwCaps & caps_hal), + "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); - IDirectDraw_Release(ddraw); + IDirectDraw_Release(ddraw); + } } static void test_d32_support(void) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 33bc94326fa..595157b486f 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -13862,37 +13862,50 @@ static void test_caps(void) ok(!(~hal_caps.ddsCaps.dwCaps & caps_always), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); todo_wine_if(no3d) ok(!(~hal_caps.ddsCaps.dwCaps & caps_hal), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); - todo_wine ok(!hel_caps.ddsCaps.dwCaps, "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); + if (is_ddraw64) + { + ok(!(hel_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); + ok(!(~hel_caps.ddsCaps.dwCaps & caps_always), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); + todo_wine_if(!no3d) ok(!(hel_caps.ddsCaps.dwCaps & caps_hal), + "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); + } + else + { + todo_wine ok(!hel_caps.ddsCaps.dwCaps, "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); + } IDirectDraw2_Release(ddraw); } hr = DirectDrawCreate((GUID *)DDCREATE_EMULATIONONLY, &ddraw1, NULL); - ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirectDraw_QueryInterface(ddraw1, &IID_IDirectDraw2, (void **)&ddraw); - ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); - IDirectDraw_Release(ddraw1); + ok(hr == (is_ddraw64 ? E_FAIL : DD_OK), "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + hr = IDirectDraw_QueryInterface(ddraw1, &IID_IDirectDraw2, (void **)&ddraw); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + IDirectDraw_Release(ddraw1); - memset(&hal_caps, 0, sizeof(hal_caps)); - memset(&hel_caps, 0, sizeof(hel_caps)); - hal_caps.dwSize = sizeof(hal_caps); - hel_caps.dwSize = sizeof(hel_caps); - hr = IDirectDraw2_GetCaps(ddraw, &hal_caps, &hel_caps); - ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); - ok(hal_caps.ddsOldCaps.dwCaps == hal_caps.ddsCaps.dwCaps, - "Got unexpected caps %#x, expected %#x.\n", - hal_caps.ddsOldCaps.dwCaps, hal_caps.ddsCaps.dwCaps); - ok(hel_caps.ddsOldCaps.dwCaps == hel_caps.ddsCaps.dwCaps, - "Got unexpected caps %#x, expected %#x.\n", - hel_caps.ddsOldCaps.dwCaps, hel_caps.ddsCaps.dwCaps); + memset(&hal_caps, 0, sizeof(hal_caps)); + memset(&hel_caps, 0, sizeof(hel_caps)); + hal_caps.dwSize = sizeof(hal_caps); + hel_caps.dwSize = sizeof(hel_caps); + hr = IDirectDraw2_GetCaps(ddraw, &hal_caps, &hel_caps); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(hal_caps.ddsOldCaps.dwCaps == hal_caps.ddsCaps.dwCaps, + "Got unexpected caps %#x, expected %#x.\n", + hal_caps.ddsOldCaps.dwCaps, hal_caps.ddsCaps.dwCaps); + ok(hel_caps.ddsOldCaps.dwCaps == hel_caps.ddsCaps.dwCaps, + "Got unexpected caps %#x, expected %#x.\n", + hel_caps.ddsOldCaps.dwCaps, hel_caps.ddsCaps.dwCaps); - todo_wine ok(!hal_caps.ddsCaps.dwCaps, "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); - ok(!(hel_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); - ok(!(~hel_caps.ddsCaps.dwCaps & caps_always), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); - todo_wine_if(!no3d) ok(!(hel_caps.ddsCaps.dwCaps & caps_hal), - "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); + todo_wine ok(!hal_caps.ddsCaps.dwCaps, "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); + ok(!(hel_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); + ok(!(~hel_caps.ddsCaps.dwCaps & caps_always), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); + todo_wine_if(!no3d) ok(!(hel_caps.ddsCaps.dwCaps & caps_hal), + "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); - IDirectDraw2_Release(ddraw); + IDirectDraw2_Release(ddraw); + } } static void test_d32_support(void) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 4027c722190..116e34a1768 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -8900,7 +8900,12 @@ static void test_palette_alpha(void) surface_desc.dwHeight = 128; surface_desc.ddsCaps.dwCaps = test_data[i].caps; hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); - ok(SUCCEEDED(hr), "Failed to create %s surface, hr %#x.\n", test_data[i].name, hr); + if (is_ddraw64 && test_data[i].caps & DDSCAPS_TEXTURE) + todo_wine ok(hr == E_NOINTERFACE, "%s: Got unexpected hr %#x.\n", test_data[i].name, hr); + else + ok(hr == DD_OK, "%s: Got unexpected hr %#x.\n", test_data[i].name, hr); + if (FAILED(hr)) + continue; hr = IDirectDrawSurface7_SetPalette(surface, palette); if (test_data[i].attach_allowed) -- 2.11.0

2 1

[PATCH v2] kernel32/tests: Add single step and debug service tests.
by Jacek Caban 14 Aug '19

14 Aug '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/debugger.c | 367 +++++++++++++++++++++++++++++++-- 1 file changed, 349 insertions(+), 18 deletions(-)

2 1

[PATCH 8/8] mshtml: Add Function.prototype.bind tests.
by Jacek Caban 14 Aug '19

14 Aug '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/tests/es5.js | 80 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 79 insertions(+), 1 deletion(-)

2 1

[PATCH 5/5] wined3d: Make the adapter responsible for sampler creation and destruction.
by Henri Verbeet 14 Aug '19

14 Aug '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 45 ++++++++++++++++++++++++++ dlls/wined3d/adapter_vk.c | 28 +++++++++++++++++ dlls/wined3d/directx.c | 16 ++++++++++ dlls/wined3d/sampler.c | 71 ++++++++++++++++++++---------------------- dlls/wined3d/wined3d_private.h | 11 +++++++ 5 files changed, 133 insertions(+), 38 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 0b7fcf47297..c031242b0ea 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -5024,6 +5024,49 @@ static void adapter_gl_destroy_unordered_access_view(struct wined3d_unordered_ac wined3d_device_decref(device); } +static HRESULT adapter_gl_create_sampler(struct wined3d_device *device, const struct wined3d_sampler_desc *desc, + void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_sampler **sampler) +{ + struct wined3d_sampler *sampler_gl; + + TRACE("device %p, desc %p, parent %p, parent_ops %p, sampler %p.\n", + device, desc, parent, parent_ops, sampler); + + if (!(sampler_gl = heap_alloc_zero(sizeof(*sampler_gl)))) + return E_OUTOFMEMORY; + + wined3d_sampler_gl_init(sampler_gl, device, desc, parent, parent_ops); + + TRACE("Created sampler %p.\n", sampler_gl); + *sampler = sampler_gl; + + return WINED3D_OK; +} + +static void wined3d_sampler_gl_destroy_object(void *object) +{ + struct wined3d_sampler *sampler_gl = object; + const struct wined3d_gl_info *gl_info; + struct wined3d_context *context; + + if (sampler_gl->name) + { + context = context_acquire(sampler_gl->device, NULL, 0); + gl_info = wined3d_context_gl(context)->gl_info; + GL_EXTCALL(glDeleteSamplers(1, &sampler_gl->name)); + context_release(context); + } + + heap_free(sampler_gl); +} + +static void adapter_gl_destroy_sampler(struct wined3d_sampler *sampler) +{ + TRACE("sampler %p.\n", sampler); + + wined3d_cs_destroy_object(sampler->device->cs, wined3d_sampler_gl_destroy_object, sampler); +} + static const struct wined3d_adapter_ops wined3d_adapter_gl_ops = { adapter_gl_destroy, @@ -5047,6 +5090,8 @@ static const struct wined3d_adapter_ops wined3d_adapter_gl_ops = adapter_gl_destroy_shader_resource_view, adapter_gl_create_unordered_access_view, adapter_gl_destroy_unordered_access_view, + adapter_gl_create_sampler, + adapter_gl_destroy_sampler, }; static BOOL wined3d_adapter_gl_init(struct wined3d_adapter_gl *adapter_gl, diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index f203e0f52e1..afe222a031e 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -733,6 +733,32 @@ static void adapter_vk_destroy_unordered_access_view(struct wined3d_unordered_ac wined3d_device_decref(device); } +static HRESULT adapter_vk_create_sampler(struct wined3d_device *device, const struct wined3d_sampler_desc *desc, + void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_sampler **sampler) +{ + struct wined3d_sampler *sampler_vk; + + TRACE("device %p, desc %p, parent %p, parent_ops %p, sampler %p.\n", + device, desc, parent, parent_ops, sampler); + + if (!(sampler_vk = heap_alloc_zero(sizeof(*sampler_vk)))) + return E_OUTOFMEMORY; + + wined3d_sampler_vk_init(sampler_vk, device, desc, parent, parent_ops); + + TRACE("Created sampler %p.\n", sampler_vk); + *sampler = sampler_vk; + + return WINED3D_OK; +} + +static void adapter_vk_destroy_sampler(struct wined3d_sampler *sampler) +{ + TRACE("sampler %p.\n", sampler); + + wined3d_cs_destroy_object(sampler->device->cs, heap_free, sampler); +} + static const struct wined3d_adapter_ops wined3d_adapter_vk_ops = { adapter_vk_destroy, @@ -756,6 +782,8 @@ static const struct wined3d_adapter_ops wined3d_adapter_vk_ops = adapter_vk_destroy_shader_resource_view, adapter_vk_create_unordered_access_view, adapter_vk_destroy_unordered_access_view, + adapter_vk_create_sampler, + adapter_vk_destroy_sampler, }; static unsigned int wined3d_get_wine_vk_version(void) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 3c18e0e402e..4c9773a0b26 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2554,6 +2554,20 @@ static void adapter_no3d_destroy_unordered_access_view(struct wined3d_unordered_ TRACE("view %p.\n", view); } +static HRESULT adapter_no3d_create_sampler(struct wined3d_device *device, const struct wined3d_sampler_desc *desc, + void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_sampler **sampler) +{ + TRACE("device %p, desc %p, parent %p, parent_ops %p, sampler %p.\n", + device, desc, parent, parent_ops, sampler); + + return E_NOTIMPL; +} + +static void adapter_no3d_destroy_sampler(struct wined3d_sampler *sampler) +{ + TRACE("sampler %p.\n", sampler); +} + static const struct wined3d_adapter_ops wined3d_adapter_no3d_ops = { adapter_no3d_destroy, @@ -2577,6 +2591,8 @@ static const struct wined3d_adapter_ops wined3d_adapter_no3d_ops = adapter_no3d_destroy_shader_resource_view, adapter_no3d_create_unordered_access_view, adapter_no3d_destroy_unordered_access_view, + adapter_no3d_create_sampler, + adapter_no3d_destroy_sampler, }; static void wined3d_adapter_no3d_init_d3d_info(struct wined3d_adapter *adapter, unsigned int wined3d_creation_flags) diff --git a/dlls/wined3d/sampler.c b/dlls/wined3d/sampler.c index 9b729353538..5a9170b6d4d 100644 --- a/dlls/wined3d/sampler.c +++ b/dlls/wined3d/sampler.c @@ -33,23 +33,6 @@ ULONG CDECL wined3d_sampler_incref(struct wined3d_sampler *sampler) return refcount; } -static void wined3d_sampler_destroy_object(void *object) -{ - struct wined3d_sampler *sampler = object; - const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; - - if (sampler->name) - { - context = context_acquire(sampler->device, NULL, 0); - gl_info = wined3d_context_gl(context)->gl_info; - GL_EXTCALL(glDeleteSamplers(1, &sampler->name)); - context_release(context); - } - - heap_free(sampler); -} - ULONG CDECL wined3d_sampler_decref(struct wined3d_sampler *sampler) { ULONG refcount = InterlockedDecrement(&sampler->refcount); @@ -59,7 +42,7 @@ ULONG CDECL wined3d_sampler_decref(struct wined3d_sampler *sampler) if (!refcount) { sampler->parent_ops->wined3d_object_destroyed(sampler->parent); - wined3d_cs_destroy_object(sampler->device->cs, wined3d_sampler_destroy_object, sampler); + sampler->device->adapter->adapter_ops->adapter_destroy_sampler(sampler); } return refcount; @@ -72,7 +55,20 @@ void * CDECL wined3d_sampler_get_parent(const struct wined3d_sampler *sampler) return sampler->parent; } -static void wined3d_sampler_cs_init(void *object) +static void wined3d_sampler_init(struct wined3d_sampler *sampler, struct wined3d_device *device, + const struct wined3d_sampler_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) +{ + TRACE("sampler %p, device %p, desc %p, parent %p, parent_ops %p.\n", + sampler, device, desc, parent, parent_ops); + + sampler->refcount = 1; + sampler->device = device; + sampler->parent = parent; + sampler->parent_ops = parent_ops; + sampler->desc = *desc; +} + +static void wined3d_sampler_gl_cs_init(void *object) { struct wined3d_sampler *sampler = object; const struct wined3d_sampler_desc *desc; @@ -114,25 +110,32 @@ static void wined3d_sampler_cs_init(void *object) context_release(context); } -static void wined3d_sampler_init(struct wined3d_sampler *sampler, struct wined3d_device *device, +void wined3d_sampler_gl_init(struct wined3d_sampler *sampler_gl, struct wined3d_device *device, const struct wined3d_sampler_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) { - sampler->refcount = 1; - sampler->device = device; - sampler->parent = parent; - sampler->parent_ops = parent_ops; - sampler->desc = *desc; + TRACE("sampler_gl %p, device %p, desc %p, parent %p, parent_ops %p.\n", + sampler_gl, device, desc, parent, parent_ops); + + wined3d_sampler_init(sampler_gl, device, desc, parent, parent_ops); if (device->adapter->gl_info.supported[ARB_SAMPLER_OBJECTS]) - wined3d_cs_init_object(device->cs, wined3d_sampler_cs_init, sampler); + wined3d_cs_init_object(device->cs, wined3d_sampler_gl_cs_init, sampler_gl); +} + +void wined3d_sampler_vk_init(struct wined3d_sampler *sampler_vk, struct wined3d_device *device, + const struct wined3d_sampler_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) +{ + TRACE("sampler_vk %p, device %p, desc %p, parent %p, parent_ops %p.\n", + sampler_vk, device, desc, parent, parent_ops); + + wined3d_sampler_init(sampler_vk, device, desc, parent, parent_ops); } HRESULT CDECL wined3d_sampler_create(struct wined3d_device *device, const struct wined3d_sampler_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_sampler **sampler) { - struct wined3d_sampler *object; - - TRACE("device %p, desc %p, parent %p, sampler %p.\n", device, desc, parent, sampler); + TRACE("device %p, desc %p, parent %p, parent_ops %p, sampler %p.\n", + device, desc, parent, parent_ops, sampler); if (desc->address_u < WINED3D_TADDRESS_WRAP || desc->address_u > WINED3D_TADDRESS_MIRROR_ONCE || desc->address_v < WINED3D_TADDRESS_WRAP || desc->address_v > WINED3D_TADDRESS_MIRROR_ONCE @@ -144,15 +147,7 @@ HRESULT CDECL wined3d_sampler_create(struct wined3d_device *device, const struct || desc->mip_filter > WINED3D_TEXF_LINEAR) return WINED3DERR_INVALIDCALL; - if (!(object = heap_alloc_zero(sizeof(*object)))) - return E_OUTOFMEMORY; - - wined3d_sampler_init(object, device, desc, parent, parent_ops); - - TRACE("Created sampler %p.\n", object); - *sampler = object; - - return WINED3D_OK; + return device->adapter->adapter_ops->adapter_create_sampler(device, desc, parent, parent_ops, sampler); } static void texture_gl_apply_base_level(struct wined3d_texture_gl *texture_gl, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 80ed41bb845..ca2d417c4e0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2805,6 +2805,9 @@ struct wined3d_adapter_ops struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_unordered_access_view **view); void (*adapter_destroy_unordered_access_view)(struct wined3d_unordered_access_view *view); + HRESULT (*adapter_create_sampler)(struct wined3d_device *device, const struct wined3d_sampler_desc *desc, + void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_sampler **sampler); + void (*adapter_destroy_sampler)(struct wined3d_sampler *sampler); }; /* The adapter structure */ @@ -3800,6 +3803,14 @@ struct wined3d_sampler void wined3d_sampler_bind(struct wined3d_sampler *sampler, unsigned int unit, struct wined3d_texture_gl *texture_gl, const struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; +void wined3d_sampler_gl_init(struct wined3d_sampler *sampler_gl, + struct wined3d_device *device, const struct wined3d_sampler_desc *desc, + void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; + +void wined3d_sampler_vk_init(struct wined3d_sampler *sampler_vk, + struct wined3d_device *device, const struct wined3d_sampler_desc *desc, + void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; + struct wined3d_vertex_declaration_element { const struct wined3d_format *format; -- 2.11.0

2 1

[PATCH 3/5] ddraw: Release the wined3d mutex on error paths in ddraw_surface7_Blt().
by Henri Verbeet 14 Aug '19

14 Aug '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/surface.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index d415e4ace75..59af556560b 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1742,6 +1742,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Blt(IDirectDrawSurface7 * && ((ULONG)src_rect->left >= src_rect->right || src_rect->right > src_impl->surface_desc.dwWidth || (ULONG)src_rect->top >= src_rect->bottom || src_rect->bottom > src_impl->surface_desc.dwHeight)) { + wined3d_mutex_unlock(); WARN("Invalid source rectangle.\n"); return DDERR_INVALIDRECT; } @@ -1779,6 +1780,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Blt(IDirectDrawSurface7 * if (!(flags & (DDBLT_COLORFILL | DDBLT_DEPTHFILL)) && !src_impl) { WARN("No source surface.\n"); + wined3d_mutex_unlock(); return DDERR_INVALIDPARAMS; } -- 2.11.0

2 1

[PATCH 2/2 v2] ucrtbase: Link missing functions to msvcrt that are needed by api-ms-win-crt-private-l1-1-0
by Piotr Caban 14 Aug '19

14 Aug '19

From: Benedikt Bär <beniwtv(a)relamp.tk> Signed-off-by: Benedikt Bär <beniwtv(a)relamp.tk> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v2: - removed unneeded spec file change dlls/ucrtbase/ucrtbase.spec | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)

1 0

[PATCH 1/2] api-ms-win-crt-private-l1-1-0: Add functions to make Star Citizen work
by Benedikt Bär 14 Aug '19

14 Aug '19

Version 3.6.1 of Star Citizen needs a couple of functions from this dll that were not implemented. Linked them to ucrtbase's counterparts Signed-off-by: Benedikt Bär <beniwtv(a)relamp.tk> --- .../api-ms-win-crt-private-l1-1-0.spec | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index f010434a85..faf31499a6 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -156,7 +156,7 @@ @ stub _o___stdio_common_vfwscanf @ cdecl _o___stdio_common_vsnprintf_s(int64 ptr long long str ptr ptr) ucrtbase._o___stdio_common_vsnprintf_s @ stub _o___stdio_common_vsnwprintf_s -@ stub _o___stdio_common_vsprintf +@ cdecl _o___stdio_common_vsprintf(int64 ptr long str ptr ptr) ucrtbase._o___stdio_common_vsprintf @ stub _o___stdio_common_vsprintf_p @ cdecl _o___stdio_common_vsprintf_s(int64 ptr long str ptr ptr) ucrtbase._o___stdio_common_vsprintf_s @ stub _o___stdio_common_vsscanf @@ -692,7 +692,7 @@ @ stub _o__strcoll_l @ stub _o__strdate @ stub _o__strdate_s -@ stub _o__strdup +@ cdecl _o__strdup(str) ucrtbase._o__strdup @ stub _o__strerror @ stub _o__strerror_s @ stub _o__strftime_l @@ -706,7 +706,7 @@ @ stub _o__strlwr_s_l @ stub _o__strncoll @ stub _o__strncoll_l -@ stub _o__strnicmp +@ cdecl _o__strnicmp(str str long) ucrtbase._o__strnicmp @ stub _o__strnicmp_l @ stub _o__strnicoll @ stub _o__strnicoll_l @@ -840,7 +840,7 @@ @ stub _o__wfullpath @ stub _o__wgetcwd @ stub _o__wgetdcwd -@ stub _o__wgetenv +@ cdecl _o__wgetenv(str) ucrtbase._o_getenv @ stub _o__wgetenv_s @ stub _o__wmakepath @ stub _o__wmakepath_s @@ -857,7 +857,7 @@ @ stub _o__wrmdir @ stub _o__wsearchenv @ stub _o__wsearchenv_s -@ stub _o__wsetlocale +@ cdecl _o__wsetlocale(long str) ucrtbase._o__wsetlocale @ stub _o__wsopen_dispatch @ stub _o__wsopen_s @ stub _o__wspawnv @@ -912,8 +912,8 @@ @ stub _o_atanh @ stub _o_atanhf @ stub _o_atanhl -@ stub _o_atof -@ stub _o_atoi +@ cdecl _o_atof(str) ucrtbase._o_atof +@ cdecl _o_atoi(str) ucrtbase._o_atoi @ stub _o_atol @ stub _o_atoll @ stub _o_bsearch @@ -922,7 +922,7 @@ @ cdecl _o_calloc(long long) ucrtbase._o_calloc @ stub _o_cbrt @ stub _o_cbrtf -@ stub _o_ceil +@ cdecl _o_ceil(double) ucrtbase._o_ceil @ stub _o_ceilf @ stub _o_clearerr @ stub _o_clearerr_s @@ -952,7 +952,7 @@ @ stub _o_fgets @ stub _o_fgetwc @ stub _o_fgetws -@ stub _o_floor +@ cdecl _o_floor(double) ucrtbase._o_floor @ stub _o_floorf @ stub _o_fma @ stub _o_fmaf @@ -977,7 +977,7 @@ @ stub _o_fwrite @ stub _o_getc @ stub _o_getchar -@ stub _o_getenv +@ cdecl _o_getenv(str) ucrtbase._o_getenv @ stub _o_getenv_s @ stub _o_gets @ stub _o_gets_s @@ -1011,7 +1011,7 @@ @ stub _o_iswspace @ stub _o_iswupper @ stub _o_iswxdigit -@ stub _o_isxdigit +@ cdecl _o_isxdigit(long) ucrtbase._o_isxdigit @ stub _o_ldexp @ stub _o_lgamma @ stub _o_lgammaf @@ -1023,7 +1023,7 @@ @ stub _o_llroundf @ stub _o_llroundl @ stub _o_localeconv -@ stub _o_log +@ cdecl _o_log(double) ucrtbase._o_log @ stub _o_log10 @ stub _o_log10f @ stub _o_log1p @@ -1054,7 +1054,7 @@ @ stub _o_mbstowcs_s @ stub _o_mbtowc @ stub _o_memcpy_s -@ stub _o_modf +@ cdecl _o_modf(double ptr) ucrtbase._o_modf @ stub _o_modff @ stub _o_nan @ stub _o_nanf @@ -1068,7 +1068,7 @@ @ stub _o_nexttoward @ stub _o_nexttowardf @ stub _o_nexttowardl -@ stub _o_pow +@ cdecl _o_pow(double double) ucrtbase._o_pow @ stub _o_powf @ stub _o_putc @ stub _o_putchar @@ -1104,13 +1104,13 @@ @ stub _o_scalbnl @ stub _o_set_terminate @ stub _o_setbuf -@ stub _o_setlocale +@ cdecl _o_setlocale(long str) ucrtbase._o_setlocale @ stub _o_setvbuf @ stub _o_sin @ stub _o_sinf @ stub _o_sinh @ stub _o_sinhf -@ stub _o_sqrt +@ cdecl _o_sqrt(double) ucrtbase._o_sqrt @ stub _o_sqrtf @ stub _o_srand @ cdecl _o_strcat_s(str long str) ucrtbase._o_strcat_s -- 2.22.0

2 2

← Newer
1
...
26
27
28
29
30
31
32
...
56
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel August 2019