- Wine-Commits - list.winehq.org

Bartosz Kosiorek : msvcrt: Add _mbsnbcat_s_l implementation.
by Alexandre Julliard Nov. 7, 2023

Nov. 7, 2023

Module: wine Branch: master Commit: a6ed3d554ef90f6cf82db3cb7e14a4dec4d1fac8 URL: https://gitlab.winehq.org/wine/wine/-/commit/a6ed3d554ef90f6cf82db3cb7e14a4… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Mon Nov 6 20:04:55 2023 +0100 msvcrt: Add _mbsnbcat_s_l implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 27 +++++++++++++++++++++------ dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 4 ++-- 8 files changed, 29 insertions(+), 14 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 36452977926..0f57555e454 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1126,7 +1126,7 @@ @ cdecl _mbsnbcat(str str long) @ cdecl _mbsnbcat_l(str str long ptr) @ cdecl _mbsnbcat_s(str long ptr long) -@ stub _mbsnbcat_s_l +@ cdecl _mbsnbcat_s_l(str long ptr long ptr) @ cdecl _mbsnbcmp(str str long) @ cdecl _mbsnbcmp_l(str str long ptr) @ cdecl _mbsnbcnt(ptr long) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index b057d5b85ad..072cef0f0c9 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1483,7 +1483,7 @@ @ cdecl _mbsnbcat(str str long) @ cdecl _mbsnbcat_l(str str long ptr) @ cdecl _mbsnbcat_s(str long ptr long) -@ stub _mbsnbcat_s_l +@ cdecl _mbsnbcat_s_l(str long ptr long ptr) @ cdecl _mbsnbcmp(str str long) @ cdecl _mbsnbcmp_l(str str long ptr) @ cdecl _mbsnbcnt(ptr long) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 5f24c3f7971..55a0a4b1d2d 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1494,7 +1494,7 @@ @ cdecl _mbsnbcat(str str long) @ cdecl _mbsnbcat_l(str str long ptr) @ cdecl _mbsnbcat_s(str long ptr long) -@ stub _mbsnbcat_s_l +@ cdecl _mbsnbcat_s_l(str long ptr long ptr) @ cdecl _mbsnbcmp(str str long) @ cdecl _mbsnbcmp_l(str str long ptr) @ cdecl _mbsnbcnt(ptr long) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 42e215d7f79..38d157f8a9a 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -798,7 +798,7 @@ @ cdecl _mbsnbcat(str str long) @ cdecl _mbsnbcat_l(str str long ptr) @ cdecl _mbsnbcat_s(str long ptr long) -@ stub _mbsnbcat_s_l +@ cdecl _mbsnbcat_s_l(str long ptr long ptr) @ cdecl _mbsnbcmp(str str long) @ cdecl _mbsnbcmp_l(str str long ptr) @ cdecl _mbsnbcnt(ptr long) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index be847415309..58cb3ef2e92 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -776,7 +776,7 @@ @ cdecl _mbsnbcat(str str long) @ cdecl _mbsnbcat_l(str str long ptr) @ cdecl _mbsnbcat_s(str long ptr long) -@ stub _mbsnbcat_s_l +@ cdecl _mbsnbcat_s_l(str long ptr long ptr) @ cdecl _mbsnbcmp(str str long) @ cdecl _mbsnbcmp_l(str str long ptr) @ cdecl _mbsnbcnt(ptr long) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 01d290b2647..245dc843ba2 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2336,20 +2336,22 @@ unsigned char* CDECL _mbsnbcat(unsigned char *dst, const unsigned char *src, siz return _mbsnbcat_l(dst, src, len, NULL); } -int CDECL _mbsnbcat_s(unsigned char *dst, size_t size, const unsigned char *src, size_t len) +/********************************************************************* + * _mbsnbcat_s_l(MSVCRT.@) + */ +int CDECL _mbsnbcat_s_l(unsigned char *dst, size_t size, const unsigned char *src, size_t len, _locale_t locale) { unsigned char *ptr = dst; size_t i; + pthreadmbcinfo mbcinfo; - if (!dst && !size && !src && !len) + if (!dst && !size && !len) return 0; - if (!dst || !size || !src) + if (!MSVCRT_CHECK_PMT(dst && size && src)) { if (dst && size) *dst = '\0'; - - *_errno() = EINVAL; return EINVAL; } @@ -2364,9 +2366,14 @@ int CDECL _mbsnbcat_s(unsigned char *dst, size_t size, const unsigned char *src, return EINVAL; } + if (locale) + mbcinfo = locale->mbcinfo; + else + mbcinfo = get_mbcinfo(); + /* If necessary, check that the character preceding the null terminator is * a lead byte and move the pointer back by one for later overwrite. */ - if (ptr != dst && get_mbcinfo()->ismbcodepage && _ismbblead(*(ptr - 1))) + if (ptr != dst && mbcinfo->ismbcodepage && _ismbblead_l(*(ptr - 1), locale)) size++, ptr--; for (i = 0; *src && i < len; i++) @@ -2386,6 +2393,14 @@ int CDECL _mbsnbcat_s(unsigned char *dst, size_t size, const unsigned char *src, return 0; } +/********************************************************************* + * _mbsnbcat_s(MSVCRT.@) + */ +int CDECL _mbsnbcat_s(unsigned char *dst, size_t size, const unsigned char *src, size_t len) +{ + return _mbsnbcat_s_l(dst, size, src, len, NULL); +} + /********************************************************************* * _mbsncat(MSVCRT.@) */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index a997a4e61d5..738279a2cd3 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -747,7 +747,7 @@ @ cdecl _mbsnbcat(str str long) @ cdecl _mbsnbcat_l(str str long ptr) @ cdecl _mbsnbcat_s(str long ptr long) -# stub _mbsnbcat_s_l(str long ptr long ptr) +@ cdecl _mbsnbcat_s_l(str long ptr long ptr) @ cdecl _mbsnbcmp(str str long) @ cdecl _mbsnbcmp_l(str str long ptr) @ cdecl _mbsnbcnt(ptr long) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index f0b078e09e7..46cea0359b4 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -642,7 +642,7 @@ @ cdecl _mbsnbcat(str str long) @ cdecl _mbsnbcat_l(str str long ptr) @ cdecl _mbsnbcat_s(str long ptr long) -@ stub _mbsnbcat_s_l +@ cdecl _mbsnbcat_s_l(str long ptr long ptr) @ cdecl _mbsnbcmp(str str long) @ cdecl _mbsnbcmp_l(str str long ptr) @ cdecl _mbsnbcnt(ptr long) @@ -1211,7 +1211,7 @@ @ cdecl _o__mbsnbcat(str str long) _mbsnbcat @ cdecl _o__mbsnbcat_l(str str long ptr) _mbsnbcat_l @ cdecl _o__mbsnbcat_s(str long ptr long) _mbsnbcat_s -@ stub _o__mbsnbcat_s_l +@ cdecl _o__mbsnbcat_s_l(str long ptr long ptr) _mbsnbcat_s_l @ cdecl _o__mbsnbcmp(str str long) _mbsnbcmp @ cdecl _o_mbsnbcmp_l(str str long ptr) _mbsnbcmp_l @ cdecl _o__mbsnbcnt(ptr long) _mbsnbcnt

1 0

Zebediah Figura : wined3d/glsl: Clamp ftou lower bound to zero.
by Alexandre Julliard Nov. 7, 2023

Nov. 7, 2023

Module: wine Branch: master Commit: 9921a2361bb367370bba334b2cd4e2faac9ee8e6 URL: https://gitlab.winehq.org/wine/wine/-/commit/9921a2361bb367370bba334b2cd4e2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Oct 24 14:00:39 2023 -0500 wined3d/glsl: Clamp ftou lower bound to zero. Ported from 491146fa94c608c241c06114b17a3b4d8b9cea65 in vkd3d. --- dlls/wined3d/glsl_shader.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1e7a1195f8b..ff03aaee91b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4328,7 +4328,19 @@ static void shader_glsl_to_int(const struct wined3d_shader_instruction *ins) static void shader_glsl_to_uint(const struct wined3d_shader_instruction *ins) { - shader_glsl_cast(ins, "uvec", "uint"); + struct wined3d_string_buffer *buffer = ins->ctx->buffer; + struct glsl_src_param src_param; + unsigned int mask_size; + DWORD write_mask; + + write_mask = shader_glsl_append_dst(buffer, ins); + mask_size = shader_glsl_get_write_mask_size(write_mask); + shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src_param); + + if (mask_size > 1) + shader_addline(buffer, "uvec%u(max(%s, vec%u(0.0))));\n", mask_size, src_param.param_str, mask_size); + else + shader_addline(buffer, "uint(max(%s, 0)));\n", src_param.param_str); } static void shader_glsl_to_float(const struct wined3d_shader_instruction *ins)

1 0

Alex Henrie : ddrawex: Use CRT allocation functions.
by Alexandre Julliard Nov. 7, 2023

Nov. 7, 2023

Module: wine Branch: master Commit: 9365e6f682489a1654ee8e64223c3209d44e4651 URL: https://gitlab.winehq.org/wine/wine/-/commit/9365e6f682489a1654ee8e64223c32… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Nov 4 21:11:55 2023 -0600 ddrawex: Use CRT allocation functions. --- dlls/ddrawex/ddraw.c | 6 +++--- dlls/ddrawex/ddrawex_private.h | 2 -- dlls/ddrawex/main.c | 10 +++++----- dlls/ddrawex/surface.c | 4 ++-- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/ddrawex/ddraw.c b/dlls/ddrawex/ddraw.c index 4affc43ff3e..a03683b6c2f 100644 --- a/dlls/ddrawex/ddraw.c +++ b/dlls/ddrawex/ddraw.c @@ -165,7 +165,7 @@ static ULONG WINAPI ddrawex4_Release(IDirectDraw4 *iface) if (!refcount) { IDirectDraw4_Release(ddrawex->parent); - heap_free(ddrawex); + free(ddrawex); } return refcount; @@ -1425,7 +1425,7 @@ HRESULT WINAPI ddrawex_factory_CreateDirectDraw(IDirectDrawFactory *iface, GUID if (outer_unknown) FIXME("Implement aggregation in ddrawex's IDirectDraw interface.\n"); - if (!(object = heap_alloc_zero(sizeof(*object)))) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->ref = 1; @@ -1450,7 +1450,7 @@ err: IDirectDraw4_Release(object->parent); if (parent) IDirectDraw_Release(parent); - heap_free(object); + free(object); *ddraw = NULL; return hr; } diff --git a/dlls/ddrawex/ddrawex_private.h b/dlls/ddrawex/ddrawex_private.h index f60d3cb4e1b..9277ac354e4 100644 --- a/dlls/ddrawex/ddrawex_private.h +++ b/dlls/ddrawex/ddrawex_private.h @@ -19,8 +19,6 @@ #ifndef __WINE_DLLS_DDRAWEX_DDRAWEX_PRIVATE_H #define __WINE_DLLS_DDRAWEX_DDRAWEX_PRIVATE_H -#include "wine/heap.h" - DEFINE_GUID(CLSID_DirectDrawFactory, 0x4fd2a832, 0x86c8, 0x11d0, 0x8f, 0xca, 0x0, 0xc0, 0x4f, 0xd9, 0x18, 0x9d); DEFINE_GUID(IID_IDirectDrawFactory, 0x4fd2a833, 0x86c8, 0x11d0, 0x8f, 0xca, 0x0, 0xc0, 0x4f, 0xd9, 0x18, 0x9d); diff --git a/dlls/ddrawex/main.c b/dlls/ddrawex/main.c index fd6d7219c12..32449ad7cea 100644 --- a/dlls/ddrawex/main.c +++ b/dlls/ddrawex/main.c @@ -82,7 +82,7 @@ static ULONG WINAPI ddrawex_class_factory_Release(IClassFactory *iface) TRACE("%p decreasing refcount to %lu.\n", iface, refcount); if (!refcount) - heap_free(factory); + free(factory); return refcount; } @@ -161,7 +161,7 @@ static ULONG WINAPI ddrawex_factory_Release(IDirectDrawFactory *iface) TRACE("%p decreasing refcount to %lu.\n", iface, refcount); if (!refcount) - heap_free(factory); + free(factory); return refcount; } @@ -193,13 +193,13 @@ static HRESULT ddrawex_factory_create(IUnknown *outer_unknown, REFIID riid, void if (outer_unknown) return CLASS_E_NOAGGREGATION; - if (!(factory = heap_alloc_zero(sizeof(*factory)))) + if (!(factory = calloc(1, sizeof(*factory)))) return E_OUTOFMEMORY; factory->IDirectDrawFactory_iface.lpVtbl = &ddrawex_factory_vtbl; if (FAILED(hr = ddrawex_factory_QueryInterface(&factory->IDirectDrawFactory_iface, riid, out))) - heap_free(factory); + free(factory); return hr; } @@ -223,7 +223,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **out) return CLASS_E_CLASSNOTAVAILABLE; } - if (!(factory = heap_alloc_zero(sizeof(*factory)))) + if (!(factory = calloc(1, sizeof(*factory)))) return E_OUTOFMEMORY; factory->IClassFactory_iface.lpVtbl = &ddrawex_class_factory_vtbl; diff --git a/dlls/ddrawex/surface.c b/dlls/ddrawex/surface.c index cc18494905c..d5cc6ffab82 100644 --- a/dlls/ddrawex/surface.c +++ b/dlls/ddrawex/surface.c @@ -124,7 +124,7 @@ static ULONG WINAPI ddrawex_surface4_Release(IDirectDrawSurface4 *iface) { IDirectDrawSurface4_FreePrivateData(surface->parent, &IID_DDrawexPriv); IDirectDrawSurface4_Release(surface->parent); - heap_free(surface); + free(surface); } return refcount; @@ -1208,7 +1208,7 @@ IDirectDrawSurface4 *dds_get_outer(IDirectDrawSurface4 *inner) struct ddrawex_surface *impl; TRACE("Creating new ddrawex surface wrapper for surface %p\n", inner); - impl = heap_alloc_zero(sizeof(*impl)); + impl = calloc(1, sizeof(*impl)); impl->ref = 1; impl->IDirectDrawSurface3_iface.lpVtbl = &ddrawex_surface3_vtbl; impl->IDirectDrawSurface4_iface.lpVtbl = &ddrawex_surface4_vtbl;

1 0

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

Nov. 7, 2023

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 Nov. 7, 2023

Nov. 7, 2023

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: Translate sampler states to sampler objects in wined3d_device_apply_stateblock().
by Alexandre Julliard Nov. 7, 2023

Nov. 7, 2023

Module: wine Branch: master Commit: 0e39cd65cbb998cb54ad6f18390e871660e0111c URL: https://gitlab.winehq.org/wine/wine/-/commit/0e39cd65cbb998cb54ad6f18390e87… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Dec 30 16:31:28 2022 -0600 wined3d: Translate sampler states to sampler objects in wined3d_device_apply_stateblock(). --- dlls/d3d8/texture.c | 9 +- dlls/d3d9/texture.c | 9 +- dlls/ddraw/surface.c | 4 +- dlls/wined3d/context.c | 2 +- dlls/wined3d/cs.c | 40 ++------- dlls/wined3d/sampler.c | 4 - dlls/wined3d/state.c | 115 ++----------------------- dlls/wined3d/stateblock.c | 185 ++++++++++++++++++++++++++++++++++++----- dlls/wined3d/texture.c | 37 --------- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 18 +--- include/wine/wined3d.h | 3 +- 12 files changed, 199 insertions(+), 229 deletions(-)

1 0

Alex Henrie : urlmon/tests: Use CRT allocation functions.
by Alexandre Julliard Nov. 7, 2023

Nov. 7, 2023

Module: wine Branch: master Commit: 38d6ffdbe9b0542e6a5c1a190103ecbef58158a7 URL: https://gitlab.winehq.org/wine/wine/-/commit/38d6ffdbe9b0542e6a5c1a190103ec… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Nov 5 22:18:45 2023 -0700 urlmon/tests: Use CRT allocation functions. --- dlls/urlmon/tests/misc.c | 5 ++-- dlls/urlmon/tests/protocol.c | 5 ++-- dlls/urlmon/tests/sec_mgr.c | 5 ++-- dlls/urlmon/tests/uri.c | 61 ++++++++++++++++++++++---------------------- 4 files changed, 36 insertions(+), 40 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 4cd64749b1d..796f54a4f62 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -30,7 +30,6 @@ #include "urlmon.h" #include "initguid.h" -#include "wine/heap.h" DEFINE_GUID(CLSID_AboutProtocol, 0x3050F406, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); @@ -1497,7 +1496,7 @@ static void test_user_agent(void) ok(hres == E_OUTOFMEMORY, "ObtainUserAgentString failed: %08lx\n", hres); ok(size > 0, "size=%ld, expected non-zero\n", size); - str2 = HeapAlloc(GetProcessHeap(), 0, (size+20)*sizeof(CHAR)); + str2 = malloc(size + 20); saved = size; hres = pObtainUserAgentString(0, str2, &size); ok(hres == S_OK, "ObtainUserAgentString failed: %08lx\n", hres); @@ -1681,7 +1680,7 @@ static void test_user_agent(void) hres = UrlMkSetSessionOption(URLMON_OPTION_USERAGENT, NULL, 0, 0); ok(hres == E_INVALIDARG, "UrlMkSetSessionOption failed: %08lx\n", hres); - HeapFree(GetProcessHeap(), 0, str2); + free(str2); } static void test_MkParseDisplayNameEx(void) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index e2db124f21e..ead7bbd2e70 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -20,7 +20,6 @@ #define CONST_VTABLE #include <wine/test.h> -#include <wine/heap.h> #include <stdarg.h> #include <stdio.h> @@ -2331,7 +2330,7 @@ static ULONG WINAPI ProtocolUnk_Release(IUnknown *iface) if(This->outer_ref) trace("outer_ref %ld\n", This->outer_ref); CHECK_EXPECT(Protocol_destructor); - heap_free(This); + free(This); } return ref; } @@ -2643,7 +2642,7 @@ static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown } } - ret = heap_alloc(sizeof(*ret)); + ret = malloc(sizeof(*ret)); ret->IUnknown_inner.lpVtbl = &ProtocolUnkVtbl; ret->IInternetProtocolEx_iface.lpVtbl = &ProtocolVtbl; ret->IInternetPriority_iface.lpVtbl = &InternetPriorityVtbl; diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index 2f1844ca8e8..debd1e9ebc5 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -32,7 +32,6 @@ #include "urlmon.h" #include "initguid.h" -#include <wine/heap.h> #define URLZONE_CUSTOM URLZONE_USER_MIN+1 #define URLZONE_CUSTOM2 URLZONE_CUSTOM+1 @@ -201,7 +200,7 @@ static LONG myRegDeleteTreeA(HKEY hKey, LPCSTR lpszSubKey) if (dwMaxLen > ARRAY_SIZE(szNameBuf)) { /* Name too big: alloc a buffer for it */ - if (!(lpszName = HeapAlloc( GetProcessHeap(), 0, dwMaxLen*sizeof(CHAR)))) + if (!(lpszName = malloc(dwMaxLen))) { ret = ERROR_NOT_ENOUGH_MEMORY; goto cleanup; @@ -235,7 +234,7 @@ static LONG myRegDeleteTreeA(HKEY hKey, LPCSTR lpszSubKey) cleanup: /* Free buffer if allocated */ if (lpszName != szNameBuf) - heap_free(lpszName); + free(lpszName); if(lpszSubKey) RegCloseKey(hSubKey); return ret; diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index e6663a39641..cc6f5796fdd 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -33,7 +33,6 @@ #include "wininet.h" #include "strsafe.h" #include "initguid.h" -#include <wine/heap.h> DEFINE_GUID(CLSID_CUri, 0xDF2FCE13, 0x25EC, 0x45BB, 0x9D,0x4C, 0xCE,0xCD,0x47,0xC2,0x43,0x0C); @@ -7740,7 +7739,7 @@ static inline LPWSTR a2w(LPCSTR str) { if(str) { DWORD len = MultiByteToWideChar(CP_UTF8, 0, str, -1, NULL, 0); - ret = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); + ret = malloc(len * sizeof(WCHAR)); MultiByteToWideChar(CP_UTF8, 0, str, -1, ret, len); } @@ -7750,7 +7749,7 @@ static inline LPWSTR a2w(LPCSTR str) { static inline DWORD strcmp_aw(LPCSTR strA, LPCWSTR strB) { LPWSTR strAW = a2w(strA); DWORD ret = lstrcmpW(strAW, strB); - heap_free(strAW); + free(strAW); return ret; } @@ -7826,7 +7825,7 @@ static void change_property(IUriBuilder *builder, const uri_builder_property *pr trace("Unsupported operation for %d on uri_builder_tests[%ld].\n", prop->property, test_index); } - heap_free(valueW); + free(valueW); } /* @@ -7888,7 +7887,7 @@ static void test_CreateUri_InvalidUri(void) { hr, E_INVALIDARG, i); if(uri) IUri_Release(uri); - heap_free(uriW); + free(uriW); } } @@ -7964,7 +7963,7 @@ static void test_IUri_GetPropertyBSTR(void) { if(uri) IUri_Release(uri); - heap_free(uriW); + free(uriW); } } @@ -8018,7 +8017,7 @@ static void test_IUri_GetPropertyDWORD(void) { if(uri) IUri_Release(uri); - heap_free(uriW); + free(uriW); } } @@ -8280,7 +8279,7 @@ static void test_IUri_GetStrProperties(void) { if(uri) IUri_Release(uri); - heap_free(uriW); + free(uriW); } } @@ -8369,7 +8368,7 @@ static void test_IUri_GetDwordProperties(void) { if(uri) IUri_Release(uri); - heap_free(uriW); + free(uriW); } } @@ -8416,7 +8415,7 @@ static void test_IUri_GetPropertyLength(void) { /* Value may be unicode encoded */ expectedValueW = a2w(prop.value); expectedLen = lstrlenW(expectedValueW); - heap_free(expectedValueW); + free(expectedValueW); /* This won't be necessary once GetPropertyLength is implemented. */ receivedLen = -1; @@ -8436,7 +8435,7 @@ static void test_IUri_GetPropertyLength(void) { if(uri) IUri_Release(uri); - heap_free(uriW); + free(uriW); } } @@ -8509,7 +8508,7 @@ static void test_IUri_GetProperties(void) { if(uri) IUri_Release(uri); - heap_free(uriW); + free(uriW); } } @@ -8562,7 +8561,7 @@ static void test_IUri_HasProperty(void) { if(uri) IUri_Release(uri); - heap_free(uriW); + free(uriW); } } @@ -8855,8 +8854,8 @@ static void test_IUri_IsEqual(void) { if(uriA) IUri_Release(uriA); if(uriB) IUri_Release(uriB); - heap_free(uriA_W); - heap_free(uriB_W); + free(uriA_W); + free(uriB_W); } } @@ -8927,8 +8926,8 @@ static void test_CreateUriWithFragment(void) { } if(uri) IUri_Release(uri); - heap_free(uriW); - heap_free(fragW); + free(uriW); + free(fragW); } } @@ -10142,7 +10141,7 @@ static void test_IUriBuilder(void) { } if(builder) IUriBuilder_Release(builder); if(uri) IUri_Release(uri); - heap_free(uriW); + free(uriW); } } @@ -10469,7 +10468,7 @@ static void test_IUriBuilder_RemoveProperties(void) { if(builder) IUriBuilder_Release(builder); } if(uri) IUri_Release(uri); - heap_free(uriW); + free(uriW); } } @@ -10676,10 +10675,10 @@ static void test_CoInternetCombineIUri(void) { if(result) IUri_Release(result); } if(relative) IUri_Release(relative); - heap_free(relativeW); + free(relativeW); } if(base) IUri_Release(base); - heap_free(baseW); + free(baseW); } } @@ -10963,10 +10962,10 @@ static void test_CoInternetCombineUrlEx(void) { } } if(result) IUri_Release(result); - heap_free(relativeW); + free(relativeW); } if(base) IUri_Release(base); - heap_free(baseW); + free(baseW); } } @@ -11067,13 +11066,13 @@ static void test_CoInternetParseIUri_InvalidArgs(void) { /* a long url that causes a crash on Wine */ len = INTERNET_MAX_URL_LENGTH*2; - longurl = heap_alloc((len+1)*sizeof(WCHAR)); + longurl = malloc((len + 1) * sizeof(WCHAR)); memcpy(longurl, http_urlW, sizeof(http_urlW)); for(i = ARRAY_SIZE(http_urlW)-1; i < len; i++) longurl[i] = 'x'; longurl[len] = 0; - copy = heap_alloc((len+1)*sizeof(WCHAR)); + copy = malloc((len + 1) * sizeof(WCHAR)); memcpy(copy, longurl, (len+1)*sizeof(WCHAR)); hr = pCreateUri(longurl, 0, 0, &uri); @@ -11088,8 +11087,8 @@ static void test_CoInternetParseIUri_InvalidArgs(void) { ok(result == len, "Error: Expected 'result' to be %ld, but was %ld instead.\n", len, result); } - heap_free(longurl); - heap_free(copy); + free(longurl); + free(copy); if(uri) IUri_Release(uri); } @@ -11129,7 +11128,7 @@ static void test_CoInternetParseIUri(void) { } } if(uri) IUri_Release(uri); - heap_free(uriW); + free(uriW); } } @@ -11355,8 +11354,8 @@ static void test_CreateURLMoniker(void) IMoniker_Release(mon); IUri_Release(uri); - heap_free(url); - heap_free(base_url); + free(url); + free(base_url); if(base_uri) IUri_Release(base_uri); if(base_mon) @@ -11606,7 +11605,7 @@ static void test_IPersistStream(void) IMarshal_Release(marshal); IStream_Release(stream); IUri_Release(uri); - heap_free(uriW); + free(uriW); } }

1 0

Alex Henrie : shdocvw: Use CRT allocation functions.
by Alexandre Julliard Nov. 7, 2023

Nov. 7, 2023

Module: wine Branch: master Commit: fdbd8cf0070d9f597010efe618e2201781bb5035 URL: https://gitlab.winehq.org/wine/wine/-/commit/fdbd8cf0070d9f597010efe618e220… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 6 23:06:45 2023 -0700 shdocvw: Use CRT allocation functions. --- dlls/shdocvw/shdocvw.h | 1 - dlls/shdocvw/shdocvw_main.c | 16 ++++++++-------- dlls/shdocvw/shlinstobj.c | 18 +++++++++--------- 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 0b76b3d91f7..5cee1105d42 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -34,7 +34,6 @@ #include "shlobj.h" #include "exdisp.h" -#include "wine/heap.h" #include "wine/list.h" /********************************************************************** diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index b5b60054f2c..6556223e1d7 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -104,14 +104,14 @@ DWORD WINAPI IEWinMain(LPSTR szCommandLine, int nShowWindow) ExitProcess(1); len = MultiByteToWideChar(CP_ACP, 0, szCommandLine, -1, NULL, 0); - cmdline = heap_alloc(len*sizeof(WCHAR)); + cmdline = malloc(len * sizeof(WCHAR)); if(!cmdline) ExitProcess(1); MultiByteToWideChar(CP_ACP, 0, szCommandLine, -1, cmdline, len); ret = pIEWinMain(cmdline, nShowWindow); - heap_free(cmdline); + free(cmdline); return ret; } @@ -403,13 +403,13 @@ DWORD WINAPI ParseURLFromOutsideSourceA(LPCSTR url, LPSTR out, LPDWORD plen, LPD if (url) { len = MultiByteToWideChar(CP_ACP, 0, url, -1, NULL, 0); - urlW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + urlW = malloc(len * sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, url, -1, urlW, len); } len = ARRAY_SIZE(buffer); ParseURLFromOutsideSourceW(urlW, buffer, &len, unknown); - HeapFree(GetProcessHeap(), 0, urlW); + free(urlW); needed = WideCharToMultiByte(CP_ACP, 0, buffer, -1, NULL, 0, NULL, NULL); @@ -460,11 +460,11 @@ DWORD WINAPI SHRestricted2A(DWORD restriction, LPCSTR url, DWORD reserved) TRACE("(%ld, %s, %ld)\n", restriction, debugstr_a(url), reserved); if (url) { DWORD len = MultiByteToWideChar(CP_ACP, 0, url, -1, NULL, 0); - urlW = heap_alloc(len * sizeof(WCHAR)); + urlW = malloc(len * sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, url, -1, urlW, len); } res = SHRestricted2W(restriction, urlW, reserved); - heap_free(urlW); + free(urlW); return res; } @@ -547,10 +547,10 @@ BOOL WINAPI DoOrganizeFavDlg(HWND hwnd, LPCSTR initDir) if (initDir) { DWORD len = MultiByteToWideChar(CP_ACP, 0, initDir, -1, NULL, 0); - initDirW = heap_alloc(len * sizeof(WCHAR)); + initDirW = malloc(len * sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, initDir, -1, initDirW, len); } res = DoOrganizeFavDlgW(hwnd, initDirW); - heap_free(initDirW); + free(initDirW); return res; } diff --git a/dlls/shdocvw/shlinstobj.c b/dlls/shdocvw/shlinstobj.c index d1405a6bb53..102aa85bae0 100644 --- a/dlls/shdocvw/shlinstobj.c +++ b/dlls/shdocvw/shlinstobj.c @@ -105,7 +105,7 @@ static ULONG WINAPI RegistryPropertyBag_IPropertyBag_Release(IPropertyBag *iface if (cRef == 0) { TRACE("Destroying This=%p)\n", This); RegCloseKey(This->m_hInitPropertyBagKey); - heap_free(This); + free(This); SHDOCVW_UnlockModule(); } @@ -129,20 +129,20 @@ static HRESULT WINAPI RegistryPropertyBag_IPropertyBag_Read(IPropertyBag *iface, if (res != ERROR_SUCCESS) return E_INVALIDARG; - pwszValue = heap_alloc(cbData); + pwszValue = malloc(cbData); if (!pwszValue) return E_OUTOFMEMORY; - + res = RegQueryValueExW(This->m_hInitPropertyBagKey, pwszPropName, NULL, &dwType, (LPBYTE)pwszValue, &cbData); if (res != ERROR_SUCCESS) { - heap_free(pwszValue); + free(pwszValue); return E_INVALIDARG; } V_VT(pVar) = VT_BSTR; V_BSTR(pVar) = SysAllocString(pwszValue); - heap_free(pwszValue); + free(pwszValue); if (vtDst != VT_BSTR) { hr = VariantChangeTypeEx(pVar, pVar, LOCALE_SYSTEM_DEFAULT, 0, vtDst); @@ -174,8 +174,8 @@ static HRESULT RegistryPropertyBag_Constructor(HKEY hInitPropertyBagKey, REFIID TRACE("(hInitPropertyBagKey=%p, riid=%s, ppvObject=%p)\n", hInitPropertyBagKey, debugstr_guid(riid), ppvObject); - - pRegistryPropertyBag = heap_alloc(sizeof(RegistryPropertyBag)); + + pRegistryPropertyBag = malloc(sizeof(RegistryPropertyBag)); if (pRegistryPropertyBag) { pRegistryPropertyBag->IPropertyBag_iface.lpVtbl = &RegistryPropertyBag_IPropertyBagVtbl; pRegistryPropertyBag->m_cRef = 0; @@ -256,7 +256,7 @@ static ULONG WINAPI InstanceObjectFactory_IClassFactory_Release(IClassFactory *i if (cRef == 0) { IClassFactory_LockServer(iface, FALSE); IPropertyBag_Release(This->m_pPropertyBag); - heap_free(This); + free(This); } return cRef; @@ -322,7 +322,7 @@ static HRESULT InstanceObjectFactory_Constructor(REFCLSID rclsid, IPropertyBag * TRACE("(RegistryPropertyBag=%p, riid=%s, ppvObject=%p)\n", pPropertyBag, debugstr_guid(riid), ppvObject); - pInstanceObjectFactory = heap_alloc(sizeof(InstanceObjectFactory)); + pInstanceObjectFactory = malloc(sizeof(InstanceObjectFactory)); if (pInstanceObjectFactory) { pInstanceObjectFactory->IClassFactory_iface.lpVtbl = &InstanceObjectFactory_IClassFactoryVtbl; pInstanceObjectFactory->m_cRef = 0;

1 0

Paul Gofman : kernelbase: Don't inherit all the handles in conhost.exe.
by Alexandre Julliard Nov. 7, 2023

Nov. 7, 2023

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

Zebediah Figura : wined3d: Pass a wined3d_texture to wined3d_sampler_desc_from_sampler_states().
by Alexandre Julliard Nov. 7, 2023

Nov. 7, 2023

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