- Wine-Commits - list.winehq.org

Paul Gofman : winex11.drv: Don't allow changing internal pixel format if conflicts with non-internal.
by Alexandre Julliard March 16, 2023

March 16, 2023

Module: wine Branch: master Commit: 446da60e78beb321d776b48cdee6f764c81b924b URL: https://gitlab.winehq.org/wine/wine/-/commit/446da60e78beb321d776b48cdee6f7… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Mar 13 17:07:56 2023 -0600 winex11.drv: Don't allow changing internal pixel format if conflicts with non-internal. --- dlls/winex11.drv/opengl.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index b2169de9bf7..565df8bb4c6 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1412,6 +1412,7 @@ static BOOL set_pixel_format( HDC hdc, int format, BOOL internal ) const struct wgl_pixel_format *fmt; int value; HWND hwnd = NtUserWindowFromDC( hdc ); + int prev; TRACE("(%p,%d)\n", hdc, format); @@ -1435,14 +1436,12 @@ static BOOL set_pixel_format( HDC hdc, int format, BOOL internal ) return FALSE; } - if (!internal) - { - /* cannot change it if already set */ - int prev = win32u_get_window_pixel_format( hwnd ); - - if (prev) - return prev == format; - } + /* Even for internal pixel format fail setting it if the app has already set a + * different pixel format. Let wined3d create a backup GL context instead. + * Switching pixel format involves drawable recreation and is much more expensive + * than blitting from backup context. */ + if ((prev = win32u_get_window_pixel_format( hwnd ))) + return prev == format; return set_win_format( hwnd, fmt, internal ); }

1 0

Zebediah Figura : ddraw: Move the rest of the surface desc population to ddraw_surface_create() from device_parent_texture_sub_resource_created().
by Alexandre Julliard March 16, 2023

March 16, 2023

Module: wine Branch: master Commit: 0ff2f3a8565a875a56408f2ae8862de958796286 URL: https://gitlab.winehq.org/wine/wine/-/commit/0ff2f3a8565a875a56408f2ae8862d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Dec 24 22:06:25 2022 -0600 ddraw: Move the rest of the surface desc population to ddraw_surface_create() from device_parent_texture_sub_resource_created(). Cf. 191db92fd590. Put all this code in the same place, and possibly move towards getting rid of the texture_sub_resource_created() callback entirely. --- dlls/ddraw/surface.c | 48 +++++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index fc713bc9b82..c80083a4eac 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6175,6 +6175,7 @@ static HRESULT ddraw_surface_create_wined3d_texture(struct ddraw *ddraw, { struct wined3d_sub_resource_desc wined3d_mip_desc; unsigned int sub_resource_idx = i * levels + j; + unsigned int row_pitch, slice_pitch; struct ddraw_surface *mip; DDSURFACEDESC2 *mip_desc; @@ -6182,6 +6183,30 @@ static HRESULT ddraw_surface_create_wined3d_texture(struct ddraw *ddraw, mip->sysmem_fallback = sysmem_fallback; mip_desc = &mip->surface_desc; + + *mip_desc = *desc; + + wined3d_texture_get_pitch(*wined3d_texture, j, &row_pitch, &slice_pitch); + if (format_is_compressed(&desc->u4.ddpfPixelFormat)) + { + if (desc->dwFlags & DDSD_LPSURFACE) + mip_desc->u1.dwLinearSize = ~0u; + else + mip_desc->u1.dwLinearSize = slice_pitch; + mip_desc->dwFlags |= DDSD_LINEARSIZE; + mip_desc->dwFlags &= ~DDSD_PITCH; + } + else + { + if (!(desc->dwFlags & DDSD_LPSURFACE)) + mip_desc->u1.lPitch = row_pitch; + mip_desc->dwFlags |= DDSD_PITCH; + mip_desc->dwFlags &= ~DDSD_LINEARSIZE; + } + + mip_desc->dwFlags &= ~DDSD_LPSURFACE; + mip_desc->lpSurface = NULL; + if (desc->ddsCaps.dwCaps & DDSCAPS_MIPMAP) mip_desc->u2.dwMipMapCount = levels - j; @@ -6788,8 +6813,6 @@ void ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, const struct wined3d_parent_ops **parent_ops) { struct ddraw_texture *texture = wined3d_texture_get_parent(wined3d_texture); - unsigned int texture_level, row_pitch, slice_pitch; - DDSURFACEDESC2 *desc = &surface->surface_desc; unsigned int version = texture->version; surface->IDirectDrawSurface7_iface.lpVtbl = &ddraw_surface7_vtbl; @@ -6820,29 +6843,8 @@ void ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, surface->texture_outer = (IUnknown *)&surface->IDirectDrawSurface_iface; } - *desc = texture->surface_desc; surface->first_attached = surface; - texture_level = desc->ddsCaps.dwCaps & DDSCAPS_MIPMAP ? sub_resource_idx % desc->u2.dwMipMapCount : 0; - wined3d_texture_get_pitch(wined3d_texture, texture_level, &row_pitch, &slice_pitch); - if (format_is_compressed(&desc->u4.ddpfPixelFormat)) - { - if (desc->dwFlags & DDSD_LPSURFACE) - desc->u1.dwLinearSize = ~0u; - else - desc->u1.dwLinearSize = slice_pitch; - desc->dwFlags |= DDSD_LINEARSIZE; - desc->dwFlags &= ~(DDSD_LPSURFACE | DDSD_PITCH); - } - else - { - if (!(desc->dwFlags & DDSD_LPSURFACE)) - desc->u1.lPitch = row_pitch; - desc->dwFlags |= DDSD_PITCH; - desc->dwFlags &= ~(DDSD_LPSURFACE | DDSD_LINEARSIZE); - } - desc->lpSurface = NULL; - wined3d_texture_incref(surface->wined3d_texture = wined3d_texture); surface->sub_resource_idx = sub_resource_idx; *parent_ops = &ddraw_surface_wined3d_parent_ops;

1 0

Max Figura : wined3d: Move the WINED3D_RS_SOFTWAREVERTEXPROCESSING stub to wined3d_device_apply_stateblock.
by Alexandre Julliard March 16, 2023

March 16, 2023

Module: wine Branch: master Commit: dfa5f0082f9e31040a7372c6f5d6c2d78d141adc URL: https://gitlab.winehq.org/wine/wine/-/commit/dfa5f0082f9e31040a7372c6f5d6c2… Author: Max Figura <maxfigura5061(a)gmail.com> Date: Tue Dec 13 08:47:51 2022 -0600 wined3d: Move the WINED3D_RS_SOFTWAREVERTEXPROCESSING stub to wined3d_device_apply_stateblock. --- dlls/wined3d/adapter_vk.c | 1 - dlls/wined3d/device.c | 9 +++++++++ dlls/wined3d/directx.c | 1 - dlls/wined3d/state.c | 12 +----------- 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 6e46106a5e6..2db44cc8000 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -98,7 +98,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] = {STATE_INDEXBUFFER, {STATE_INDEXBUFFER, state_nop}}, {STATE_RENDER(WINED3D_RS_LINEPATTERN), {STATE_RENDER(WINED3D_RS_LINEPATTERN), state_nop}}, {STATE_RENDER(WINED3D_RS_DITHERENABLE), {STATE_RENDER(WINED3D_RS_DITHERENABLE), state_nop}}, - {STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), {STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), state_nop}}, {STATE_RENDER(WINED3D_RS_PATCHEDGESTYLE), {STATE_RENDER(WINED3D_RS_PATCHEDGESTYLE), state_nop}}, {STATE_RENDER(WINED3D_RS_PATCHSEGMENTS), {STATE_RENDER(WINED3D_RS_PATCHSEGMENTS), state_nop}}, {STATE_RENDER(WINED3D_RS_POSITIONDEGREE), {STATE_RENDER(WINED3D_RS_POSITIONDEGREE), state_nop}}, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5d745a6e382..4b17afd87d1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4163,6 +4163,15 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, FIXME("Render state WINED3D_RS_COLORKEYBLENDENABLE not implemented yet.\n"); break; + case WINED3D_RS_SOFTWAREVERTEXPROCESSING: + { + static unsigned int once; + + if ((state->rs[WINED3D_RS_SOFTWAREVERTEXPROCESSING]) && !once++) + FIXME("Software vertex processing not implemented.\n"); + break; + } + default: wined3d_device_set_render_state(device, idx, state->rs[idx]); break; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 0ec9570e1b6..3426e222d33 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2811,7 +2811,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] = {STATE_RENDER(WINED3D_RS_LINEPATTERN), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_ZFUNC), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_DITHERENABLE), {STATE_VDECL}}, - {STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_PATCHEDGESTYLE), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_PATCHSEGMENTS), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_POSITIONDEGREE), {STATE_VDECL}}, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 6ef82e9be4c..a7f8aa91574 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2018,16 +2018,6 @@ static void state_tessellation(struct wined3d_context *context, const struct win state->render_states[WINED3D_RS_ENABLEADAPTIVETESSELLATION]); } -static void state_swvp(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) -{ - static int once; - if (state->render_states[WINED3D_RS_SOFTWAREVERTEXPROCESSING]) - { - if (!once++) - FIXME("Software vertex processing not implemented.\n"); - } -} - static void get_src_and_opr(uint32_t arg, BOOL is_alpha, GLenum* source, GLenum* operand) { /* The WINED3DTA_ALPHAREPLICATE flag specifies the alpha component of the * input should be used for all input components. The WINED3DTA_COMPLEMENT @@ -4645,7 +4635,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = { STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern }, WINED3D_GL_LEGACY_CONTEXT }, { STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern_w }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_DITHERENABLE), { STATE_RENDER(WINED3D_RS_DITHERENABLE), state_ditherenable }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), { STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), state_swvp }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_PATCHEDGESTYLE), { STATE_RENDER(WINED3D_RS_PATCHEDGESTYLE), state_patchedgestyle}, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_PATCHSEGMENTS), { STATE_RENDER(WINED3D_RS_PATCHSEGMENTS), state_patchsegments }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_POSITIONDEGREE), { STATE_RENDER(WINED3D_RS_POSITIONDEGREE), state_positiondegree}, WINED3D_GL_EXT_NONE }, @@ -5426,6 +5415,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) {138, 138}, {144, 144}, {149, 150}, + {153, 153}, {162, 162}, {168, 169}, {171, 171},

1 0

Max Figura : wined3d: Move the WINED3D_RS_PATCHEDGESTYLE stub to wined3d_device_apply_stateblock.
by Alexandre Julliard March 16, 2023

March 16, 2023

Module: wine Branch: master Commit: 0076908b4aa743b1607548ecdd66155ce8c043eb URL: https://gitlab.winehq.org/wine/wine/-/commit/0076908b4aa743b1607548ecdd6615… Author: Max Figura <maxfigura5061(a)gmail.com> Date: Tue Dec 13 08:54:34 2022 -0600 wined3d: Move the WINED3D_RS_PATCHEDGESTYLE stub to wined3d_device_apply_stateblock. --- dlls/wined3d/adapter_vk.c | 1 - dlls/wined3d/device.c | 6 ++++++ dlls/wined3d/directx.c | 1 - dlls/wined3d/state.c | 10 +--------- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 2db44cc8000..1b61801e68d 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -98,7 +98,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] = {STATE_INDEXBUFFER, {STATE_INDEXBUFFER, state_nop}}, {STATE_RENDER(WINED3D_RS_LINEPATTERN), {STATE_RENDER(WINED3D_RS_LINEPATTERN), state_nop}}, {STATE_RENDER(WINED3D_RS_DITHERENABLE), {STATE_RENDER(WINED3D_RS_DITHERENABLE), state_nop}}, - {STATE_RENDER(WINED3D_RS_PATCHEDGESTYLE), {STATE_RENDER(WINED3D_RS_PATCHEDGESTYLE), state_nop}}, {STATE_RENDER(WINED3D_RS_PATCHSEGMENTS), {STATE_RENDER(WINED3D_RS_PATCHSEGMENTS), state_nop}}, {STATE_RENDER(WINED3D_RS_POSITIONDEGREE), {STATE_RENDER(WINED3D_RS_POSITIONDEGREE), state_nop}}, {STATE_RENDER(WINED3D_RS_NORMALDEGREE), {STATE_RENDER(WINED3D_RS_NORMALDEGREE), state_nop}}, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4b17afd87d1..634fa9576dc 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4172,6 +4172,12 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, break; } + case WINED3D_RS_PATCHEDGESTYLE: + if (state->rs[WINED3D_RS_PATCHEDGESTYLE] != WINED3D_PATCH_EDGE_DISCRETE) + FIXME("WINED3D_RS_PATCHEDGESTYLE %#x not yet implemented.\n", + state->rs[WINED3D_RS_PATCHEDGESTYLE]); + break; + default: wined3d_device_set_render_state(device, idx, state->rs[idx]); break; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 3426e222d33..6ad3e26ca55 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2811,7 +2811,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] = {STATE_RENDER(WINED3D_RS_LINEPATTERN), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_ZFUNC), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_DITHERENABLE), {STATE_VDECL}}, - {STATE_RENDER(WINED3D_RS_PATCHEDGESTYLE), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_PATCHSEGMENTS), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_POSITIONDEGREE), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_NORMALDEGREE), {STATE_VDECL}}, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index a7f8aa91574..8ec7bb45b77 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1970,13 +1970,6 @@ static void state_sample_mask_w(struct wined3d_context *context, const struct wi WARN("Unsupported in local OpenGL implementation: glSampleMaski.\n"); } -static void state_patchedgestyle(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) -{ - if (state->render_states[WINED3D_RS_PATCHEDGESTYLE] != WINED3D_PATCH_EDGE_DISCRETE) - FIXME("WINED3D_RS_PATCHEDGESTYLE %#x not yet implemented.\n", - state->render_states[WINED3D_RS_PATCHEDGESTYLE]); -} - static void state_patchsegments(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { union { @@ -4635,7 +4628,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = { STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern }, WINED3D_GL_LEGACY_CONTEXT }, { STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern_w }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_DITHERENABLE), { STATE_RENDER(WINED3D_RS_DITHERENABLE), state_ditherenable }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_PATCHEDGESTYLE), { STATE_RENDER(WINED3D_RS_PATCHEDGESTYLE), state_patchedgestyle}, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_PATCHSEGMENTS), { STATE_RENDER(WINED3D_RS_PATCHSEGMENTS), state_patchsegments }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_POSITIONDEGREE), { STATE_RENDER(WINED3D_RS_POSITIONDEGREE), state_positiondegree}, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_NORMALDEGREE), { STATE_RENDER(WINED3D_RS_NORMALDEGREE), state_normaldegree }, WINED3D_GL_EXT_NONE }, @@ -5416,7 +5408,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) {144, 144}, {149, 150}, {153, 153}, - {162, 162}, + {162, 163}, {168, 169}, {171, 171}, {174, 177},

1 0

Max Figura : wined3d: Move the WINED3D_RS_PATCHSEGMENTS stub to wined3d_device_apply_stateblock.
by Alexandre Julliard March 16, 2023

March 16, 2023

Module: wine Branch: master Commit: 5c61a9c3e692fb8debca0596691085e2082bef9e URL: https://gitlab.winehq.org/wine/wine/-/commit/5c61a9c3e692fb8debca0596691085… Author: Max Figura <maxfigura5061(a)gmail.com> Date: Tue Dec 13 09:05:23 2022 -0600 wined3d: Move the WINED3D_RS_PATCHSEGMENTS stub to wined3d_device_apply_stateblock. --- dlls/wined3d/adapter_vk.c | 1 - dlls/wined3d/device.c | 22 ++++++++++++++++++++++ dlls/wined3d/directx.c | 1 - dlls/wined3d/state.c | 23 +---------------------- 4 files changed, 23 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 1b61801e68d..f743d6386d7 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -98,7 +98,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] = {STATE_INDEXBUFFER, {STATE_INDEXBUFFER, state_nop}}, {STATE_RENDER(WINED3D_RS_LINEPATTERN), {STATE_RENDER(WINED3D_RS_LINEPATTERN), state_nop}}, {STATE_RENDER(WINED3D_RS_DITHERENABLE), {STATE_RENDER(WINED3D_RS_DITHERENABLE), state_nop}}, - {STATE_RENDER(WINED3D_RS_PATCHSEGMENTS), {STATE_RENDER(WINED3D_RS_PATCHSEGMENTS), state_nop}}, {STATE_RENDER(WINED3D_RS_POSITIONDEGREE), {STATE_RENDER(WINED3D_RS_POSITIONDEGREE), state_nop}}, {STATE_RENDER(WINED3D_RS_NORMALDEGREE), {STATE_RENDER(WINED3D_RS_NORMALDEGREE), state_nop}}, {STATE_RENDER(WINED3D_RS_MINTESSELLATIONLEVEL), {STATE_RENDER(WINED3D_RS_ENABLEADAPTIVETESSELLATION)}}, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 634fa9576dc..ea2900eeae7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4178,6 +4178,28 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, state->rs[WINED3D_RS_PATCHEDGESTYLE]); break; + case WINED3D_RS_PATCHSEGMENTS: + { + union + { + DWORD d; + float f; + } tmpvalue; + tmpvalue.f = 1.0f; + + if (state->rs[WINED3D_RS_PATCHSEGMENTS] != tmpvalue.d) + { + static bool displayed = false; + + tmpvalue.d = state->rs[WINED3D_RS_PATCHSEGMENTS]; + if(!displayed) + FIXME("(WINED3D_RS_PATCHSEGMENTS,%f) not yet implemented.\n", tmpvalue.f); + + displayed = true; + } + break; + } + default: wined3d_device_set_render_state(device, idx, state->rs[idx]); break; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6ad3e26ca55..bb34c0f03af 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2811,7 +2811,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] = {STATE_RENDER(WINED3D_RS_LINEPATTERN), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_ZFUNC), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_DITHERENABLE), {STATE_VDECL}}, - {STATE_RENDER(WINED3D_RS_PATCHSEGMENTS), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_POSITIONDEGREE), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_NORMALDEGREE), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_MINTESSELLATIONLEVEL), {STATE_VDECL}}, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 8ec7bb45b77..78ad0ed1062 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1970,26 +1970,6 @@ static void state_sample_mask_w(struct wined3d_context *context, const struct wi WARN("Unsupported in local OpenGL implementation: glSampleMaski.\n"); } -static void state_patchsegments(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) -{ - union { - DWORD d; - float f; - } tmpvalue; - tmpvalue.f = 1.0f; - - if (state->render_states[WINED3D_RS_PATCHSEGMENTS] != tmpvalue.d) - { - static BOOL displayed = FALSE; - - tmpvalue.d = state->render_states[WINED3D_RS_PATCHSEGMENTS]; - if(!displayed) - FIXME("(WINED3D_RS_PATCHSEGMENTS,%f) not yet implemented\n", tmpvalue.f); - - displayed = TRUE; - } -} - static void state_positiondegree(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { if (state->render_states[WINED3D_RS_POSITIONDEGREE] != WINED3D_DEGREE_CUBIC) @@ -4628,7 +4608,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = { STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern }, WINED3D_GL_LEGACY_CONTEXT }, { STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern_w }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_DITHERENABLE), { STATE_RENDER(WINED3D_RS_DITHERENABLE), state_ditherenable }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_PATCHSEGMENTS), { STATE_RENDER(WINED3D_RS_PATCHSEGMENTS), state_patchsegments }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_POSITIONDEGREE), { STATE_RENDER(WINED3D_RS_POSITIONDEGREE), state_positiondegree}, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_NORMALDEGREE), { STATE_RENDER(WINED3D_RS_NORMALDEGREE), state_normaldegree }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_MINTESSELLATIONLEVEL), { STATE_RENDER(WINED3D_RS_ENABLEADAPTIVETESSELLATION),NULL }, WINED3D_GL_EXT_NONE }, @@ -5408,7 +5387,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) {144, 144}, {149, 150}, {153, 153}, - {162, 163}, + {162, 164}, {168, 169}, {171, 171}, {174, 177},

1 0

Max Figura : wined3d: Move the WINED3D_RS_INDEXEDVERTEXBLENDENABLE stub to wined3d_device_apply_stateblock.
by Alexandre Julliard March 16, 2023

March 16, 2023

Module: wine Branch: master Commit: 21079819e842226d9fb7ab4fbe2270bff7a1923e URL: https://gitlab.winehq.org/wine/wine/-/commit/21079819e842226d9fb7ab4fbe2270… Author: Max Figura <maxfigura5061(a)gmail.com> Date: Tue Dec 13 09:25:54 2022 -0600 wined3d: Move the WINED3D_RS_INDEXEDVERTEXBLENDENABLE stub to wined3d_device_apply_stateblock. --- dlls/wined3d/device.c | 3 +++ dlls/wined3d/glsl_shader.c | 1 - dlls/wined3d/shader_spirv.c | 1 - dlls/wined3d/state.c | 3 +-- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f823e2ffa4a..a19fb99caaf 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4204,6 +4204,9 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, WARN("token: %#x.\n", state->rs[WINED3D_RS_DEBUGMONITORTOKEN]); break; + case WINED3D_RS_INDEXEDVERTEXBLENDENABLE: + break; + default: wined3d_device_set_render_state(device, idx, state->rs[idx]); break; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 451e023d5fb..749f980ea03 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -11971,7 +11971,6 @@ static const struct wined3d_state_entry_template glsl_vertex_pipe_vp_states[] = {STATE_RENDER(WINED3D_RS_POINTSCALE_C), {STATE_RENDER(WINED3D_RS_POINTSCALEENABLE), NULL }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_POINTSIZE_MAX), {STATE_RENDER(WINED3D_RS_POINTSIZE_MIN), NULL }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_TWEENFACTOR), {STATE_SHADER(WINED3D_SHADER_TYPE_VERTEX), NULL }, WINED3D_GL_EXT_NONE }, - {STATE_RENDER(WINED3D_RS_INDEXEDVERTEXBLENDENABLE), {STATE_SHADER(WINED3D_SHADER_TYPE_VERTEX), NULL }, WINED3D_GL_EXT_NONE }, /* NP2 texture matrix fixups. They are not needed if * GL_ARB_texture_non_power_of_two is supported. Otherwise, register * glsl_vertex_pipe_texmatrix(), which takes care of updating the texture diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c index 1dff25cc6a6..05e670d3af9 100644 --- a/dlls/wined3d/shader_spirv.c +++ b/dlls/wined3d/shader_spirv.c @@ -1147,7 +1147,6 @@ static const struct wined3d_state_entry_template spirv_vertex_pipe_vk_vp_states[ {STATE_RENDER(WINED3D_RS_POINTSCALE_B), {STATE_RENDER(WINED3D_RS_POINTSCALE_B), state_nop}}, {STATE_RENDER(WINED3D_RS_POINTSCALE_C), {STATE_RENDER(WINED3D_RS_POINTSCALE_C), state_nop}}, {STATE_RENDER(WINED3D_RS_POINTSIZE_MAX), {STATE_RENDER(WINED3D_RS_POINTSIZE_MAX), state_nop}}, - {STATE_RENDER(WINED3D_RS_INDEXEDVERTEXBLENDENABLE), {STATE_RENDER(WINED3D_RS_INDEXEDVERTEXBLENDENABLE), state_nop}}, {STATE_RENDER(WINED3D_RS_TWEENFACTOR), {STATE_RENDER(WINED3D_RS_TWEENFACTOR), state_nop}}, {STATE_MATERIAL, {STATE_MATERIAL, state_nop}}, {STATE_SHADER(WINED3D_SHADER_TYPE_VERTEX), {STATE_SHADER(WINED3D_SHADER_TYPE_VERTEX), state_nop}}, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index af26b3f9404..ed369064640 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4987,7 +4987,6 @@ static const struct wined3d_state_entry_template vp_ffp_states[] = { STATE_RENDER(WINED3D_RS_POINTSIZE_MAX), { STATE_RENDER(WINED3D_RS_POINTSIZE_MIN), NULL }, EXT_POINT_PARAMETERS }, { STATE_RENDER(WINED3D_RS_POINTSIZE_MAX), { STATE_RENDER(WINED3D_RS_POINTSIZE_MIN), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_TWEENFACTOR), { STATE_RENDER(WINED3D_RS_VERTEXBLEND), NULL }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_INDEXEDVERTEXBLENDENABLE), { STATE_RENDER(WINED3D_RS_VERTEXBLEND), NULL }, WINED3D_GL_EXT_NONE }, /* Samplers for NP2 texture matrix adjustions. They are not needed if GL_ARB_texture_non_power_of_two is supported, * so register a NULL state handler in that case to get the vertex part of sampler() skipped(VTF is handled in the misc states. @@ -5382,7 +5381,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) {149, 150}, {153, 153}, {162, 165}, - {168, 169}, + {167, 169}, {171, 171}, {174, 177}, {185, 193},

1 0

Max Figura : wined3d: Move the WINED3D_RS_DEBUGMONITORTOKEN stub to wined3d_device_apply_stateblock.
by Alexandre Julliard March 16, 2023

March 16, 2023

Module: wine Branch: master Commit: 79ea470d4d67f454133e1d41e0d3c5de3e083023 URL: https://gitlab.winehq.org/wine/wine/-/commit/79ea470d4d67f454133e1d41e0d3c5… Author: Max Figura <maxfigura5061(a)gmail.com> Date: Tue Dec 13 09:16:13 2022 -0600 wined3d: Move the WINED3D_RS_DEBUGMONITORTOKEN stub to wined3d_device_apply_stateblock. --- dlls/wined3d/adapter_vk.c | 1 - dlls/wined3d/device.c | 4 ++++ dlls/wined3d/directx.c | 1 - dlls/wined3d/state.c | 8 +------- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index f743d6386d7..7e33aea747b 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -108,7 +108,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] = {STATE_RENDER(WINED3D_RS_ADAPTIVETESS_W), {STATE_RENDER(WINED3D_RS_ENABLEADAPTIVETESSELLATION)}}, {STATE_RENDER(WINED3D_RS_ENABLEADAPTIVETESSELLATION), {STATE_RENDER(WINED3D_RS_ENABLEADAPTIVETESSELLATION), state_nop}}, {STATE_RENDER(WINED3D_RS_MULTISAMPLEANTIALIAS), {STATE_RENDER(WINED3D_RS_MULTISAMPLEANTIALIAS), state_nop}}, - {STATE_RENDER(WINED3D_RS_DEBUGMONITORTOKEN), {STATE_RENDER(WINED3D_RS_DEBUGMONITORTOKEN), state_nop}}, /* Samplers */ {STATE_SAMPLER(0), {STATE_SAMPLER(0), state_nop}}, {STATE_SAMPLER(1), {STATE_SAMPLER(1), state_nop}}, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ea2900eeae7..f823e2ffa4a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4200,6 +4200,10 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, break; } + case WINED3D_RS_DEBUGMONITORTOKEN: + WARN("token: %#x.\n", state->rs[WINED3D_RS_DEBUGMONITORTOKEN]); + break; + default: wined3d_device_set_render_state(device, idx, state->rs[idx]); break; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index bb34c0f03af..db335652d8e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2821,7 +2821,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] = {STATE_RENDER(WINED3D_RS_ADAPTIVETESS_W), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_ENABLEADAPTIVETESSELLATION), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_MULTISAMPLEANTIALIAS), {STATE_VDECL}}, - {STATE_RENDER(WINED3D_RS_DEBUGMONITORTOKEN), {STATE_VDECL}}, /* Samplers */ {STATE_SAMPLER(0), {STATE_VDECL}}, {STATE_SAMPLER(1), {STATE_VDECL}}, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 78ad0ed1062..af26b3f9404 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1766,11 +1766,6 @@ static void state_pscale(struct wined3d_context *context, const struct wined3d_s checkGLcall("glPointSize(...);"); } -static void state_debug_monitor(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) -{ - WARN("token: %#x.\n", state->render_states[WINED3D_RS_DEBUGMONITORTOKEN]); -} - static void state_localviewer(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; @@ -4619,7 +4614,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = { STATE_RENDER(WINED3D_RS_ENABLEADAPTIVETESSELLATION),{ STATE_RENDER(WINED3D_RS_ENABLEADAPTIVETESSELLATION),state_tessellation }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_MULTISAMPLEANTIALIAS), { STATE_RENDER(WINED3D_RS_MULTISAMPLEANTIALIAS), state_msaa }, ARB_MULTISAMPLE }, { STATE_RENDER(WINED3D_RS_MULTISAMPLEANTIALIAS), { STATE_RENDER(WINED3D_RS_MULTISAMPLEANTIALIAS), state_msaa_w }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_DEBUGMONITORTOKEN), { STATE_RENDER(WINED3D_RS_DEBUGMONITORTOKEN), state_debug_monitor }, WINED3D_GL_EXT_NONE }, /* Samplers */ { STATE_SAMPLER(0), { STATE_SAMPLER(0), sampler }, WINED3D_GL_EXT_NONE }, { STATE_SAMPLER(1), { STATE_SAMPLER(1), sampler }, WINED3D_GL_EXT_NONE }, @@ -5387,7 +5381,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) {144, 144}, {149, 150}, {153, 153}, - {162, 164}, + {162, 165}, {168, 169}, {171, 171}, {174, 177},

1 0

Rémi Bernon : dinput/tests: Increase timeouts for waits not supposed to fail.
by Alexandre Julliard March 16, 2023

March 16, 2023

Module: wine Branch: master Commit: 659525268b5193347ffe98a039906388b61bdd8f URL: https://gitlab.winehq.org/wine/wine/-/commit/659525268b5193347ffe98a0399063… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Mar 15 19:58:19 2023 +0100 dinput/tests: Increase timeouts for waits not supposed to fail. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54594 --- dlls/dinput/tests/device8.c | 48 +++++++++++++++++++------------------- dlls/dinput/tests/force_feedback.c | 8 +++---- dlls/dinput/tests/joystick8.c | 26 ++++++++++----------- 3 files changed, 41 insertions(+), 41 deletions(-)

1 0

Rémi Bernon : dinput/tests: Test SaveActionMap effect on DIPROP_APPDATA property.
by Alexandre Julliard March 16, 2023

March 16, 2023

Module: wine Branch: master Commit: 2750d924db6db1523d9dd5ac2322bf09fa84e9df URL: https://gitlab.winehq.org/wine/wine/-/commit/2750d924db6db1523d9dd5ac2322bf… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Mar 16 13:26:06 2023 +0100 dinput/tests: Test SaveActionMap effect on DIPROP_APPDATA property. --- dlls/dinput/tests/joystick8.c | 66 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index a1720bb7b26..31f49b5b482 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -734,6 +734,14 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e .dwHow = DIPH_DEVICE, } }; + DIPROPPOINTER prop_pointer = + { + .diph = + { + .dwHeaderSize = sizeof(DIPROPHEADER), + .dwSize = sizeof(DIPROPPOINTER), + } + }; DIACTIONW actions[ARRAY_SIZE(expect_actions)]; DIACTIONFORMATW action_format; WCHAR username[256]; @@ -885,6 +893,14 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e ok( hr == DI_OK, "SetActionMap returned %#lx\n", hr ); + prop_pointer.diph.dwHow = DIPH_BYUSAGE; + prop_pointer.diph.dwObj = MAKELONG(HID_USAGE_GENERIC_X, HID_USAGE_PAGE_GENERIC); + hr = IDirectInputDevice8_GetProperty( device, DIPROP_APPDATA, &prop_pointer.diph ); + todo_wine + ok( hr == DI_OK, "GetProperty returned %#lx\n", hr ); + ok( prop_pointer.uData == 0, "got uData %#Ix\n", prop_pointer.uData ); + + /* saving action map actually does nothing */ action_format = action_format_2_filled; @@ -903,6 +919,34 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e check_diactionformatw_( __LINE__, &action_format, &expect_action_format_2_filled, actions_todos_2_filled ); + prop_pointer.diph.dwHow = DIPH_DEVICE; + prop_pointer.diph.dwObj = 0; + hr = IDirectInputDevice8_GetProperty( device, DIPROP_APPDATA, &prop_pointer.diph ); + ok( hr == DIERR_UNSUPPORTED, "GetProperty returned %#lx\n", hr ); + + prop_pointer.diph.dwHow = DIPH_BYID; + prop_pointer.diph.dwObj = DIDFT_ABSAXIS | DIDFT_MAKEINSTANCE( 3 ); + hr = IDirectInputDevice8_GetProperty( device, DIPROP_APPDATA, &prop_pointer.diph ); + todo_wine + ok( hr == DIERR_NOTFOUND, "GetProperty returned %#lx\n", hr ); + + prop_pointer.diph.dwHow = DIPH_BYID; + prop_pointer.diph.dwObj = DIDFT_ABSAXIS | DIDFT_MAKEINSTANCE( 2 ); + hr = IDirectInputDevice8_GetProperty( device, DIPROP_APPDATA, &prop_pointer.diph ); + todo_wine + ok( hr == DI_OK, "GetProperty returned %#lx\n", hr ); + todo_wine + ok( prop_pointer.uData == 6, "got uData %#Ix\n", prop_pointer.uData ); + + prop_pointer.diph.dwHow = DIPH_BYUSAGE; + prop_pointer.diph.dwObj = MAKELONG(HID_USAGE_GENERIC_X, HID_USAGE_PAGE_GENERIC); + hr = IDirectInputDevice8_GetProperty( device, DIPROP_APPDATA, &prop_pointer.diph ); + todo_wine + ok( hr == DI_OK, "GetProperty returned %#lx\n", hr ); + todo_wine + ok( prop_pointer.uData == 8, "got uData %#Ix\n", prop_pointer.uData ); + + action_format = action_format_2; action_format.rgoAction = actions; memcpy( actions, default_actions, sizeof(default_actions) ); @@ -925,6 +969,28 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e check_diactionformatw_( __LINE__, &action_format, &expect_action_format_2, actions_todos_2 ); + /* setting the data format resets action map */ + + prop_pointer.diph.dwHow = DIPH_BYUSAGE; + prop_pointer.diph.dwObj = MAKELONG(HID_USAGE_GENERIC_X, HID_USAGE_PAGE_GENERIC); + hr = IDirectInputDevice8_GetProperty( device, DIPROP_APPDATA, &prop_pointer.diph ); + todo_wine + ok( hr == DI_OK, "GetProperty returned %#lx\n", hr ); + todo_wine + ok( prop_pointer.uData == 8, "got uData %#Ix\n", prop_pointer.uData ); + + hr = IDirectInputDevice8_SetDataFormat( device, &c_dfDIJoystick2 ); + ok( hr == DI_OK, "SetDataFormat returned %#lx\n", hr ); + + prop_pointer.diph.dwHow = DIPH_BYUSAGE; + prop_pointer.diph.dwObj = MAKELONG(HID_USAGE_GENERIC_X, HID_USAGE_PAGE_GENERIC); + hr = IDirectInputDevice8_GetProperty( device, DIPROP_APPDATA, &prop_pointer.diph ); + todo_wine + ok( hr == DI_OK, "GetProperty returned %#lx\n", hr ); + todo_wine + ok( prop_pointer.uData == -1, "got uData %#Ix\n", prop_pointer.uData ); + + /* DIDSAM_NOUSER flag clears the device user property */ memset( prop_username.wsz, 0, sizeof(prop_username.wsz) );

1 0

Francois Gouget : dinput/tests: Skip the tests if acquiring the device fails.
by Alexandre Julliard March 16, 2023

March 16, 2023

Module: wine Branch: master Commit: 8f6ab16839cba42e8cd5b1cc4984a5e8d09d341c URL: https://gitlab.winehq.org/wine/wine/-/commit/8f6ab16839cba42e8cd5b1cc4984a5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 22 19:01:19 2023 +0100 dinput/tests: Skip the tests if acquiring the device fails. All the tests that follow would fail anyway, making it hard to filter them out to avoid false positives. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54558 --- dlls/dinput/tests/device8.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/dinput/tests/device8.c b/dlls/dinput/tests/device8.c index 1f29c9af519..b9a4ce61eb6 100644 --- a/dlls/dinput/tests/device8.c +++ b/dlls/dinput/tests/device8.c @@ -344,7 +344,8 @@ void test_overlapped_format( DWORD version ) hr = IDirectInputDevice_Acquire( keyboard ); - ok( hr == DI_OK, "Acquire returned %#lx\n", hr ); + ok( hr == DI_OK, "Acquire returned %#lx, skipping test_overlapped_format\n", hr ); + if (hr != DI_OK) goto cleanup; keybd_event( 0, DIK_F, KEYEVENTF_SCANCODE, 0 ); res = WaitForSingleObject( event, 100 ); @@ -405,7 +406,8 @@ void test_overlapped_format( DWORD version ) hr = IDirectInputDevice_Acquire( keyboard ); - ok( hr == DI_OK, "Acquire returned %#lx\n", hr ); + ok( hr == DI_OK, "Acquire returned %#lx, skipping test_overlapped_format\n", hr ); + if (hr != DI_OK) goto cleanup; keybd_event( 0, DIK_F, KEYEVENTF_SCANCODE, 0 ); res = WaitForSingleObject( event, 100 ); @@ -457,6 +459,7 @@ void test_overlapped_format( DWORD version ) ok( count == 1, "got count %lu\n", count ); +cleanup: IUnknown_Release( keyboard ); DestroyWindow( hwnd ); @@ -1969,7 +1972,8 @@ static void test_sys_mouse( DWORD version ) hr = IDirectInputDevice8_Unacquire( device ); ok( hr == DI_NOEFFECT, "Unacquire returned %#lx\n", hr ); hr = IDirectInputDevice8_Acquire( device ); - ok( hr == DI_OK, "Acquire returned %#lx\n", hr ); + ok( hr == DI_OK, "Acquire returned %#lx, skipping test_sys_mouse\n", hr ); + if (hr != DI_OK) goto cleanup; hr = IDirectInputDevice8_Acquire( device ); ok( hr == DI_NOEFFECT, "Acquire returned %#lx\n", hr ); @@ -1999,7 +2003,8 @@ static void test_sys_mouse( DWORD version ) ok( count == 1, "got count %lu\n", count ); hr = IDirectInputDevice8_Acquire( device ); - ok( hr == DI_OK, "Acquire returned %#lx\n", hr ); + ok( hr == DI_OK, "Acquire returned %#lx, skipping test_sys_mouse\n", hr ); + if (hr != DI_OK) goto cleanup; mouse_event( MOUSEEVENTF_MOVE, 10, 10, 0, 0 ); res = WaitForSingleObject( event, 100 ); @@ -2014,7 +2019,9 @@ static void test_sys_mouse( DWORD version ) ok( hr == DI_OK, "Unacquire returned %#lx\n", hr ); hr = IDirectInputDevice8_Acquire( device ); - ok( hr == DI_OK, "Acquire returned %#lx\n", hr ); + ok( hr == DI_OK, "Acquire returned %#lx, skipping test_sys_mouse\n", hr ); + if (hr != DI_OK) goto cleanup; + count = 1; hr = IDirectInputDevice8_GetDeviceData( device, sizeof(objdata), &objdata, &count, 0 ); ok( hr == (version < 0x800 ? DI_OK : DI_BUFFEROVERFLOW), "GetDeviceData returned %#lx\n", hr ); @@ -2065,6 +2072,7 @@ static void test_sys_mouse( DWORD version ) DestroyWindow( tmp_hwnd ); +cleanup: CloseHandle( event ); DestroyWindow( hwnd );

1 0