wine-commits November 2023

wine-commits@winehq.org

1 participants
989 discussions

Elizabeth Figura : d3d8: Store the texture's parent device as a d3d8_device pointer.
by Alexandre Julliard 07 Nov '23

07 Nov '23

Module: wine Branch: master Commit: be13e91cfe9f9cbd1114efa9b767cdd818d2625b URL: https://gitlab.winehq.org/wine/wine/-/commit/be13e91cfe9f9cbd1114efa9b767cd… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Tue Oct 24 12:31:32 2023 -0500 d3d8: Store the texture's parent device as a d3d8_device pointer. --- dlls/d3d8/d3d8_private.h | 2 +- dlls/d3d8/surface.c | 2 +- dlls/d3d8/texture.c | 19 +++++++++---------- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 722c801db57..9af6e559fdb 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -243,7 +243,7 @@ struct d3d8_texture IDirect3DBaseTexture8 IDirect3DBaseTexture8_iface; struct d3d8_resource resource; struct wined3d_texture *wined3d_texture, *draw_texture; - IDirect3DDevice8 *parent_device; + struct d3d8_device *parent_device; struct list rtv_list; }; diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 9257134b478..5b02035d539 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -372,7 +372,7 @@ static const struct wined3d_parent_ops d3d8_view_wined3d_parent_ops = struct d3d8_device *d3d8_surface_get_device(const struct d3d8_surface *surface) { IDirect3DDevice8 *device; - device = surface->texture ? surface->texture->parent_device : surface->parent_device; + device = surface->texture ? &surface->texture->parent_device->IDirect3DDevice8_iface : surface->parent_device; return impl_from_IDirect3DDevice8(device); } diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index ee06aac9610..5d2080e7da1 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -30,7 +30,7 @@ static ULONG d3d8_texture_incref(struct d3d8_texture *texture) { struct d3d8_surface *surface; - IDirect3DDevice8_AddRef(texture->parent_device); + IDirect3DDevice8_AddRef(&texture->parent_device->IDirect3DDevice8_iface); wined3d_mutex_lock(); LIST_FOR_EACH_ENTRY(surface, &texture->rtv_list, struct d3d8_surface, rtv_entry) { @@ -51,7 +51,7 @@ static ULONG d3d8_texture_decref(struct d3d8_texture *texture) if (!ref) { - IDirect3DDevice8 *parent_device = texture->parent_device; + IDirect3DDevice8 *parent_device = &texture->parent_device->IDirect3DDevice8_iface; struct d3d8_surface *surface; wined3d_mutex_lock(); @@ -70,11 +70,10 @@ static ULONG d3d8_texture_decref(struct d3d8_texture *texture) static void d3d8_texture_preload(struct d3d8_texture *texture) { - struct d3d8_device *device = impl_from_IDirect3DDevice8(texture->parent_device); - wined3d_mutex_lock(); if (texture->draw_texture) - wined3d_device_update_texture(device->wined3d_device, texture->wined3d_texture, texture->draw_texture); + wined3d_device_update_texture(texture->parent_device->wined3d_device, + texture->wined3d_texture, texture->draw_texture); else wined3d_resource_preload(wined3d_texture_get_resource(texture->wined3d_texture)); wined3d_mutex_unlock(); @@ -135,7 +134,7 @@ static HRESULT WINAPI d3d8_texture_2d_GetDevice(IDirect3DTexture8 *iface, IDirec TRACE("iface %p, device %p.\n", iface, device); - *device = texture->parent_device; + *device = &texture->parent_device->IDirect3DDevice8_iface; IDirect3DDevice8_AddRef(*device); TRACE("Returning device %p.\n", *device); @@ -436,7 +435,7 @@ static HRESULT WINAPI d3d8_texture_cube_GetDevice(IDirect3DCubeTexture8 *iface, TRACE("iface %p, device %p.\n", iface, device); - *device = texture->parent_device; + *device = &texture->parent_device->IDirect3DDevice8_iface; IDirect3DDevice8_AddRef(*device); TRACE("Returning device %p.\n", *device); @@ -760,7 +759,7 @@ static HRESULT WINAPI d3d8_texture_3d_GetDevice(IDirect3DVolumeTexture8 *iface, TRACE("iface %p, device %p.\n", iface, device); - *device = texture->parent_device; + *device = &texture->parent_device->IDirect3DDevice8_iface; IDirect3DDevice8_AddRef(*device); TRACE("Returning device %p.\n", *device); @@ -1103,8 +1102,8 @@ static HRESULT d3d8_texture_init(struct d3d8_texture *texture, struct d3d8_devic } wined3d_mutex_unlock(); - texture->parent_device = &device->IDirect3DDevice8_iface; - IDirect3DDevice8_AddRef(texture->parent_device); + texture->parent_device = device; + IDirect3DDevice8_AddRef(&texture->parent_device->IDirect3DDevice8_iface); return D3D_OK; }

1 0

Zebediah Figura : wined3d: Pass shader type and unmodified index to context_preload_texture().
by Alexandre Julliard 07 Nov '23

07 Nov '23

Module: wine Branch: master Commit: 9b48143c989ec60d0a3cf1e1b31398d565d3f244 URL: https://gitlab.winehq.org/wine/wine/-/commit/9b48143c989ec60d0a3cf1e1b31398… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Dec 30 16:26:43 2022 -0600 wined3d: Pass shader type and unmodified index to context_preload_texture(). --- dlls/wined3d/context.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index f9af58936a6..cc583fc8d26 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -353,18 +353,22 @@ static bool is_resource_rtv_bound(const struct wined3d_state *state, /* Context activation is done by the caller. */ static void context_preload_texture(struct wined3d_context *context, - const struct wined3d_state *state, unsigned int idx) + const struct wined3d_state *state, enum wined3d_shader_type shader_type, unsigned int idx) { struct wined3d_texture *texture; + unsigned int texture_idx = idx; - if (!(texture = state->textures[idx])) + if (shader_type == WINED3D_SHADER_TYPE_VERTEX) + texture_idx += WINED3D_VERTEX_SAMPLER_OFFSET; + + if (!(texture = state->textures[texture_idx])) return; if (is_resource_rtv_bound(state, &texture->resource) || (state->fb.depth_stencil && state->fb.depth_stencil->resource == &texture->resource)) context->uses_fbo_attached_resources = 1; - wined3d_texture_load(texture, context, is_srgb_enabled(state->sampler_states[idx])); + wined3d_texture_load(texture, context, is_srgb_enabled(state->sampler_states[texture_idx])); } /* Context activation is done by the caller. */ @@ -377,7 +381,7 @@ void context_preload_textures(struct wined3d_context *context, const struct wine for (i = 0; i < WINED3D_MAX_VERTEX_SAMPLERS; ++i) { if (state->shader[WINED3D_SHADER_TYPE_VERTEX]->reg_maps.resource_info[i].type) - context_preload_texture(context, state, WINED3D_MAX_FRAGMENT_SAMPLERS + i); + context_preload_texture(context, state, WINED3D_SHADER_TYPE_VERTEX, i); } } @@ -386,7 +390,7 @@ void context_preload_textures(struct wined3d_context *context, const struct wine for (i = 0; i < WINED3D_MAX_FRAGMENT_SAMPLERS; ++i) { if (state->shader[WINED3D_SHADER_TYPE_PIXEL]->reg_maps.resource_info[i].type) - context_preload_texture(context, state, i); + context_preload_texture(context, state, WINED3D_SHADER_TYPE_PIXEL, i); } } else @@ -396,7 +400,7 @@ void context_preload_textures(struct wined3d_context *context, const struct wine while (ffu_map) { i = wined3d_bit_scan(&ffu_map); - context_preload_texture(context, state, i); + context_preload_texture(context, state, WINED3D_SHADER_TYPE_PIXEL, i); } } }

1 0

Zebediah Figura : wined3d: Handle texture LOD in wined3d_sampler_desc_from_sampler_states().
by Alexandre Julliard 07 Nov '23

07 Nov '23

Module: wine Branch: master Commit: 980711a842a8b06a6db2c1ba7495b25cf6f66b0a URL: https://gitlab.winehq.org/wine/wine/-/commit/980711a842a8b06a6db2c1ba7495b2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Dec 30 14:31:40 2022 -0600 wined3d: Handle texture LOD in wined3d_sampler_desc_from_sampler_states(). --- dlls/wined3d/context_gl.c | 2 +- dlls/wined3d/sampler.c | 14 +++----------- dlls/wined3d/state.c | 10 +++++++++- dlls/wined3d/texture.c | 6 +++--- dlls/wined3d/view.c | 2 +- dlls/wined3d/wined3d_gl.h | 1 - 6 files changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index b81f14a86ee..0c440d12d84 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -5920,7 +5920,7 @@ static void apply_texture_blit_state(const struct wined3d_gl_info *gl_info, stru texture->sampler_desc.address_u = WINED3D_TADDRESS_CLAMP; texture->sampler_desc.address_v = WINED3D_TADDRESS_CLAMP; texture->sampler_desc.srgb_decode = FALSE; - texture->base_level = level; + texture->sampler_desc.mip_base_level = level; } /* Context activation is done by the caller. */ diff --git a/dlls/wined3d/sampler.c b/dlls/wined3d/sampler.c index e93ab18f436..cebb7400631 100644 --- a/dlls/wined3d/sampler.c +++ b/dlls/wined3d/sampler.c @@ -307,24 +307,16 @@ static void texture_gl_apply_base_level(struct wined3d_texture_gl *texture_gl, const struct wined3d_sampler_desc *desc, const struct wined3d_gl_info *gl_info) { struct gl_texture *gl_tex; - unsigned int base_level; - - if (texture_gl->t.flags & WINED3D_TEXTURE_COND_NP2) - base_level = 0; - else if (desc->mip_filter == WINED3D_TEXF_NONE) - base_level = texture_gl->t.lod; - else - base_level = min(max(desc->mip_base_level, texture_gl->t.lod), texture_gl->t.level_count - 1); gl_tex = wined3d_texture_gl_get_gl_texture(texture_gl, texture_gl->t.flags & WINED3D_TEXTURE_IS_SRGB); - if (base_level != gl_tex->base_level) + if (desc->mip_base_level != gl_tex->sampler_desc.mip_base_level) { /* Note that WINED3D_SAMP_MAX_MIP_LEVEL specifies the largest mipmap * (default 0), while GL_TEXTURE_MAX_LEVEL specifies the smallest * mipmap used (default 1000). So WINED3D_SAMP_MAX_MIP_LEVEL * corresponds to GL_TEXTURE_BASE_LEVEL. */ - gl_info->gl_ops.gl.p_glTexParameteri(texture_gl->target, GL_TEXTURE_BASE_LEVEL, base_level); - gl_tex->base_level = base_level; + gl_info->gl_ops.gl.p_glTexParameteri(texture_gl->target, GL_TEXTURE_BASE_LEVEL, desc->mip_base_level); + gl_tex->sampler_desc.mip_base_level = desc->mip_base_level; } } diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 5bccd1acb4a..3e857a587ee 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3499,7 +3499,15 @@ static void wined3d_sampler_desc_from_sampler_states(struct wined3d_sampler_desc desc->lod_bias = lod_bias.f; desc->min_lod = -1000.0f; desc->max_lod = 1000.0f; - desc->mip_base_level = sampler_states[WINED3D_SAMP_MAX_MIP_LEVEL]; + + /* The LOD is already clamped to texture->level_count in wined3d_texture_set_lod(). */ + if (texture->flags & WINED3D_TEXTURE_COND_NP2) + desc->mip_base_level = 0; + else if (desc->mip_filter == WINED3D_TEXF_NONE) + desc->mip_base_level = texture->lod; + else + desc->mip_base_level = min(max(sampler_states[WINED3D_SAMP_MAX_MIP_LEVEL], texture->lod), texture->level_count - 1); + desc->max_anisotropy = sampler_states[WINED3D_SAMP_MAX_ANISOTROPY]; if ((sampler_states[WINED3D_SAMP_MAG_FILTER] != WINED3D_TEXF_ANISOTROPIC && sampler_states[WINED3D_SAMP_MIN_FILTER] != WINED3D_TEXF_ANISOTROPIC diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index a7fbde0f529..8fec60f2640 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1319,7 +1319,7 @@ void wined3d_texture_gl_bind(struct wined3d_texture_gl *texture_gl, gl_tex->sampler_desc.srgb_decode = TRUE; else gl_tex->sampler_desc.srgb_decode = srgb; - gl_tex->base_level = 0; + gl_tex->sampler_desc.mip_base_level = 0; wined3d_texture_set_dirty(&texture_gl->t); wined3d_context_gl_bind_texture(context_gl, target, gl_tex->name); @@ -1757,8 +1757,8 @@ unsigned int CDECL wined3d_texture_set_lod(struct wined3d_texture *texture, unsi wined3d_resource_wait_idle(resource); texture->lod = lod; - wined3d_texture_gl(texture)->texture_rgb.base_level = ~0u; - wined3d_texture_gl(texture)->texture_srgb.base_level = ~0u; + wined3d_texture_gl(texture)->texture_rgb.sampler_desc.mip_base_level = ~0u; + wined3d_texture_gl(texture)->texture_srgb.sampler_desc.mip_base_level = ~0u; if (resource->bind_count) wined3d_device_context_emit_set_sampler_state(&device->cs->c, texture->sampler, WINED3D_SAMP_MAX_MIP_LEVEL, device->cs->c.state->sampler_states[texture->sampler][WINED3D_SAMP_MAX_MIP_LEVEL]); diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index aa07625eb8a..5729d5909e6 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1350,7 +1350,7 @@ void wined3d_shader_resource_view_gl_generate_mipmap(struct wined3d_shader_resou if (!view_gl->gl_view.name) { - gl_tex->base_level = base_level; + gl_tex->sampler_desc.mip_base_level = base_level; gl_info->gl_ops.gl.p_glTexParameteri(texture_gl->target, GL_TEXTURE_MAX_LEVEL, texture_gl->t.level_count - 1); } diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index f5cec2ccdd7..e0253defc0f 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -943,7 +943,6 @@ static inline void wined3d_context_gl_reference_buffer(struct wined3d_context_gl struct gl_texture { struct wined3d_sampler_desc sampler_desc; - unsigned int base_level; GLuint name; };

1 0

Zebediah Figura : wined3d: Pass a wined3d_texture to wined3d_sampler_desc_from_sampler_states().
by Alexandre Julliard 07 Nov '23

07 Nov '23

Module: wine Branch: master Commit: bf9c544e32a582bd372c17742d812d06b6ea9881 URL: https://gitlab.winehq.org/wine/wine/-/commit/bf9c544e32a582bd372c17742d812d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Dec 29 15:17:36 2022 -0600 wined3d: Pass a wined3d_texture to wined3d_sampler_desc_from_sampler_states(). --- dlls/wined3d/state.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 30b0adaa135..5bccd1acb4a 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3451,7 +3451,7 @@ static void sampler_texmatrix(struct wined3d_context *context, const struct wine } } -static enum wined3d_texture_address wined3d_texture_gl_address_mode(const struct wined3d_texture_gl *texture_gl, +static enum wined3d_texture_address wined3d_texture_address_mode(const struct wined3d_texture *texture, enum wined3d_texture_address t) { if (t < WINED3D_TADDRESS_WRAP || t > WINED3D_TADDRESS_MIRROR_ONCE) @@ -3461,8 +3461,8 @@ static enum wined3d_texture_address wined3d_texture_gl_address_mode(const struct } /* Cubemaps are always set to clamp, regardless of the sampler state. */ - if (texture_gl->target == GL_TEXTURE_CUBE_MAP_ARB || ((texture_gl->t.flags & WINED3D_TEXTURE_COND_NP2) - && t == WINED3D_TADDRESS_WRAP)) + if ((texture->resource.usage & WINED3DUSAGE_LEGACY_CUBEMAP) + || ((texture->flags & WINED3D_TEXTURE_COND_NP2) && t == WINED3D_TADDRESS_WRAP)) return WINED3D_TADDRESS_CLAMP; return t; @@ -3470,7 +3470,7 @@ static enum wined3d_texture_address wined3d_texture_gl_address_mode(const struct static void wined3d_sampler_desc_from_sampler_states(struct wined3d_sampler_desc *desc, const struct wined3d_context_gl *context_gl, const uint32_t *sampler_states, - const struct wined3d_texture_gl *texture_gl) + const struct wined3d_texture *texture) { union { @@ -3478,9 +3478,9 @@ static void wined3d_sampler_desc_from_sampler_states(struct wined3d_sampler_desc DWORD d; } lod_bias; - desc->address_u = wined3d_texture_gl_address_mode(texture_gl, sampler_states[WINED3D_SAMP_ADDRESS_U]); - desc->address_v = wined3d_texture_gl_address_mode(texture_gl, sampler_states[WINED3D_SAMP_ADDRESS_V]); - desc->address_w = wined3d_texture_gl_address_mode(texture_gl, sampler_states[WINED3D_SAMP_ADDRESS_W]); + desc->address_u = wined3d_texture_address_mode(texture, sampler_states[WINED3D_SAMP_ADDRESS_U]); + desc->address_v = wined3d_texture_address_mode(texture, sampler_states[WINED3D_SAMP_ADDRESS_V]); + desc->address_w = wined3d_texture_address_mode(texture, sampler_states[WINED3D_SAMP_ADDRESS_W]); wined3d_color_from_d3dcolor((struct wined3d_color *)desc->border_color, sampler_states[WINED3D_SAMP_BORDER_COLOR]); if (sampler_states[WINED3D_SAMP_MAG_FILTER] > WINED3D_TEXF_ANISOTROPIC) @@ -3504,20 +3504,20 @@ static void wined3d_sampler_desc_from_sampler_states(struct wined3d_sampler_desc if ((sampler_states[WINED3D_SAMP_MAG_FILTER] != WINED3D_TEXF_ANISOTROPIC && sampler_states[WINED3D_SAMP_MIN_FILTER] != WINED3D_TEXF_ANISOTROPIC && sampler_states[WINED3D_SAMP_MIP_FILTER] != WINED3D_TEXF_ANISOTROPIC) - || (texture_gl->t.flags & WINED3D_TEXTURE_COND_NP2)) + || (texture->flags & WINED3D_TEXTURE_COND_NP2)) desc->max_anisotropy = 1; - desc->compare = texture_gl->t.resource.format_caps & WINED3D_FORMAT_CAP_SHADOW; + desc->compare = texture->resource.format_caps & WINED3D_FORMAT_CAP_SHADOW; desc->comparison_func = WINED3D_CMP_LESSEQUAL; desc->srgb_decode = is_srgb_enabled(sampler_states); - if (!(texture_gl->t.resource.format_caps & WINED3D_FORMAT_CAP_FILTERING)) + if (!(texture->resource.format_caps & WINED3D_FORMAT_CAP_FILTERING)) { desc->mag_filter = WINED3D_TEXF_POINT; desc->min_filter = WINED3D_TEXF_POINT; desc->mip_filter = WINED3D_TEXF_NONE; } - if (texture_gl->t.flags & WINED3D_TEXTURE_COND_NP2) + if (texture->flags & WINED3D_TEXTURE_COND_NP2) { desc->mip_filter = WINED3D_TEXF_NONE; if (context_gl->gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT]) @@ -3557,7 +3557,7 @@ static void sampler(struct wined3d_context *context, const struct wined3d_state struct wined3d_sampler *sampler; struct wine_rb_entry *entry; - wined3d_sampler_desc_from_sampler_states(&desc, context_gl, sampler_states, texture_gl); + wined3d_sampler_desc_from_sampler_states(&desc, context_gl, sampler_states, &texture_gl->t); wined3d_texture_gl_bind(texture_gl, context_gl, srgb);

1 0

Paul Gofman : kernelbase: Don't inherit all the handles in conhost.exe.
by Alexandre Julliard 07 Nov '23

07 Nov '23

Module: wine Branch: master Commit: f1db89768a35f292c21beeff0fde69e363d77adb URL: https://gitlab.winehq.org/wine/wine/-/commit/f1db89768a35f292c21beeff0fde69… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Nov 6 15:09:25 2023 -0600 kernelbase: Don't inherit all the handles in conhost.exe. --- dlls/kernelbase/console.c | 61 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 46 insertions(+), 15 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 831e358c692..4209d2e6991 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -393,10 +393,12 @@ BOOL WINAPI DECLSPEC_HOTPATCH AttachConsole( DWORD pid ) static BOOL alloc_console( BOOL headless ) { SECURITY_ATTRIBUTES inheritable_attr = { sizeof(inheritable_attr), NULL, TRUE }; - STARTUPINFOW app_si, console_si; + STARTUPINFOEXW console_si; + STARTUPINFOW app_si; HANDLE server, console = NULL; WCHAR buffer[1024], cmd[256], conhost_path[MAX_PATH]; PROCESS_INFORMATION pi; + SIZE_T size; void *redir; BOOL ret; @@ -412,42 +414,50 @@ static BOOL alloc_console( BOOL headless ) return FALSE; } + memset( &console_si, 0, sizeof(console_si) ); + console_si.StartupInfo.cb = sizeof(console_si); + InitializeProcThreadAttributeList( NULL, 1, 0, &size ); + if (!(console_si.lpAttributeList = HeapAlloc( GetProcessHeap(), 0, size ))) return FALSE; + InitializeProcThreadAttributeList( console_si.lpAttributeList, 1, 0, &size ); + if (!(server = create_console_server()) || !(console = create_console_reference( server ))) goto error; GetStartupInfoW(&app_si); - memset(&console_si, 0, sizeof(console_si)); - console_si.cb = sizeof(console_si); /* setup a view arguments for conhost (it'll use them as default values) */ if (app_si.dwFlags & STARTF_USECOUNTCHARS) { - console_si.dwFlags |= STARTF_USECOUNTCHARS; - console_si.dwXCountChars = app_si.dwXCountChars; - console_si.dwYCountChars = app_si.dwYCountChars; + console_si.StartupInfo.dwFlags |= STARTF_USECOUNTCHARS; + console_si.StartupInfo.dwXCountChars = app_si.dwXCountChars; + console_si.StartupInfo.dwYCountChars = app_si.dwYCountChars; } if (app_si.dwFlags & STARTF_USEFILLATTRIBUTE) { - console_si.dwFlags |= STARTF_USEFILLATTRIBUTE; - console_si.dwFillAttribute = app_si.dwFillAttribute; + console_si.StartupInfo.dwFlags |= STARTF_USEFILLATTRIBUTE; + console_si.StartupInfo.dwFillAttribute = app_si.dwFillAttribute; } if (app_si.dwFlags & STARTF_USESHOWWINDOW) { - console_si.dwFlags |= STARTF_USESHOWWINDOW; - console_si.wShowWindow = app_si.wShowWindow; + console_si.StartupInfo.dwFlags |= STARTF_USESHOWWINDOW; + console_si.StartupInfo.wShowWindow = app_si.wShowWindow; } if (app_si.lpTitle) - console_si.lpTitle = app_si.lpTitle; + console_si.StartupInfo.lpTitle = app_si.lpTitle; else if (GetModuleFileNameW(0, buffer, ARRAY_SIZE(buffer))) { buffer[ARRAY_SIZE(buffer) - 1] = 0; - console_si.lpTitle = buffer; + console_si.StartupInfo.lpTitle = buffer; } + + UpdateProcThreadAttribute( console_si.lpAttributeList, 0, PROC_THREAD_ATTRIBUTE_HANDLE_LIST, + &server, sizeof(server), NULL, NULL ); swprintf( conhost_path, ARRAY_SIZE(conhost_path), L"%s\\conhost.exe", system_dir ); swprintf( cmd, ARRAY_SIZE(cmd), L"\"%s\" --server 0x%x", conhost_path, condrv_handle( server )); if (headless) wcscat( cmd, L" --headless" ); Wow64DisableWow64FsRedirection( &redir ); - ret = CreateProcessW( conhost_path, cmd, NULL, NULL, TRUE, DETACHED_PROCESS, NULL, NULL, &console_si, &pi ); + ret = CreateProcessW( conhost_path, cmd, NULL, NULL, TRUE, DETACHED_PROCESS | EXTENDED_STARTUPINFO_PRESENT, + NULL, NULL, &console_si.StartupInfo, &pi ); Wow64RevertWow64FsRedirection( redir ); if (!ret || !create_console_connection( console)) goto error; @@ -456,6 +466,7 @@ static BOOL alloc_console( BOOL headless ) RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle = console; TRACE( "Started conhost pid=%08lx tid=%08lx\n", pi.dwProcessId, pi.dwThreadId ); + HeapFree( GetProcessHeap(), 0, console_si.lpAttributeList ); CloseHandle( server ); RtlLeaveCriticalSection( &console_section ); SetLastError( ERROR_SUCCESS ); @@ -463,6 +474,7 @@ static BOOL alloc_console( BOOL headless ) error: ERR("Can't allocate console\n"); + HeapFree( GetProcessHeap(), 0, console_si.lpAttributeList ); NtClose( console ); NtClose( server ); FreeConsole(); @@ -2175,9 +2187,12 @@ static HANDLE create_pseudo_console( COORD size, HANDLE input, HANDLE output, HA DWORD flags, HANDLE *process ) { WCHAR cmd[MAX_PATH], conhost_path[MAX_PATH]; + unsigned int inherit_count; PROCESS_INFORMATION pi; HANDLE server, console; + HANDLE inherit[2]; STARTUPINFOEXW si; + SIZE_T attr_size; void *redir; BOOL res; @@ -2196,6 +2211,21 @@ static HANDLE create_pseudo_console( COORD size, HANDLE input, HANDLE output, HA si.StartupInfo.hStdOutput = output; si.StartupInfo.hStdError = output; si.StartupInfo.dwFlags = STARTF_USESTDHANDLES; + + inherit[0] = server; + inherit[1] = signal; + inherit_count = signal ? 2 : 1; + InitializeProcThreadAttributeList( NULL, inherit_count, 0, &attr_size ); + if (!(si.lpAttributeList = HeapAlloc( GetProcessHeap(), 0, attr_size ))) + { + NtClose( console ); + NtClose( server ); + return FALSE; + } + InitializeProcThreadAttributeList( si.lpAttributeList, inherit_count, 0, &attr_size ); + UpdateProcThreadAttribute( si.lpAttributeList, 0, PROC_THREAD_ATTRIBUTE_HANDLE_LIST, + inherit, sizeof(*inherit) * inherit_count, NULL, NULL ); + swprintf( conhost_path, ARRAY_SIZE(conhost_path), L"%s\\conhost.exe", system_dir ); if (signal) { @@ -2210,8 +2240,9 @@ static HANDLE create_pseudo_console( COORD size, HANDLE input, HANDLE output, HA conhost_path, size.X, size.Y, server ); } Wow64DisableWow64FsRedirection( &redir ); - res = CreateProcessW( conhost_path, cmd, NULL, NULL, TRUE, DETACHED_PROCESS, NULL, NULL, - &si.StartupInfo, &pi ); + res = CreateProcessW( conhost_path, cmd, NULL, NULL, TRUE, DETACHED_PROCESS | EXTENDED_STARTUPINFO_PRESENT, + NULL, NULL, &si.StartupInfo, &pi ); + HeapFree( GetProcessHeap(), 0, si.lpAttributeList ); Wow64RevertWow64FsRedirection( redir ); NtClose( server ); if (!res)

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 07 Nov '23

07 Nov '23

Module: wine Branch: master Commit: 66dfe504d0b93595677c030ca175657047d391d5 URL: https://gitlab.winehq.org/wine/wine/-/commit/66dfe504d0b93595677c030ca17565… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Tue Nov 7 10:30:44 2023 +0200 po: Update Lithuanian translation. --- po/lt.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/lt.po b/po/lt.po index a4315899021..c71d0fd13e7 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2023-10-11 23:56+0300\n" +"PO-Revision-Date: 2023-11-07 09:32+0200\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -18539,10 +18539,8 @@ msgid "MIME types" msgstr "MIME tipai" #: programs/winecfg/winecfg.rc:311 -#, fuzzy -#| msgid "Manage file &associations" msgid "Manage file and protocol &associations" -msgstr "Valdyti failų susie&jimus" +msgstr "Valdyti failų ir protokolų susie&jimus" #: programs/winecfg/winecfg.rc:314 msgid "Folders"

1 0

Alexandre Julliard : include: Use proper dllimports for more wininet functions.
by Alexandre Julliard 07 Nov '23

07 Nov '23

Module: wine Branch: master Commit: 9da663b4802dbaff6f80191c09266b1718ce5e15 URL: https://gitlab.winehq.org/wine/wine/-/commit/9da663b4802dbaff6f80191c09266b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 17:32:44 2023 +0100 include: Use proper dllimports for more wininet functions. --- include/wininet.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/wininet.h b/include/wininet.h index 158b005d36c..0de2b830812 100644 --- a/include/wininet.h +++ b/include/wininet.h @@ -1742,8 +1742,8 @@ INTERNETAPI BOOL WINAPI InternetSetDialStateW(LPCWSTR ,DWORD ,DWORD); #define InternetSetDialState WINELIB_NAME_AW(InternetSetDialState) #define INTERNET_DIALSTATE_DISCONNECTED 1 -BOOL WINAPI InternetGetConnectedStateExA(LPDWORD, LPSTR, DWORD, DWORD); -BOOL WINAPI InternetGetConnectedStateExW(LPDWORD, LPWSTR, DWORD, DWORD); +INTERNETAPI BOOL WINAPI InternetGetConnectedStateExA(LPDWORD, LPSTR, DWORD, DWORD); +INTERNETAPI BOOL WINAPI InternetGetConnectedStateExW(LPDWORD, LPWSTR, DWORD, DWORD); #define InternetGetConnectedStateEx WINELIB_NAME_AW(InternetGetConnectedStateEx) typedef struct AutoProxyHelperVtbl @@ -1779,8 +1779,8 @@ typedef BOOL (CALLBACK *pfnInternetInitializeAutoProxyDll)(DWORD, LPSTR, LPSTR, #define PROXY_AUTO_DETECT_TYPE_DHCP 1 #define PROXY_AUTO_DETECT_TYPE_DNS_A 2 -BOOL WINAPI InternetInitializeAutoProxyDll(DWORD); -BOOL WINAPI DetectAutoProxyUrl(LPSTR, DWORD, DWORD); +INTERNETAPI BOOL WINAPI InternetInitializeAutoProxyDll(DWORD); +INTERNETAPI BOOL WINAPI DetectAutoProxyUrl(LPSTR, DWORD, DWORD); #ifdef __cplusplus }

1 0

Alexandre Julliard : include: Use proper dllimports for olectl functions.
by Alexandre Julliard 07 Nov '23

07 Nov '23

Module: wine Branch: master Commit: b06a1ec1965245ab290bfb3f1ca691bb02aab5ef URL: https://gitlab.winehq.org/wine/wine/-/commit/b06a1ec1965245ab290bfb3f1ca691… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 17:32:20 2023 +0100 include: Use proper dllimports for olectl functions. --- include/olectl.h | 47 +++++++++++++++++++++-------------------------- 1 file changed, 21 insertions(+), 26 deletions(-) diff --git a/include/olectl.h b/include/olectl.h index 2ba37b48a5e..fe02a6236b9 100644 --- a/include/olectl.h +++ b/include/olectl.h @@ -27,7 +27,13 @@ extern "C" { #endif - +#ifdef _OLEAUT32_ +#define WINOLECTLAPI STDAPI +#define WINOLECTLAPI_(type) STDAPI_(type) +#else +#define WINOLECTLAPI DECLSPEC_IMPORT STDAPI +#define WINOLECTLAPI_(type) DECLSPEC_IMPORT STDAPI_(type) +#endif /* * Ole Control Interfaces @@ -183,44 +189,33 @@ typedef VARIANT_BOOL OLE_ENABLEDEFAULTBOOL; #define LP_VGACOLOR 0x2 #define LP_COLOR 0x4 -HRESULT WINAPI DllRegisterServer(void) DECLSPEC_HIDDEN; -HRESULT WINAPI DllUnregisterServer(void) DECLSPEC_HIDDEN; - -HCURSOR WINAPI OleIconToCursor( HINSTANCE hinstExe, HICON hicon); - -HRESULT WINAPI OleCreatePropertyFrameIndirect( LPOCPFIPARAMS lpParams); +HRESULT WINAPI DllRegisterServer(void); +HRESULT WINAPI DllUnregisterServer(void); -HRESULT WINAPI OleCreatePropertyFrame( +WINOLECTLAPI_(HCURSOR) OleIconToCursor( HINSTANCE hinstExe, HICON hicon); +WINOLECTLAPI OleCreatePropertyFrameIndirect( LPOCPFIPARAMS lpParams); +WINOLECTLAPI OleCreatePropertyFrame( HWND hwndOwner, UINT x, UINT y, LPCOLESTR lpszCaption, ULONG cObjects, LPUNKNOWN* ppUnk, ULONG cPages, LPCLSID pPageClsID, LCID lcid, DWORD dwReserved, LPVOID pvReserved ); - -HRESULT WINAPI OleLoadPicture( LPSTREAM lpstream, LONG lSize, BOOL fRunmode, +WINOLECTLAPI OleLoadPicture( LPSTREAM lpstream, LONG lSize, BOOL fRunmode, REFIID riid, LPVOID *lplpvObj ); - -HRESULT WINAPI OleLoadPictureEx( LPSTREAM lpstream, LONG lSize, BOOL fRunMode, +WINOLECTLAPI OleLoadPictureEx( LPSTREAM lpstream, LONG lSize, BOOL fRunMode, REFIID riid, DWORD xSizeDesired, DWORD ySizeDesired, DWORD dwFlags, LPVOID *lplpvObj ); - -HRESULT WINAPI OleLoadPictureFile( VARIANT varFilename, IDispatch **ppdispPicture ); - -HRESULT WINAPI OleLoadPictureFileEx( VARIANT varFilename, DWORD xSizeDesired, +WINOLECTLAPI OleLoadPictureFile( VARIANT varFilename, IDispatch **ppdispPicture ); +WINOLECTLAPI OleLoadPictureFileEx( VARIANT varFilename, DWORD xSizeDesired, DWORD ySizeDesired, DWORD dwFlags, IDispatch **ppdispPicture ); - -HRESULT WINAPI OleSavePictureFile( IDispatch *pdispPicture, BSTR bstrFilename ); - -HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller, +WINOLECTLAPI OleSavePictureFile( IDispatch *pdispPicture, BSTR bstrFilename ); +WINOLECTLAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller, DWORD dwReserved, OLE_COLOR clrReserved, REFIID riid, LPVOID *ppvRet ); - -HRESULT WINAPI OleCreatePictureIndirect(LPPICTDESC lpPictDesc, REFIID riid, +WINOLECTLAPI OleCreatePictureIndirect(LPPICTDESC lpPictDesc, REFIID riid, BOOL fOwn, LPVOID * lplpvObj ); - -HRESULT WINAPI OleCreateFontIndirect(LPFONTDESC lpFontDesc, REFIID riid, +WINOLECTLAPI OleCreateFontIndirect(LPFONTDESC lpFontDesc, REFIID riid, LPVOID* lplpvObj); - -HRESULT WINAPI OleTranslateColor( OLE_COLOR clr, HPALETTE hpal, +WINOLECTLAPI OleTranslateColor( OLE_COLOR clr, HPALETTE hpal, COLORREF* lpcolorref); /* Reflected Window Message IDs */

1 0

Alexandre Julliard : include: Use proper dllimports for wmi functions.
by Alexandre Julliard 07 Nov '23

07 Nov '23

Module: wine Branch: master Commit: 333ced9869ebb49a1d6830e842f866a0eb1439b1 URL: https://gitlab.winehq.org/wine/wine/-/commit/333ced9869ebb49a1d6830e842f866… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 17:31:39 2023 +0100 include: Use proper dllimports for wmi functions. --- dlls/wmi/Makefile.in | 1 + include/wmium.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wmi/Makefile.in b/dlls/wmi/Makefile.in index fde1177f9a5..9b6d56ab3da 100644 --- a/dlls/wmi/Makefile.in +++ b/dlls/wmi/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -D_WMI_SOURCE_ MODULE = wmi.dll IMPORTS = advapi32 diff --git a/include/wmium.h b/include/wmium.h index 887c2b4ccf5..bbb13a3dbf4 100644 --- a/include/wmium.h +++ b/include/wmium.h @@ -22,7 +22,7 @@ #ifdef _WMI_SOURCE_ #define WMIAPI __stdcall #else -#define WMIAPI DECLSPEC_HIDDEN __stdcall +#define WMIAPI DECLSPEC_IMPORT __stdcall #endif #include <guiddef.h>

1 0

Alexandre Julliard : include: Use proper dllimports for slc functions.
by Alexandre Julliard 07 Nov '23

07 Nov '23

Module: wine Branch: master Commit: 32cdd5d487e9223664adadbb775d75b022aec29c URL: https://gitlab.winehq.org/wine/wine/-/commit/32cdd5d487e9223664adadbb775d75… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 17:30:27 2023 +0100 include: Use proper dllimports for slc functions. --- dlls/sppc/Makefile.in | 1 + include/slpublic.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/sppc/Makefile.in b/dlls/sppc/Makefile.in index 81a59392c62..e9209fe4b71 100644 --- a/dlls/sppc/Makefile.in +++ b/dlls/sppc/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -D_SLC_ MODULE = sppc.dll EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/include/slpublic.h b/include/slpublic.h index 3f3a39274d1..97fa8c798c9 100644 --- a/include/slpublic.h +++ b/include/slpublic.h @@ -26,7 +26,7 @@ extern "C" { #ifdef _SLC_ #define SLCAPI #else -#define SLCAPI DECLSPEC_HIDDEN +#define SLCAPI DECLSPEC_IMPORT #endif typedef GUID SLID;

1 0

← Newer
1
...
73
74
75
76
77
78
79
...
99
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 November 2023