wine-commits March 2023

wine-commits@winehq.org

1 participants
910 discussions

Max Figura : wined3d: Move the WINED3D_RS_DEBUGMONITORTOKEN stub to wined3d_device_apply_stateblock.
by Alexandre Julliard 16 Mar '23

16 Mar '23

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

Max Figura : wined3d: Move the WINED3D_RS_PATCHSEGMENTS stub to wined3d_device_apply_stateblock.
by Alexandre Julliard 16 Mar '23

16 Mar '23

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_PATCHEDGESTYLE stub to wined3d_device_apply_stateblock.
by Alexandre Julliard 16 Mar '23

16 Mar '23

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_SOFTWAREVERTEXPROCESSING stub to wined3d_device_apply_stateblock.
by Alexandre Julliard 16 Mar '23

16 Mar '23

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

Rémi Bernon : dinput/tests: Increase timeouts for waits not supposed to fail.
by Alexandre Julliard 16 Mar '23

16 Mar '23

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: Remove BuildActionMap / SaveActionMap mouse and keyboard tests.
by Alexandre Julliard 16 Mar '23

16 Mar '23

Module: wine Branch: master Commit: 07753da93ce1f78c710f666e193a0434eb99699b URL: https://gitlab.winehq.org/wine/wine/-/commit/07753da93ce1f78c710f666e193a04… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Mar 15 21:04:01 2023 +0100 dinput/tests: Remove BuildActionMap / SaveActionMap mouse and keyboard tests. --- dlls/dinput/tests/device8.c | 517 -------------------------------------------- 1 file changed, 517 deletions(-)

1 0

Rémi Bernon : dinput/tests: Test SaveActionMap effect on HID joystick input.
by Alexandre Julliard 16 Mar '23

16 Mar '23

Module: wine Branch: master Commit: ed3f06b11afada68e0d389e866d45cbd3b708c40 URL: https://gitlab.winehq.org/wine/wine/-/commit/ed3f06b11afada68e0d389e866d45c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Mar 16 16:36:38 2023 +0100 dinput/tests: Test SaveActionMap effect on HID joystick input. --- dlls/dinput/tests/joystick8.c | 132 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 131 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index 8de3d743e57..587a4aec4ac 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -570,6 +570,53 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e .tszActionMap = L"Action Map Filled", .dwCRC = 0x3d98f717, }; + struct hid_expect injected_input[] = + { + { + .code = IOCTL_HID_READ_REPORT, + .report_buf = {1,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0}, + }, + { + .code = IOCTL_HID_READ_REPORT, + .report_buf = {1,0x10,0x10,0x38,0x38,0x10,0x10,0x10,0xf8}, + }, + { + .code = IOCTL_HID_READ_REPORT, + .report_buf = {1,0x10,0x10,0x01,0x01,0x10,0x10,0x10,0x00}, + }, + { + .code = IOCTL_HID_READ_REPORT, + .report_buf = {1,0x10,0x10,0x01,0x01,0x10,0x10,0x10,0x00}, + }, + { + .code = IOCTL_HID_READ_REPORT, + .report_buf = {1,0x10,0x10,0x80,0x80,0x10,0x10,0x10,0xff}, + }, + { + .code = IOCTL_HID_READ_REPORT, + .report_buf = {1,0x10,0x10,0x10,0xee,0x10,0x10,0x10,0x54}, + }, + }; + const DWORD expect_state[ARRAY_SIZE(injected_input)][ARRAY_SIZE(expect_actions)] = + { + { 0, 0, 0, -1, 0, 0, 0, 0}, + { 0, 0, 0, -1, 0, 0, 0, 0}, + {+128, 0, 0, +31500, 0, 0, 0, +128}, + { 0, 0, 0, -1, 0, 0, 0, -43}, + { 0, 0, 0, -1, 0, 0, 0, -43}, + {+128, 0, 0, -1, 0, 0, 0, -128}, + }; + const DIDEVICEOBJECTDATA expect_objdata[8] = + { + {.dwOfs = 0x1c, .dwData = +128, .uAppData = 8}, + {.dwOfs = 0xc, .dwData = +31500, .uAppData = 4}, + {.dwOfs = 0, .dwData = +128, .uAppData = 1}, + {.dwOfs = 0x1c, .dwData = -43, .uAppData = 8}, + {.dwOfs = 0xc, .dwData = -1, .uAppData = 4}, + {.dwOfs = 0, .dwData = 0, .uAppData = 1}, + {.dwOfs = 0x1c, .dwData = -128, .uAppData = 8}, + {.dwOfs = 0, .dwData = +128, .uAppData = 1}, + }; DIACTIONW voice_actions[] = { {.dwSemantic = DIVOICE_CHANNEL1}, @@ -760,10 +807,12 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e .dwSize = sizeof(DIPROPPOINTER), } }; + DIDEVICEOBJECTDATA objdata[ARRAY_SIZE(expect_objdata)]; DIACTIONW actions[ARRAY_SIZE(expect_actions)]; + DWORD state[ARRAY_SIZE(expect_actions)]; DIACTIONFORMATW action_format; WCHAR username[256]; - DWORD res, flags; + DWORD i, res, flags; HRESULT hr; res = ARRAY_SIZE(username); @@ -1028,6 +1077,87 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e check_diactionformatw_( __LINE__, &action_format, &expect_action_format_2, actions_todos_2 ); + hr = IDirectInputDevice8_Acquire( device ); + todo_wine + ok( hr == DI_OK, "Acquire returned: %#lx\n", hr ); + if (hr != DI_OK) goto skip_input; + + hr = IDirectInputDevice8_SetActionMap( device, &action_format, L"username", DIDSAM_DEFAULT ); + ok( hr == DIERR_ACQUIRED, "SetActionMap returned %#lx\n", hr ); + + send_hid_input( file, &injected_input[0], sizeof(*injected_input) ); + res = WaitForSingleObject( event, 100 ); + if (res == WAIT_TIMEOUT) /* Acquire is asynchronous */ + { + send_hid_input( file, &injected_input[0], sizeof(*injected_input) ); + res = WaitForSingleObject( event, 100 ); + } + todo_wine + ok( res == WAIT_OBJECT_0, "WaitForSingleObject failed\n" ); + + for (i = 0; i < ARRAY_SIZE(injected_input); ++i) + { + winetest_push_context( "state[%ld]", i ); + + hr = IDirectInputDevice8_GetDeviceState( device, sizeof(state), state ); + todo_wine + ok( hr == DI_OK, "GetDeviceState returned: %#lx\n", hr ); + todo_wine_if( expect_state[i][0] ) + ok( state[0] == expect_state[i][0], "got state[0] %+ld\n", state[0] ); + todo_wine_if( expect_state[i][1] ) + ok( state[1] == expect_state[i][1], "got state[1] %+ld\n", state[1] ); + todo_wine_if( expect_state[i][2] ) + ok( state[2] == expect_state[i][2], "got state[2] %+ld\n", state[2] ); + todo_wine_if( expect_state[i][3] ) + ok( state[3] == expect_state[i][3], "got state[3] %+ld\n", state[3] ); + todo_wine_if( expect_state[i][4] ) + ok( state[4] == expect_state[i][4], "got state[4] %+ld\n", state[4] ); + todo_wine_if( expect_state[i][5] ) + ok( state[5] == expect_state[i][5], "got state[5] %+ld\n", state[5] ); + todo_wine_if( expect_state[i][6] ) + ok( state[6] == expect_state[i][6], "got state[6] %+ld\n", state[6] ); + todo_wine_if( expect_state[i][7] ) + ok( state[7] == expect_state[i][7] || + broken(state[7] == -45 && expect_state[i][7] == -43) /* 32-bit rounding */, + "got state[7] %+ld\n", state[7] ); + + send_hid_input( file, &injected_input[i], sizeof(*injected_input) ); + + res = WaitForSingleObject( event, 100 ); + if (i == 0 || i == 3) ok( res == WAIT_TIMEOUT, "WaitForSingleObject succeeded\n" ); + else todo_wine ok( res == WAIT_OBJECT_0, "WaitForSingleObject failed\n" ); + ResetEvent( event ); + winetest_pop_context(); + } + + res = ARRAY_SIZE(objdata); + hr = IDirectInputDevice8_GetDeviceData( device, sizeof(*objdata), objdata, &res, DIGDD_PEEK ); + todo_wine + ok( hr == DI_BUFFEROVERFLOW, "GetDeviceData returned %#lx\n", hr ); + ok( res == 8, "got %lu expected %u\n", res, 8 ); + while (res--) + { + winetest_push_context( "%lu", res ); + todo_wine_if( expect_objdata[res].dwOfs ) + check_member( objdata[res], expect_objdata[res], "%#lx", dwOfs ); + todo_wine_if( expect_objdata[res].dwData ) + ok( objdata[res].dwData == expect_objdata[res].dwData || + broken(objdata[res].dwData == -45 && expect_objdata[res].dwData == -43) /* 32-bit rounding */, + "got dwData %+ld\n", objdata[res].dwData ); + todo_wine + check_member( objdata[res], expect_objdata[res], "%#Ix", uAppData ); + winetest_pop_context(); + } + +skip_input: + hr = IDirectInputDevice8_BuildActionMap( device, &action_format, L"username", DIDBAM_DEFAULT ); + ok( hr == DI_OK, "BuildActionMap returned %#lx\n", hr ); + + hr = IDirectInputDevice8_Unacquire( device ); + todo_wine + ok( hr == DI_OK, "Acquire returned: %#lx\n", hr ); + + /* setting the data format resets action map */ prop_pointer.diph.dwHow = DIPH_BYUSAGE;

1 0

Rémi Bernon : dinput/tests: Test SaveActionMap effect on DIPROP_RANGE property.
by Alexandre Julliard 16 Mar '23

16 Mar '23

Module: wine Branch: master Commit: e7b3e3514c6a12388d7772479777d16a3309575b URL: https://gitlab.winehq.org/wine/wine/-/commit/e7b3e3514c6a12388d7772479777d1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Mar 16 14:06:52 2023 +0100 dinput/tests: Test SaveActionMap effect on DIPROP_RANGE property. --- dlls/dinput/tests/joystick8.c | 55 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index dd59f388efb..8de3d743e57 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -725,6 +725,15 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e {.objid = TRUE}, {.objid = TRUE, .how = TRUE}, }; + DIPROPRANGE prop_range = + { + .diph = + { + .dwHeaderSize = sizeof(DIPROPHEADER), + .dwSize = sizeof(DIPROPRANGE), + .dwHow = DIPH_DEVICE, + } + }; DIPROPDWORD prop_dword = { .diph = @@ -909,6 +918,24 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e ok( hr == DI_OK, "GetProperty returned %#lx\n", hr ); ok( prop_pointer.uData == 0, "got uData %#Ix\n", prop_pointer.uData ); + prop_range.diph.dwHow = DIPH_BYID; + prop_range.diph.dwObj = DIDFT_ABSAXIS | DIDFT_MAKEINSTANCE( 2 ); + hr = IDirectInputDevice8_GetProperty( device, DIPROP_RANGE, &prop_range.diph ); + ok( hr == DI_OK, "GetProperty returned %#lx\n", hr ); + todo_wine + ok( prop_range.lMin == +1000, "got lMin %+ld\n", prop_range.lMin ); + todo_wine + ok( prop_range.lMax == +51000, "got lMax %+ld\n", prop_range.lMax ); + + prop_range.diph.dwHow = DIPH_BYUSAGE; + prop_range.diph.dwObj = MAKELONG(HID_USAGE_GENERIC_X, HID_USAGE_PAGE_GENERIC); + hr = IDirectInputDevice8_GetProperty( device, DIPROP_RANGE, &prop_range.diph ); + ok( hr == DI_OK, "GetProperty returned %#lx\n", hr ); + todo_wine + ok( prop_range.lMin == -14000, "got lMin %+ld\n", prop_range.lMin ); + todo_wine + ok( prop_range.lMax == -4000, "got lMax %+ld\n", prop_range.lMax ); + hr = IDirectInputDevice8_GetProperty( device, DIPROP_BUFFERSIZE, &prop_dword.diph ); ok( hr == DI_OK, "GetProperty returned %#lx\n", hr ); todo_wine @@ -960,6 +987,20 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e todo_wine ok( prop_pointer.uData == 8, "got uData %#Ix\n", prop_pointer.uData ); + prop_range.diph.dwHow = DIPH_BYID; + prop_range.diph.dwObj = DIDFT_ABSAXIS | DIDFT_MAKEINSTANCE( 2 ); + hr = IDirectInputDevice8_GetProperty( device, DIPROP_RANGE, &prop_range.diph ); + ok( hr == DI_OK, "GetProperty returned %#lx\n", hr ); + ok( prop_range.lMin == -128, "got lMin %+ld\n", prop_range.lMin ); + ok( prop_range.lMax == +128, "got lMax %+ld\n", prop_range.lMax ); + + prop_range.diph.dwHow = DIPH_BYUSAGE; + prop_range.diph.dwObj = MAKELONG(HID_USAGE_GENERIC_X, HID_USAGE_PAGE_GENERIC); + hr = IDirectInputDevice8_GetProperty( device, DIPROP_RANGE, &prop_range.diph ); + ok( hr == DI_OK, "GetProperty returned %#lx\n", hr ); + ok( prop_range.lMin == -128, "got lMin %+ld\n", prop_range.lMin ); + ok( prop_range.lMax == +128, "got lMax %+ld\n", prop_range.lMax ); + hr = IDirectInputDevice8_GetProperty( device, DIPROP_BUFFERSIZE, &prop_dword.diph ); ok( hr == DI_OK, "GetProperty returned %#lx\n", hr ); ok( prop_dword.dwData == 32, "got dwData %#lx\n", prop_dword.dwData ); @@ -1008,6 +1049,20 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e todo_wine ok( prop_pointer.uData == -1, "got uData %#Ix\n", prop_pointer.uData ); + prop_range.diph.dwHow = DIPH_BYID; + prop_range.diph.dwObj = DIDFT_ABSAXIS | DIDFT_MAKEINSTANCE( 2 ); + hr = IDirectInputDevice8_GetProperty( device, DIPROP_RANGE, &prop_range.diph ); + ok( hr == DI_OK, "GetProperty returned %#lx\n", hr ); + ok( prop_range.lMin == -128, "got lMin %+ld\n", prop_range.lMin ); + ok( prop_range.lMax == +128, "got lMax %+ld\n", prop_range.lMax ); + + prop_range.diph.dwHow = DIPH_BYUSAGE; + prop_range.diph.dwObj = MAKELONG(HID_USAGE_GENERIC_X, HID_USAGE_PAGE_GENERIC); + hr = IDirectInputDevice8_GetProperty( device, DIPROP_RANGE, &prop_range.diph ); + ok( hr == DI_OK, "GetProperty returned %#lx\n", hr ); + ok( prop_range.lMin == -128, "got lMin %+ld\n", prop_range.lMin ); + ok( prop_range.lMax == +128, "got lMax %+ld\n", prop_range.lMax ); + hr = IDirectInputDevice8_GetProperty( device, DIPROP_BUFFERSIZE, &prop_dword.diph ); ok( hr == DI_OK, "GetProperty returned %#lx\n", hr ); ok( prop_dword.dwData == 32, "got dwData %#lx\n", prop_dword.dwData );

1 0

Rémi Bernon : dinput/tests: Test SaveActionMap effect on DIPROP_BUFFERSIZE property.
by Alexandre Julliard 16 Mar '23

16 Mar '23

Module: wine Branch: master Commit: 4edea8a93ae14820c85f2201907b25ff74d5b936 URL: https://gitlab.winehq.org/wine/wine/-/commit/4edea8a93ae14820c85f2201907b25… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Mar 16 14:04:50 2023 +0100 dinput/tests: Test SaveActionMap effect on DIPROP_BUFFERSIZE property. --- dlls/dinput/tests/joystick8.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index 31f49b5b482..dd59f388efb 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -725,6 +725,15 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e {.objid = TRUE}, {.objid = TRUE, .how = TRUE}, }; + DIPROPDWORD prop_dword = + { + .diph = + { + .dwHeaderSize = sizeof(DIPROPHEADER), + .dwSize = sizeof(DIPROPDWORD), + .dwHow = DIPH_DEVICE, + } + }; DIPROPSTRING prop_username = { .diph = @@ -900,6 +909,11 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e ok( hr == DI_OK, "GetProperty returned %#lx\n", hr ); ok( prop_pointer.uData == 0, "got uData %#Ix\n", prop_pointer.uData ); + hr = IDirectInputDevice8_GetProperty( device, DIPROP_BUFFERSIZE, &prop_dword.diph ); + ok( hr == DI_OK, "GetProperty returned %#lx\n", hr ); + todo_wine + ok( prop_dword.dwData == 0, "got dwData %#lx\n", prop_dword.dwData ); + /* saving action map actually does nothing */ @@ -946,6 +960,10 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e todo_wine ok( prop_pointer.uData == 8, "got uData %#Ix\n", prop_pointer.uData ); + hr = IDirectInputDevice8_GetProperty( device, DIPROP_BUFFERSIZE, &prop_dword.diph ); + ok( hr == DI_OK, "GetProperty returned %#lx\n", hr ); + ok( prop_dword.dwData == 32, "got dwData %#lx\n", prop_dword.dwData ); + action_format = action_format_2; action_format.rgoAction = actions; @@ -990,6 +1008,10 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e todo_wine ok( prop_pointer.uData == -1, "got uData %#Ix\n", prop_pointer.uData ); + hr = IDirectInputDevice8_GetProperty( device, DIPROP_BUFFERSIZE, &prop_dword.diph ); + ok( hr == DI_OK, "GetProperty returned %#lx\n", hr ); + ok( prop_dword.dwData == 32, "got dwData %#lx\n", prop_dword.dwData ); + /* DIDSAM_NOUSER flag clears the device user property */

1 0

Rémi Bernon : dinput/tests: Test SaveActionMap effect on DIPROP_APPDATA property.
by Alexandre Julliard 16 Mar '23

16 Mar '23

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

← Newer
1
...
50
51
52
53
54
55
56
...
91
Older →

Jump to page:

2025

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-commits March 2023