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

Francois Gouget : kernel32/tests: Fix the grammar and formatting of a process comment.
by Alexandre Julliard March 24, 2020

March 24, 2020

Module: wine Branch: master Commit: 405fd5927a2d6d6266fe7492b82c0c52f22810a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=405fd5927a2d6d6266fe7492… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 24 13:50:52 2020 +0100 kernel32/tests: Fix the grammar and formatting of a process comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 7f7c015947..3281804233 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -3312,9 +3312,10 @@ static void test_SuspendProcessState(void) ok(pipe_magic == pipe_write_magic, "Did not get the correct magic from the remote process\n"); - /* Validate the Imports, at this point the thread in the new process should have - initialized the EXE module imports and call each dll DllMain notifying it on - the new thread in the process. */ + /* Validate the imports: at this point the thread in the new process + * should have initialized the EXE module imports and called each dll's + * DllMain(), notifying it of the new thread in the process. + */ ret = are_imports_resolved(pi.hProcess, exe_base, &nt_header); ok(ret, "EXE IAT is not resolved\n");

1 0

Matteo Bruni : wined3d: Make rasterizer state cleanup more consistent with samplers cleanup.
by Alexandre Julliard March 24, 2020

March 24, 2020

Module: wine Branch: master Commit: d4ed62938061370ff1e1cc4e9ecd47fc16f22468 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4ed62938061370ff1e1cc4e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Mar 24 17:35:22 2020 +0100 wined3d: Make rasterizer state cleanup more consistent with samplers cleanup. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0a0c4c526c..e0a1de7909 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -518,11 +518,11 @@ static void device_leftover_sampler(struct wine_rb_entry *entry, void *context) ERR("Leftover sampler %p.\n", sampler); } -static void device_free_rasterizer_state(struct wine_rb_entry *entry, void *context) +static void device_leftover_rasterizer_state(struct wine_rb_entry *entry, void *context) { struct wined3d_rasterizer_state *state = WINE_RB_ENTRY_VALUE(entry, struct wined3d_rasterizer_state, entry); - wined3d_rasterizer_state_decref(state); + ERR("Leftover rasterizer state %p.\n", state); } static void device_free_blend_state(struct wine_rb_entry *entry, void *context) @@ -539,7 +539,6 @@ void wined3d_device_cleanup(struct wined3d_device *device) if (device->swapchain_count) wined3d_device_uninit_3d(device); - wine_rb_destroy(&device->rasterizer_states, device_free_rasterizer_state, NULL); wine_rb_destroy(&device->blend_states, device_free_blend_state, NULL); wined3d_cs_destroy(device->cs); @@ -570,6 +569,7 @@ void wined3d_device_cleanup(struct wined3d_device *device) device->hardwareCursor = 0; wine_rb_destroy(&device->samplers, device_leftover_sampler, NULL); + wine_rb_destroy(&device->rasterizer_states, device_leftover_rasterizer_state, NULL); wined3d_decref(device->wined3d); device->wined3d = NULL; @@ -1111,6 +1111,13 @@ static void device_free_sampler(struct wine_rb_entry *entry, void *context) wined3d_sampler_decref(sampler); } +static void device_free_rasterizer_state(struct wine_rb_entry *entry, void *context) +{ + struct wined3d_rasterizer_state *state = WINE_RB_ENTRY_VALUE(entry, struct wined3d_rasterizer_state, entry); + + wined3d_rasterizer_state_decref(state); +} + void wined3d_device_uninit_3d(struct wined3d_device *device) { BOOL no3d = device->wined3d->flags & WINED3D_NO3D; @@ -1153,6 +1160,7 @@ void wined3d_device_uninit_3d(struct wined3d_device *device) } wine_rb_clear(&device->samplers, device_free_sampler, NULL); + wine_rb_clear(&device->rasterizer_states, device_free_rasterizer_state, NULL); LIST_FOR_EACH_ENTRY_SAFE(resource, cursor, &device->resources, struct wined3d_resource, resource_list_entry) { @@ -5328,6 +5336,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, } wine_rb_clear(&device->samplers, device_free_sampler, NULL); + wine_rb_clear(&device->rasterizer_states, device_free_rasterizer_state, NULL); if (reset_state) {

1 0

Zhiyi Zhang : d3d8/tests: Test detaching adapters.
by Alexandre Julliard March 24, 2020

March 24, 2020

Module: wine Branch: master Commit: dc9cd0e0fbec272aa31c63bd7bd7291f3447cf05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc9cd0e0fbec272aa31c63bd… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Mar 24 15:52:27 2020 +0800 d3d8/tests: Test detaching adapters. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 76 ++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 70 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index a2c02b2c6a..d87832b716 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -9831,9 +9831,11 @@ static void test_multi_adapter(void) { unsigned int i, adapter_count, expected_adapter_count = 0; DISPLAY_DEVICEA display_device; - MONITORINFO monitor_info; + MONITORINFOEXA monitor_info; + DEVMODEA old_mode, mode; HMONITOR monitor; IDirect3D8 *d3d; + LONG ret; d3d = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); @@ -9853,17 +9855,79 @@ static void test_multi_adapter(void) for (i = 0; i < adapter_count; ++i) { monitor = IDirect3D8_GetAdapterMonitor(d3d, i); - ok(!!monitor, "Failed to get monitor for adapter %u.\n", i); + ok(!!monitor, "Adapter %u: Failed to get monitor.\n", i); monitor_info.cbSize = sizeof(monitor_info); - ok(GetMonitorInfoA(monitor, &monitor_info), - "Failed to get monitor info for adapter %u, error %#x.\n", i, GetLastError()); + ok(GetMonitorInfoA(monitor, (MONITORINFO *)&monitor_info), + "Adapter %u: Failed to get monitor info, error %#x.\n", i, GetLastError()); if (!i) ok(monitor_info.dwFlags == MONITORINFOF_PRIMARY, - "Got unexpected monitor flags %#x for adapter %u.\n", monitor_info.dwFlags, i); + "Adapter %u: Got unexpected monitor flags %#x.\n", i, monitor_info.dwFlags); else - ok(!monitor_info.dwFlags, "Got unexpected monitor flags %#x for adapter %u.\n", monitor_info.dwFlags, i); + ok(!monitor_info.dwFlags, "Adapter %u: Got unexpected monitor flags %#x.\n", i, + monitor_info.dwFlags); + + /* Test D3D adapters after they got detached */ + if (monitor_info.dwFlags == MONITORINFOF_PRIMARY) + continue; + + /* Save current display settings */ + memset(&old_mode, 0, sizeof(old_mode)); + old_mode.dmSize = sizeof(old_mode); + ret = EnumDisplaySettingsA(monitor_info.szDevice, ENUM_CURRENT_SETTINGS, &old_mode); + /* Win10 TestBots may return FALSE but it's actually successful */ + ok(ret || broken(!ret), "Adapter %u: EnumDisplaySettingsA failed for %s, error %#x.\n", i, + monitor_info.szDevice, GetLastError()); + + /* Detach */ + memset(&mode, 0, sizeof(mode)); + mode.dmSize = sizeof(mode); + mode.dmFields = DM_POSITION | DM_PELSWIDTH | DM_PELSHEIGHT; + mode.dmPosition = old_mode.dmPosition; + ret = ChangeDisplaySettingsExA(monitor_info.szDevice, &mode, NULL, + CDS_UPDATEREGISTRY | CDS_NORESET, NULL); + ok(ret == DISP_CHANGE_SUCCESSFUL, + "Adapter %u: ChangeDisplaySettingsExA %s returned unexpected %d.\n", i, + monitor_info.szDevice, ret); + ret = ChangeDisplaySettingsExA(monitor_info.szDevice, NULL, NULL, 0, NULL); + ok(ret == DISP_CHANGE_SUCCESSFUL, + "Adapter %u: ChangeDisplaySettingsExA %s returned unexpected %d.\n", i, + monitor_info.szDevice, ret); + + /* Check if it is really detached */ + memset(&mode, 0, sizeof(mode)); + mode.dmSize = sizeof(mode); + ret = EnumDisplaySettingsA(monitor_info.szDevice, ENUM_CURRENT_SETTINGS, &mode); + /* Win10 TestBots may return FALSE but it's actually successful */ + ok(ret || broken(!ret) , "Adapter %u: EnumDisplaySettingsA failed for %s, error %#x.\n", i, + monitor_info.szDevice, GetLastError()); + if (mode.dmPelsWidth && mode.dmPelsHeight) + { + skip("Adapter %u: Failed to detach device %s.\n", i, monitor_info.szDevice); + continue; + } + + /* Detaching adapter shouldn't reduce the adapter count */ + expected_adapter_count = adapter_count; + adapter_count = IDirect3D8_GetAdapterCount(d3d); + ok(adapter_count == expected_adapter_count, + "Adapter %u: Got unexpected adapter count %u, expected %u.\n", i, adapter_count, + expected_adapter_count); + + monitor = IDirect3D8_GetAdapterMonitor(d3d, i); + ok(!monitor, "Adapter %u: Expect monitor to be NULL.\n", i); + + /* Restore settings */ + ret = ChangeDisplaySettingsExA(monitor_info.szDevice, &old_mode, NULL, + CDS_UPDATEREGISTRY | CDS_NORESET, NULL); + ok(ret == DISP_CHANGE_SUCCESSFUL, + "Adapter %u: ChangeDisplaySettingsExA %s returned unexpected %d.\n", i, + monitor_info.szDevice, ret); + ret = ChangeDisplaySettingsExA(monitor_info.szDevice, NULL, NULL, 0, NULL); + ok(ret == DISP_CHANGE_SUCCESSFUL, + "Adapter %u: ChangeDisplaySettingsExA %s returned unexpected %d.\n", i, + monitor_info.szDevice, ret); } IDirect3D8_Release(d3d);

1 0

Zhiyi Zhang : d3d9/tests: Test detaching adapters.
by Alexandre Julliard March 24, 2020

March 24, 2020

Module: wine Branch: master Commit: b526bc39cb276a886a2805e4855f06839d3ea6af URL: https://source.winehq.org/git/wine.git/?a=commit;h=b526bc39cb276a886a2805e4… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Mar 24 15:52:41 2020 +0800 d3d9/tests: Test detaching adapters. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 76 ++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 70 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 4255293439..839c030185 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -13511,9 +13511,11 @@ static void test_multi_adapter(void) { unsigned int i, adapter_count, expected_adapter_count = 0; DISPLAY_DEVICEA display_device; - MONITORINFO monitor_info; + MONITORINFOEXA monitor_info; + DEVMODEA old_mode, mode; HMONITOR monitor; IDirect3D9 *d3d; + LONG ret; d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); @@ -13533,17 +13535,79 @@ static void test_multi_adapter(void) for (i = 0; i < adapter_count; ++i) { monitor = IDirect3D9_GetAdapterMonitor(d3d, i); - ok(!!monitor, "Failed to get monitor for adapter %u.\n", i); + ok(!!monitor, "Adapter %u: Failed to get monitor.\n", i); monitor_info.cbSize = sizeof(monitor_info); - ok(GetMonitorInfoA(monitor, &monitor_info), - "Failed to get monitor info for adapter %u, error %#x.\n", i, GetLastError()); + ok(GetMonitorInfoA(monitor, (MONITORINFO *)&monitor_info), + "Adapter %u: Failed to get monitor info, error %#x.\n", i, GetLastError()); if (!i) ok(monitor_info.dwFlags == MONITORINFOF_PRIMARY, - "Got unexpected monitor flags %#x for adapter %u.\n", monitor_info.dwFlags, i); + "Adapter %u: Got unexpected monitor flags %#x.\n", i, monitor_info.dwFlags); else - ok(!monitor_info.dwFlags, "Got unexpected monitor flags %#x for adapter %u.\n", monitor_info.dwFlags, i); + ok(!monitor_info.dwFlags, "Adapter %u: Got unexpected monitor flags %#x.\n", i, + monitor_info.dwFlags); + + /* Test D3D adapters after they got detached */ + if (monitor_info.dwFlags == MONITORINFOF_PRIMARY) + continue; + + /* Save current display settings */ + memset(&old_mode, 0, sizeof(old_mode)); + old_mode.dmSize = sizeof(old_mode); + ret = EnumDisplaySettingsA(monitor_info.szDevice, ENUM_CURRENT_SETTINGS, &old_mode); + /* Win10 TestBots may return FALSE but it's actually successful */ + ok(ret || broken(!ret), "Adapter %u: EnumDisplaySettingsA failed for %s, error %#x.\n", i, + monitor_info.szDevice, GetLastError()); + + /* Detach */ + memset(&mode, 0, sizeof(mode)); + mode.dmSize = sizeof(mode); + mode.dmFields = DM_POSITION | DM_PELSWIDTH | DM_PELSHEIGHT; + mode.dmPosition = old_mode.dmPosition; + ret = ChangeDisplaySettingsExA(monitor_info.szDevice, &mode, NULL, + CDS_UPDATEREGISTRY | CDS_NORESET, NULL); + ok(ret == DISP_CHANGE_SUCCESSFUL, + "Adapter %u: ChangeDisplaySettingsExA %s returned unexpected %d.\n", i, + monitor_info.szDevice, ret); + ret = ChangeDisplaySettingsExA(monitor_info.szDevice, NULL, NULL, 0, NULL); + ok(ret == DISP_CHANGE_SUCCESSFUL, + "Adapter %u: ChangeDisplaySettingsExA %s returned unexpected %d.\n", i, + monitor_info.szDevice, ret); + + /* Check if it is really detached */ + memset(&mode, 0, sizeof(mode)); + mode.dmSize = sizeof(mode); + ret = EnumDisplaySettingsA(monitor_info.szDevice, ENUM_CURRENT_SETTINGS, &mode); + /* Win10 TestBots may return FALSE but it's actually successful */ + ok(ret || broken(!ret) , "Adapter %u: EnumDisplaySettingsA failed for %s, error %#x.\n", i, + monitor_info.szDevice, GetLastError()); + if (mode.dmPelsWidth && mode.dmPelsHeight) + { + skip("Adapter %u: Failed to detach device %s.\n", i, monitor_info.szDevice); + continue; + } + + /* Detaching adapter shouldn't reduce the adapter count */ + expected_adapter_count = adapter_count; + adapter_count = IDirect3D9_GetAdapterCount(d3d); + ok(adapter_count == expected_adapter_count, + "Adapter %u: Got unexpected adapter count %u, expected %u.\n", i, adapter_count, + expected_adapter_count); + + monitor = IDirect3D9_GetAdapterMonitor(d3d, i); + ok(!monitor, "Adapter %u: Expect monitor to be NULL.\n", i); + + /* Restore settings */ + ret = ChangeDisplaySettingsExA(monitor_info.szDevice, &old_mode, NULL, + CDS_UPDATEREGISTRY | CDS_NORESET, NULL); + ok(ret == DISP_CHANGE_SUCCESSFUL, + "Adapter %u: ChangeDisplaySettingsExA %s returned unexpected %d.\n", i, + monitor_info.szDevice, ret); + ret = ChangeDisplaySettingsExA(monitor_info.szDevice, NULL, NULL, 0, NULL); + ok(ret == DISP_CHANGE_SUCCESSFUL, + "Adapter %u: ChangeDisplaySettingsExA %s returned unexpected %d.\n", i, + monitor_info.szDevice, ret); } IDirect3D9_Release(d3d);

1 0

Matteo Bruni : wined3d: Get rid of MAX_RENDER_TARGET_VIEWS.
by Alexandre Julliard March 24, 2020

March 24, 2020

Module: wine Branch: master Commit: ef66c4488f346a03d4adc5b65d0a7904bfbf2ded URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef66c4488f346a03d4adc5b6… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Mar 24 17:35:23 2020 +0100 wined3d: Get rid of MAX_RENDER_TARGET_VIEWS. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 2 +- dlls/wined3d/context.c | 2 +- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/wined3d_private.h | 11 +++++------ 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 2fd061b74a..e269bf8138 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -2993,7 +2993,7 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) if (gl_info->supported[ARB_DRAW_BUFFERS] && wined3d_settings.offscreen_rendering_mode == ORM_FBO) { gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_DRAW_BUFFERS_ARB, &gl_max); - gl_info->limits.buffers = min(MAX_RENDER_TARGET_VIEWS, gl_max); + gl_info->limits.buffers = min(WINED3D_MAX_RENDER_TARGETS, gl_max); TRACE("Max draw buffers: %u.\n", gl_max); } if (gl_info->supported[ARB_MULTITEXTURE]) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 1c15c25859..e92ce62662 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2755,7 +2755,7 @@ static inline GLenum draw_buffer_from_rt_mask(DWORD rt_mask) static void wined3d_context_gl_apply_draw_buffers(struct wined3d_context_gl *context_gl, uint32_t rt_mask) { const struct wined3d_gl_info *gl_info = context_gl->gl_info; - GLenum draw_buffers[MAX_RENDER_TARGET_VIEWS]; + GLenum draw_buffers[WINED3D_MAX_RENDER_TARGETS]; if (!rt_mask) { diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 26dde1087a..4272453c1b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -10395,7 +10395,7 @@ static void set_glsl_shader_program(const struct wined3d_context_gl *context_gl, if (!use_legacy_fragment_output(gl_info)) { - for (i = 0; i < MAX_RENDER_TARGET_VIEWS; ++i) + for (i = 0; i < WINED3D_MAX_RENDER_TARGETS; ++i) { string_buffer_sprintf(tmp_name, "color_out%u", i); if (state->blend_state && state->blend_state->dual_source) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6e976fb0aa..23a300a0ea 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -284,7 +284,6 @@ static inline enum complex_fixup get_complex_fixup(struct color_fixup_desc fixup #define MAX_CONSTANT_BUFFERS 15 #define MAX_SAMPLER_OBJECTS 16 #define MAX_SHADER_RESOURCE_VIEWS 128 -#define MAX_RENDER_TARGET_VIEWS 8 #define MAX_UNORDERED_ACCESS_VIEWS 8 #define MAX_TGSM_REGISTERS 8192 #define MAX_VERTEX_BLENDS 4 @@ -1393,7 +1392,7 @@ struct ps_compile_args DWORD flatshading : 1; DWORD alpha_test_func : 3; DWORD render_offscreen : 1; - DWORD rt_alpha_swizzle : 8; /* MAX_RENDER_TARGET_VIEWS, 8 */ + DWORD rt_alpha_swizzle : 8; /* WINED3D_MAX_RENDER_TARGETS, 8 */ DWORD dual_source_blend : 1; DWORD padding : 17; }; @@ -1917,7 +1916,7 @@ struct wined3d_rendertarget_info struct wined3d_fb_state { - struct wined3d_rendertarget_view *render_targets[MAX_RENDER_TARGET_VIEWS]; + struct wined3d_rendertarget_view *render_targets[WINED3D_MAX_RENDER_TARGETS]; struct wined3d_rendertarget_view *depth_stencil; }; @@ -2045,7 +2044,7 @@ struct wined3d_context_gl struct fbo_entry *current_fbo; GLuint fbo_read_binding; GLuint fbo_draw_binding; - struct wined3d_rendertarget_info blit_targets[MAX_RENDER_TARGET_VIEWS]; + struct wined3d_rendertarget_info blit_targets[WINED3D_MAX_RENDER_TARGETS]; uint32_t draw_buffers_mask; /* Enabled draw buffers, 31 max. */ /* Queries. */ @@ -3859,7 +3858,7 @@ struct fbo_entry struct wined3d_fbo_entry_key { DWORD rb_namespace; - struct wined3d_fbo_resource objects[MAX_RENDER_TARGET_VIEWS + 1]; + struct wined3d_fbo_resource objects[WINED3D_MAX_RENDER_TARGETS + 1]; } key; }; @@ -5318,7 +5317,7 @@ static inline BOOL wined3d_resource_check_fbo_attached(const struct wined3d_stat if (!(resource->bind_flags & WINED3D_BIND_RENDER_TARGET)) return FALSE; - for (i = 0; i < MAX_RENDER_TARGET_VIEWS; ++i) + for (i = 0; i < WINED3D_MAX_RENDER_TARGETS; ++i) if (rts[i] && rts[i]->resource == resource) return TRUE;

1 0

Zhiyi Zhang : dxgi/tests: Test detaching outputs.
by Alexandre Julliard March 24, 2020

March 24, 2020

Module: wine Branch: master Commit: 47a069f96420f48ff40a175fcb2c23598208e507 URL: https://source.winehq.org/git/wine.git/?a=commit;h=47a069f96420f48ff40a175f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Mar 24 15:52:54 2020 +0800 dxgi/tests: Test detaching outputs. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 160 +++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 141 insertions(+), 19 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=47a069f96420f48ff40a…

1 0

Francois Gouget : kernel32/tests: Add a couple of process helper functions.
by Alexandre Julliard March 24, 2020

March 24, 2020

Module: wine Branch: master Commit: 7e1b131a85f92721a6cc367a63266eed177fd328 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e1b131a85f92721a6cc367a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 24 13:50:37 2020 +0100 kernel32/tests: Add a couple of process helper functions. wait_and_close_child_process() simplifies waiting for the child process and closing its handles. And because it uses wait_child_process() this ensures that any error happening in the child process is detected. reload_child_dump() wraps a cryptic WritePrivateProfileStringA() call and avoids having to add a comment every time. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 284 +++++++++++++++--------------------------- 1 file changed, 99 insertions(+), 185 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7e1b131a85f92721a6cc…

1 0

Matteo Bruni : d3dx9: Use an assert() to validate access to const_tbl[].
by Alexandre Julliard March 24, 2020

March 24, 2020

Module: wine Branch: master Commit: cfc533b40d2d1426a8f05501152b28aa1ec78f07 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cfc533b40d2d1426a8f05501… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Mar 24 15:17:16 2020 +0100 d3dx9: Use an assert() to validate access to const_tbl[]. This check is essentially validating that the hardcoded state_table[] has reasonable values for the shader constant states. Use ARRAY_SIZE() to avoid warnings if the compiler chooses an unsigned integer to back enum SHADER_CONSTANT_TYPE. Based on an idea by Henri Verbeet. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 88168df1e1..525b87340b 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1469,11 +1469,7 @@ static HRESULT d3dx_set_shader_const_state(struct d3dx_effect *effect, enum SHAD D3DXVECTOR4 value; HRESULT ret; - if (op < 0 || op > SCT_PSINT) - { - FIXME("Unknown op %u.\n", op); - return D3DERR_INVALIDCALL; - } + assert(op < ARRAY_SIZE(const_tbl)); element_count = param->bytes / const_tbl[op].elem_size; TRACE("%s, index %u, element_count %u.\n", const_tbl[op].name, index, element_count); if (param->type != const_tbl[op].type)

1 0

Connor McAdams : d3d10: Add tests for matrix effect variable.
by Alexandre Julliard March 24, 2020

March 24, 2020

Module: wine Branch: master Commit: 05d16673607957056e236c586ccbc64e227d3856 URL: https://source.winehq.org/git/wine.git/?a=commit;h=05d16673607957056e236c58… Author: Connor McAdams <conmanx360(a)gmail.com> Date: Tue Mar 24 14:05:58 2020 +0100 d3d10: Add tests for matrix effect variable. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/tests/effect.c | 333 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 333 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=05d16673607957056e23…

1 0

Sven Baars : d3dx9: Remove a recursive call to ID3DXFont_DrawTextW when no rect is specified.
by Alexandre Julliard March 24, 2020

March 24, 2020

Module: wine Branch: master Commit: 9796bdc966a89cd31829f3a094bb37ec71e21871 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9796bdc966a89cd31829f3a0… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Tue Mar 24 14:05:14 2020 +0100 d3dx9: Remove a recursive call to ID3DXFont_DrawTextW when no rect is specified. Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/font.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c index 3645903367..54b1574bb1 100644 --- a/dlls/d3dx9_36/font.c +++ b/dlls/d3dx9_36/font.c @@ -629,17 +629,8 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite, if (format & DT_SINGLELINE) format &= ~DT_WORDBREAK; - if (!rect) - { - y = ID3DXFont_DrawTextW(iface, NULL, string, count, &textrect, format | DT_CALCRECT, 0); - - if (format & DT_CALCRECT) - return y; - } - else - { + if (rect) textrect = *rect; - } x = textrect.left; y = textrect.top; @@ -716,7 +707,7 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite, break; } - if (format & DT_CALCRECT) + if (format & DT_CALCRECT && rect) { *rect = textrect;

1 0