March 2023 - Wine-commits - list.winehq.org

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

16 Mar '23

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

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 16 Mar '23

16 Mar '23

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

Rémi Bernon : widl: Introduce new (open|close)_input_file helpers.
by Alexandre Julliard 16 Mar '23

16 Mar '23

Module: wine Branch: master Commit: 39da05201273a72f72a2ac9d011b84685869225d URL: https://gitlab.winehq.org/wine/wine/-/commit/39da05201273a72f72a2ac9d011b84… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Mar 15 09:48:20 2023 +0100 widl: Introduce new (open|close)_input_file helpers. --- tools/widl/parser.h | 3 ++- tools/widl/parser.l | 51 +++++++++++---------------------------------------- tools/widl/widl.c | 27 +++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 41 deletions(-) diff --git a/tools/widl/parser.h b/tools/widl/parser.h index abe215de02f..81418fca160 100644 --- a/tools/widl/parser.h +++ b/tools/widl/parser.h @@ -37,6 +37,7 @@ int is_type(const char *name); int do_warning(const char *toggle, warning_list_t *wnum); int is_warning_enabled(int warning); -extern char *temp_name; +extern char *find_input_file( const char *name, const char *parent ); +extern FILE *open_input_file( const char *path ); #endif diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 89383fe810e..92955516e9e 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -524,6 +524,7 @@ void pop_import(void) if (yyin) fclose( yyin ); yy_delete_buffer( YY_CURRENT_BUFFER ); yy_switch_to_buffer( state->buffer ); + free( input_name ); input_name = state->input_name; line_number = state->line_number; free( state ); @@ -532,10 +533,8 @@ void pop_import(void) void push_import( char *import_name ) { struct import_state *state; - FILE *f; - char *path, *name; struct import *import; - int ret; + FILE *file; state = xmalloc( sizeof(struct import_state )); list_add_head( &import_stack, &state->entry ); @@ -556,55 +555,27 @@ void push_import( char *import_name ) import->name = xstrdup( import_name ); list_add_tail( &imports, &import->entry ); - /* don't search for a file name with a path in the include directories, - * for compatibility with MIDL */ - if (strchr( import_name, '/' ) || strchr( import_name, '\\' )) - path = xstrdup( import_name ); - else if (!(path = wpp_find_include( import_name, input_name ))) - error_loc( "Unable to open include file %s\n", import_name ); - - input_name = path; + input_name = find_input_file( import_name, input_name ); + file = open_input_file( input_name ); line_number = 1; - name = make_temp_file( "widl-pp", NULL ); - if (!(f = fopen(name, "wt"))) - error("Could not open fd %s for writing\n", name); - - ret = wpp_parse( path, f ); - fclose( f ); - if (ret) exit(1); - - if((f = fopen(name, "r")) == NULL) - error_loc("Unable to open %s\n", name); - - yy_switch_to_buffer(yy_create_buffer(f, YY_BUF_SIZE)); + yy_switch_to_buffer( yy_create_buffer( file, YY_BUF_SIZE ) ); } static void switch_to_acf(void) { - char *name; - int ret; - FILE *f; + FILE *file; if (yyin) fclose( yyin ); yy_delete_buffer( YY_CURRENT_BUFFER ); + free( input_name ); - input_name = acf_name; - acf_name = NULL; + input_name = xstrdup( acf_name ); + file = open_input_file( input_name ); line_number = 1; + acf_name = NULL; - name = make_temp_file( "widl-acf", NULL ); - if (!(f = fopen(name, "wt"))) - error("Could not open fd %s for writing\n", name); - - ret = wpp_parse(input_name, f); - fclose(f); - if (ret) exit(1); - - if((f = fopen(name, "r")) == NULL) - error_loc("Unable to open %s\n", name); - - yy_switch_to_buffer(yy_create_buffer(f, YY_BUF_SIZE)); + yy_switch_to_buffer( yy_create_buffer( file, YY_BUF_SIZE ) ); } static void warning_disable(int warning) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 7ed3bfd1f8c..7c83b4b3ac0 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -893,3 +893,30 @@ static void rm_tempfile(void) unlink(typelib_name); remove_temp_files(); } + +char *find_input_file( const char *name, const char *parent ) +{ + char *path; + + /* don't search for a file name with a path in the include directories, for compatibility with MIDL */ + if (strchr( name, '/' ) || strchr( name, '\\' )) path = xstrdup( name ); + else if (!(path = wpp_find_include( name, parent ))) error_loc( "Unable to open include file %s\n", name ); + + return path; +} + +FILE *open_input_file( const char *path ) +{ + FILE *file; + char *name; + int ret; + + name = make_temp_file( "widl", NULL ); + if (!(file = fopen( name, "wt" ))) error_loc( "Could not open %s for writing\n", name ); + ret = wpp_parse( path, file ); + fclose( file ); + if (ret) exit( 1 ); + + if (!(file = fopen( name, "r" ))) error_loc( "Unable to open %s\n", name ); + return file; +}

1 0

Rémi Bernon : widl: Respect -N flag for imported files preprocessing.
by Alexandre Julliard 16 Mar '23

16 Mar '23

Module: wine Branch: master Commit: 1a0a61785058b63ad46617d21e6a0a530b003618 URL: https://gitlab.winehq.org/wine/wine/-/commit/1a0a61785058b63ad46617d21e6a0a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 25 23:23:45 2023 +0100 widl: Respect -N flag for imported files preprocessing. --- tools/widl/widl.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 7c83b4b3ac0..513fbe507f7 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -911,6 +911,12 @@ FILE *open_input_file( const char *path ) char *name; int ret; + if (no_preprocess) + { + if (!(file = fopen( path, "r" ))) error_loc( "Unable to open %s\n", path ); + return file; + } + name = make_temp_file( "widl", NULL ); if (!(file = fopen( name, "wt" ))) error_loc( "Could not open %s for writing\n", name ); ret = wpp_parse( path, file );

1 0

Rémi Bernon : widl: Use open_input_file to open the main input.
by Alexandre Julliard 16 Mar '23

16 Mar '23

Module: wine Branch: master Commit: 7ebf75f92d3a2a198e3144fca5a08ff305d7dac6 URL: https://gitlab.winehq.org/wine/wine/-/commit/7ebf75f92d3a2a198e3144fca5a08f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 24 22:19:45 2023 +0100 widl: Use open_input_file to open the main input. --- tools/widl/widl.c | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 513fbe507f7..2cb1b59ac45 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -701,7 +701,6 @@ int main(int argc,char *argv[]) int i; int ret = 0; struct strarray files; - char *input; init_signals( exit_on_signal ); init_argv0_dir( argv[0] ); @@ -835,27 +834,8 @@ int main(int argc,char *argv[]) wpp_add_cmdline_define("_WIN32=1"); atexit(rm_tempfile); - input = input_name; if (preprocess_only) exit( wpp_parse( input_name, stdout ) ); - - if (!no_preprocess) - { - FILE *output; - char *name; - - name = make_temp_file( header_name, NULL ); - if (!(output = fopen( name, "wt" ))) error( "Could not open fd %s for writing\n", name ); - ret = wpp_parse( input_name, output ); - fclose( output ); - input = name; - - if (ret) exit( 1 ); - } - - if(!(parser_in = fopen(input, "r"))) { - fprintf(stderr, "Could not open %s for input\n", input); - return 1; - } + parser_in = open_input_file( input_name ); header_token = make_token(header_name);

1 0

Rémi Bernon : imm32/tests: Use LANG_INVARIANT for the installed IME.
by Alexandre Julliard 16 Mar '23

16 Mar '23

Module: wine Branch: master Commit: 7f5007f19737449a147d7c4ae356a515df264854 URL: https://gitlab.winehq.org/wine/wine/-/commit/7f5007f19737449a147d7c4ae356a5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Mar 16 11:25:34 2023 +0100 imm32/tests: Use LANG_INVARIANT for the installed IME. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54669 --- dlls/imm32/tests/ime_wrapper.rc | 2 +- dlls/imm32/tests/imm32.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/imm32/tests/ime_wrapper.rc b/dlls/imm32/tests/ime_wrapper.rc index 6844b62195b..812754ce4ce 100644 --- a/dlls/imm32/tests/ime_wrapper.rc +++ b/dlls/imm32/tests/ime_wrapper.rc @@ -18,7 +18,7 @@ #pragma makedep testdll -#define WINE_LANGID 0400 +#define WINE_LANGID 047f #define WINE_FILETYPE VFT_DRV #define WINE_FILESUBTYPE VFT2_DRV_INPUTMETHOD #define WINE_FILENAME "ime_wrapper" diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 7c376287993..3d12043b0c4 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -2683,7 +2683,7 @@ static HKL ime_install(void) hkl = ImmInstallIMEW( ime_path, L"WineTest IME" ); todo_wine - ok( hkl == (HKL)(int)0xe0200400, "ImmInstallIMEW returned %p, error %lu\n", hkl, GetLastError() ); + ok( hkl == (HKL)(int)0xe020047f, "ImmInstallIMEW returned %p, error %lu\n", hkl, GetLastError() ); swprintf( buffer, ARRAY_SIZE(buffer), L"System\\CurrentControlSet\\Control\\Keyboard Layouts\\%08x", hkl ); ret = RegOpenKeyW( HKEY_LOCAL_MACHINE, buffer, &hkey );

1 0

Rémi Bernon : imm32/tests: Test ImmIsIME with the installed IME.
by Alexandre Julliard 16 Mar '23

16 Mar '23

Module: wine Branch: master Commit: bb8bcf492c80dcd24cd0469d6da01a4837eeaa29 URL: https://gitlab.winehq.org/wine/wine/-/commit/bb8bcf492c80dcd24cd0469d6da01a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Mar 9 22:46:00 2023 +0100 imm32/tests: Test ImmIsIME with the installed IME. --- dlls/imm32/tests/imm32.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 3d12043b0c4..31b02d7ca1b 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -35,6 +35,28 @@ #include "ime_test.h" +static const char *debugstr_ok( const char *cond ) +{ + int c, n = 0; + /* skip possible casts */ + while ((c = *cond++)) + { + if (c == '(') n++; + if (!n) break; + if (c == ')') n--; + } + if (!strchr( cond - 1, '(' )) return wine_dbg_sprintf( "got %s", cond - 1 ); + return wine_dbg_sprintf( "%.*s returned", (int)strcspn( cond - 1, "( " ), cond - 1 ); +} + +#define ok_eq( e, r, t, f, ... ) \ + do \ + { \ + t v = (r); \ + ok( v == (e), "%s " f "\n", debugstr_ok( #r ), v, ##__VA_ARGS__ ); \ + } while (0) +#define ok_ret( e, r ) ok_eq( e, r, UINT_PTR, "%Iu, error %ld", GetLastError() ) + BOOL WINAPI ImmSetActiveContext(HWND, HIMC, BOOL); static BOOL (WINAPI *pImmAssociateContextEx)(HWND,HIMC,DWORD); @@ -2433,9 +2455,13 @@ static void test_ImmDisableIME(void) #define ime_trace( msg, ... ) if (winetest_debug > 1) trace( "%04lx:%s " msg, GetCurrentThreadId(), __func__, ## __VA_ARGS__ ) +static BOOL todo_ImeInquire; DEFINE_EXPECT( ImeInquire ); +static BOOL todo_ImeDestroy; DEFINE_EXPECT( ImeDestroy ); +static BOOL todo_IME_DLL_PROCESS_ATTACH; DEFINE_EXPECT( IME_DLL_PROCESS_ATTACH ); +static BOOL todo_IME_DLL_PROCESS_DETACH; DEFINE_EXPECT( IME_DLL_PROCESS_DETACH ); static IMEINFO ime_info; @@ -2476,6 +2502,7 @@ static BOOL WINAPI ime_ImeDestroy( UINT force ) { ime_trace( "force %u\n", force ); + todo_wine_if( todo_ImeDestroy ) CHECK_EXPECT( ImeDestroy ); ok( !force, "got force %u\n", force ); @@ -2519,6 +2546,7 @@ static BOOL WINAPI ime_ImeInquire( IMEINFO *info, WCHAR *ui_class, DWORD flags ) { ime_trace( "info %p, ui_class %p, flags %#lx\n", info, ui_class, flags ); + todo_wine_if( todo_ImeInquire ) CHECK_EXPECT( ImeInquire ); ok( !!info, "got info %p\n", info ); @@ -2606,11 +2634,13 @@ static BOOL WINAPI ime_DllMain( HINSTANCE instance, DWORD reason, LPVOID reserve DisableThreadLibraryCalls( instance ); ime_ui_class.hInstance = instance; RegisterClassExW( &ime_ui_class ); + todo_wine_if(todo_IME_DLL_PROCESS_ATTACH) CHECK_EXPECT( IME_DLL_PROCESS_ATTACH ); break; case DLL_PROCESS_DETACH: UnregisterClassW( ime_ui_class.lpszClassName, instance ); + todo_wine_if(todo_IME_DLL_PROCESS_DETACH) CHECK_EXPECT( IME_DLL_PROCESS_DETACH ); break; } @@ -2829,6 +2859,45 @@ cleanup: SET_ENABLE( IME_DLL_PROCESS_DETACH, FALSE ); } +static void test_ImmIsIME(void) +{ + HKL hkl = GetKeyboardLayout( 0 ); + + SET_ENABLE( IME_DLL_PROCESS_ATTACH, TRUE ); + SET_ENABLE( ImeInquire, TRUE ); + SET_ENABLE( ImeDestroy, TRUE ); + SET_ENABLE( IME_DLL_PROCESS_DETACH, TRUE ); + + SetLastError( 0xdeadbeef ); + todo_wine + ok_ret( 0, ImmIsIME( 0 ) ); + ok_ret( 0xdeadbeef, GetLastError() ); + ok_ret( 1, ImmIsIME( hkl ) ); + + /* IME_PROP_END_UNLOAD for the IME to unload / reload. */ + ime_info.fdwProperty = IME_PROP_END_UNLOAD; + + if (!(hkl = ime_install())) goto cleanup; + + todo_ImeInquire = TRUE; + todo_ImeDestroy = TRUE; + todo_IME_DLL_PROCESS_ATTACH = TRUE; + todo_IME_DLL_PROCESS_DETACH = TRUE; + ok_ret( 1, ImmIsIME( hkl ) ); + todo_IME_DLL_PROCESS_ATTACH = FALSE; + todo_IME_DLL_PROCESS_DETACH = FALSE; + todo_ImeInquire = FALSE; + todo_ImeDestroy = FALSE; + + ime_cleanup( hkl ); + +cleanup: + SET_ENABLE( IME_DLL_PROCESS_ATTACH, FALSE ); + SET_ENABLE( ImeInquire, FALSE ); + SET_ENABLE( ImeDestroy, FALSE ); + SET_ENABLE( IME_DLL_PROCESS_DETACH, FALSE ); +} + static void test_ImmGetDescription(void) { HKL hkl = GetKeyboardLayout( 0 ); @@ -2996,6 +3065,7 @@ START_TEST(imm32) test_ImmInstallIME(); test_ImmGetDescription(); test_ImmGetIMEFileName(); + test_ImmIsIME(); if (init()) {

1 0

Rémi Bernon : imm32/tests: Test ImmGetProperty with the installed IME.
by Alexandre Julliard 16 Mar '23

16 Mar '23

Module: wine Branch: master Commit: 08a6d7687aaaedcde3fb7c3c1c32910ea651a627 URL: https://gitlab.winehq.org/wine/wine/-/commit/08a6d7687aaaedcde3fb7c3c1c3291… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Mar 9 22:46:00 2023 +0100 imm32/tests: Test ImmGetProperty with the installed IME. --- dlls/imm32/tests/imm32.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 31b02d7ca1b..d3eec2ab580 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -2898,6 +2898,98 @@ cleanup: SET_ENABLE( IME_DLL_PROCESS_DETACH, FALSE ); } +static void test_ImmGetProperty(void) +{ + static const IMEINFO expect_ime_info = + { + .fdwProperty = IME_PROP_UNICODE | IME_PROP_AT_CARET, + }; + static const IMEINFO expect_ime_info_0411 = /* MS Japanese IME */ + { + .fdwProperty = IME_PROP_COMPLETE_ON_UNSELECT | IME_PROP_CANDLIST_START_FROM_1 | IME_PROP_UNICODE | IME_PROP_AT_CARET | 0xa, + .fdwConversionCaps = IME_CMODE_NATIVE | IME_CMODE_FULLSHAPE | IME_CMODE_KATAKANA, + .fdwSentenceCaps = IME_SMODE_PLAURALCLAUSE | IME_SMODE_CONVERSATION, + .fdwSCSCaps = SCS_CAP_COMPSTR | SCS_CAP_SETRECONVERTSTRING | SCS_CAP_MAKEREAD, + .fdwSelectCaps = SELECT_CAP_CONVERSION | SELECT_CAP_SENTENCE, + .fdwUICaps = UI_CAP_ROT90, + }; + static const IMEINFO expect_ime_info_0412 = /* MS Korean IME */ + { + .fdwProperty = IME_PROP_CANDLIST_START_FROM_1 | IME_PROP_UNICODE | IME_PROP_AT_CARET | 0xa, + .fdwConversionCaps = IME_CMODE_NATIVE | IME_CMODE_FULLSHAPE, + .fdwSentenceCaps = IME_SMODE_NONE, + .fdwSCSCaps = SCS_CAP_COMPSTR | SCS_CAP_SETRECONVERTSTRING, + .fdwSelectCaps = SELECT_CAP_CONVERSION, + .fdwUICaps = UI_CAP_ROT90, + }; + static const IMEINFO expect_ime_info_0804 = /* MS Chinese IME */ + { + .fdwProperty = IME_PROP_CANDLIST_START_FROM_1 | IME_PROP_UNICODE | IME_PROP_AT_CARET | 0xa, + .fdwConversionCaps = IME_CMODE_NATIVE | IME_CMODE_FULLSHAPE, + .fdwSentenceCaps = IME_SMODE_PLAURALCLAUSE, + .fdwSCSCaps = SCS_CAP_COMPSTR | SCS_CAP_SETRECONVERTSTRING | SCS_CAP_MAKEREAD, + .fdwUICaps = UI_CAP_ROT90, + }; + HKL hkl = GetKeyboardLayout( 0 ); + const IMEINFO *expect; + + SET_ENABLE( ImeInquire, TRUE ); + SET_ENABLE( ImeDestroy, TRUE ); + + SetLastError( 0xdeadbeef ); + ok_ret( 0, ImmGetProperty( 0, 0 ) ); + ok_ret( 0, ImmGetProperty( hkl, 0 ) ); + + if (hkl == (HKL)0x04110411) expect = &expect_ime_info_0411; + else if (hkl == (HKL)0x04120412) expect = &expect_ime_info_0412; + else if (hkl == (HKL)0x08040804) expect = &expect_ime_info_0804; + else expect = &expect_ime_info; + + ok_ret( expect->fdwProperty, ImmGetProperty( hkl, IGP_PROPERTY ) ); + todo_wine + ok_ret( expect->fdwConversionCaps, ImmGetProperty( hkl, IGP_CONVERSION ) ); + todo_wine + ok_ret( expect->fdwSentenceCaps, ImmGetProperty( hkl, IGP_SENTENCE ) ); + ok_ret( expect->fdwSCSCaps, ImmGetProperty( hkl, IGP_SETCOMPSTR ) ); + todo_wine + ok_ret( expect->fdwSelectCaps, ImmGetProperty( hkl, IGP_SELECT ) ); + ok_ret( IMEVER_0400, ImmGetProperty( hkl, IGP_GETIMEVERSION ) ); + ok_ret( expect->fdwUICaps, ImmGetProperty( hkl, IGP_UI ) ); + ok_ret( 0xdeadbeef, GetLastError() ); + + /* IME_PROP_END_UNLOAD for the IME to unload / reload. */ + ime_info.fdwProperty = IME_PROP_END_UNLOAD; + + if (!(hkl = ime_install())) goto cleanup; + + SET_EXPECT( ImeInquire ); + SET_EXPECT( ImeDestroy ); + ok_ret( 0, ImmGetProperty( hkl, 0 ) ); + CHECK_CALLED( ImeInquire ); + CHECK_CALLED( ImeDestroy ); + + expect = &ime_info; + todo_ImeInquire = TRUE; + todo_ImeDestroy = TRUE; + ok_ret( expect->fdwProperty, ImmGetProperty( hkl, IGP_PROPERTY ) ); + ok_ret( expect->fdwConversionCaps, ImmGetProperty( hkl, IGP_CONVERSION ) ); + ok_ret( expect->fdwSentenceCaps, ImmGetProperty( hkl, IGP_SENTENCE ) ); + ok_ret( expect->fdwSCSCaps, ImmGetProperty( hkl, IGP_SETCOMPSTR ) ); + ok_ret( expect->fdwSelectCaps, ImmGetProperty( hkl, IGP_SELECT ) ); + ok_ret( IMEVER_0400, ImmGetProperty( hkl, IGP_GETIMEVERSION ) ); + ok_ret( expect->fdwUICaps, ImmGetProperty( hkl, IGP_UI ) ); + todo_ImeInquire = FALSE; + called_ImeInquire = FALSE; + todo_ImeDestroy = FALSE; + called_ImeDestroy = FALSE; + + ime_cleanup( hkl ); + +cleanup: + SET_ENABLE( ImeInquire, FALSE ); + SET_ENABLE( ImeDestroy, FALSE ); +} + static void test_ImmGetDescription(void) { HKL hkl = GetKeyboardLayout( 0 ); @@ -3066,6 +3158,7 @@ START_TEST(imm32) test_ImmGetDescription(); test_ImmGetIMEFileName(); test_ImmIsIME(); + test_ImmGetProperty(); if (init()) {

1 0