November 2023 - Wine-commits

Paul Gofman : dnsapi: Handle IP address as DNS name in DnsQuery_UTF8().
by Alexandre Julliard 17 Nov '23

17 Nov '23

Module: wine Branch: master Commit: 1a1e2d907a3d165897e55aa5f7ea900df1a19917 URL: https://gitlab.winehq.org/wine/wine/-/commit/1a1e2d907a3d165897e55aa5f7ea90… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Oct 20 14:03:20 2023 -0600 dnsapi: Handle IP address as DNS name in DnsQuery_UTF8(). --- dlls/dnsapi/query.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/dnsapi/tests/query.c | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+) diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index 1802e93dd75..d5f46d0a32e 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -21,11 +21,15 @@ #include <stdarg.h> #include "windef.h" #include "winbase.h" +#include "winternl.h" #include "winerror.h" #include "winnls.h" #include "windns.h" #include "nb30.h" #include "ws2def.h" +#include "in6addr.h" +#include "inaddr.h" +#include "ip2string.h" #include "wine/debug.h" #include "dnsapi.h" @@ -170,6 +174,7 @@ DNS_STATUS WINAPI DnsQuery_UTF8( const char *name, WORD type, DWORD options, voi unsigned char answer[4096]; DWORD len = sizeof(answer); struct query_params query_params = { name, type, options, answer, &len }; + const char *end; TRACE( "(%s, %s, %#lx, %p, %p, %p)\n", debugstr_a(name), debugstr_type( type ), options, servers, result, reserved ); @@ -177,6 +182,43 @@ DNS_STATUS WINAPI DnsQuery_UTF8( const char *name, WORD type, DWORD options, voi if (!name || !result) return ERROR_INVALID_PARAMETER; + if (type == DNS_TYPE_A) + { + struct in_addr addr; + + if (!RtlIpv4StringToAddressA(name, TRUE, &end, &addr) && !*end) + { + DNS_RECORDA *r = calloc(1, sizeof(*r)); + r->pName = strdup(name); + r->wType = DNS_TYPE_A; + r->wDataLength = sizeof(r->Data.A); + r->dwTtl = 604800; + r->Flags.S.Reserved = 0x20; + r->Flags.S.CharSet = DnsCharSetUtf8; + r->Data.A.IpAddress = addr.s_addr; + *result = r; + return ERROR_SUCCESS; + } + } + else if (type == DNS_TYPE_AAAA) + { + struct in6_addr addr; + + if (!RtlIpv6StringToAddressA(name, &end, &addr) && !*end) + { + DNS_RECORDA *r = calloc(1, sizeof(*r)); + r->pName = strdup(name); + r->wType = DNS_TYPE_AAAA; + r->wDataLength = sizeof(r->Data.AAAA); + r->dwTtl = 604800; + r->Flags.S.Reserved = 0x20; + r->Flags.S.CharSet = DnsCharSetUtf8; + memcpy(&r->Data.AAAA.Ip6Address, &addr, sizeof(r->Data.AAAA.Ip6Address)); + *result = r; + return ERROR_SUCCESS; + } + } + if ((ret = RESOLV_CALL( set_serverlist, servers ))) return ret; ret = RESOLV_CALL( query, &query_params ); diff --git a/dlls/dnsapi/tests/query.c b/dlls/dnsapi/tests/query.c index 61b7ef093c3..51438924aa0 100644 --- a/dlls/dnsapi/tests/query.c +++ b/dlls/dnsapi/tests/query.c @@ -66,6 +66,45 @@ static void test_DnsQuery(void) DNS_RECORDW *rec, *ptr; DNS_STATUS status; + /* IP in name. */ + status = DnsQuery_W(L" 192.168.111.11", DNS_TYPE_A, 0, NULL, &rec, NULL); + ok(status != ERROR_SUCCESS, "got %lu.\n", status); + status = DnsQuery_W(L"192.168.111.11 ", DNS_TYPE_A, 0, NULL, &rec, NULL); + ok(status != ERROR_SUCCESS, "got %lu.\n", status); + + status = DnsQuery_W(L"192.168.111.11", DNS_TYPE_A, 0, NULL, &rec, NULL); + ok(!status, "got %lu.\n", status); + ok(rec->wType == DNS_TYPE_A, "got %#x.\n", rec->wType); + ok(rec->wDataLength == sizeof(rec->Data.A), "got %u.\n", rec->wDataLength); + ok(rec->Data.A.IpAddress == 0x0b6fa8c0, "got %#lx.\n", rec->Data.A.IpAddress); + ok(!rec->pNext, "got %p.\n", rec->pNext); + ok(rec->dwTtl == 604800, "got %lu.\n", rec->dwTtl); + ok(!wcscmp(rec->pName, L"192.168.111.11"), "got %s.\n", debugstr_w(rec->pName)); + ok(!rec->Flags.S.Section, "got %u.\n", rec->Flags.S.Section); + ok(!rec->Flags.S.Delete, "got %u.\n", rec->Flags.S.Delete); + ok(rec->Flags.S.CharSet == DnsCharSetUnicode, "got %u.\n", rec->Flags.S.CharSet); + ok(!rec->Flags.S.Unused, "got %u.\n", rec->Flags.S.Unused); + ok(rec->Flags.S.Reserved == 0x20, "got %u.\n", rec->Flags.S.Reserved); + DnsRecordListFree(rec, DnsFreeRecordList); + + status = DnsQuery_W(L"2001:db8:3333:4444:5555:6666:7777:8888", DNS_TYPE_AAAA, 0, NULL, &rec, NULL); + ok(!status, "got %lu.\n", status); + ok(rec->wType == DNS_TYPE_AAAA, "got %#x.\n", rec->wType); + ok(rec->wDataLength == sizeof(rec->Data.AAAA), "got %u.\n", rec->wDataLength); + ok(rec->Data.AAAA.Ip6Address.IP6Dword[0] == 0xb80d0120, "got %#lx.\n", rec->Data.AAAA.Ip6Address.IP6Dword[0]); + ok(rec->Data.AAAA.Ip6Address.IP6Dword[1] == 0x44443333, "got %#lx.\n", rec->Data.AAAA.Ip6Address.IP6Dword[1]); + ok(rec->Data.AAAA.Ip6Address.IP6Dword[2] == 0x66665555, "got %#lx.\n", rec->Data.AAAA.Ip6Address.IP6Dword[2]); + ok(rec->Data.AAAA.Ip6Address.IP6Dword[3] == 0x88887777, "got %#lx.\n", rec->Data.AAAA.Ip6Address.IP6Dword[3]); + ok(!rec->pNext, "got %p.\n", rec->pNext); + ok(rec->dwTtl == 604800, "got %lu.\n", rec->dwTtl); + ok(!wcscmp(rec->pName, L"2001:db8:3333:4444:5555:6666:7777:8888"), "got %s.\n", debugstr_w(rec->pName)); + ok(!rec->Flags.S.Section, "got %u.\n", rec->Flags.S.Section); + ok(!rec->Flags.S.Delete, "got %u.\n", rec->Flags.S.Delete); + ok(rec->Flags.S.CharSet == DnsCharSetUnicode, "got %u.\n", rec->Flags.S.CharSet); + ok(!rec->Flags.S.Unused, "got %u.\n", rec->Flags.S.Unused); + ok(rec->Flags.S.Reserved == 0x20, "got %u.\n", rec->Flags.S.Reserved); + DnsRecordListFree(rec, DnsFreeRecordList); + rec = NULL; status = DnsQuery_W(L"winehq.org", DNS_TYPE_A, DNS_QUERY_STANDARD, NULL, &rec, NULL); if (status == ERROR_TIMEOUT)

1 0

Zebediah Figura : wined3d: Introduce a wined3d_state_get_ffp_texture() helper.
by Alexandre Julliard 17 Nov '23

17 Nov '23

Module: wine Branch: master Commit: 831a41ee34b6ed5974db7a0864e7aeac34c936a9 URL: https://gitlab.winehq.org/wine/wine/-/commit/831a41ee34b6ed5974db7a0864e7ae… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 14 17:42:11 2023 -0500 wined3d: Introduce a wined3d_state_get_ffp_texture() helper. --- dlls/wined3d/arb_program_shader.c | 4 ++-- dlls/wined3d/ati_fragment_shader.c | 2 +- dlls/wined3d/context_gl.c | 2 +- dlls/wined3d/cs.c | 5 +++-- dlls/wined3d/glsl_shader.c | 6 +++--- dlls/wined3d/nvidia_texture_shader.c | 4 ++-- dlls/wined3d/shader.c | 7 +++---- dlls/wined3d/state.c | 14 ++++++++------ dlls/wined3d/stateblock.c | 2 +- dlls/wined3d/utils.c | 24 ++++++++++++------------ dlls/wined3d/wined3d_private.h | 6 ++++++ 11 files changed, 42 insertions(+), 34 deletions(-)

1 0

Zebediah Figura : wined3d: Trigger constant update when an SRV requiring NPOT fixup is bound.
by Alexandre Julliard 17 Nov '23

17 Nov '23

Module: wine Branch: master Commit: 60e4722bcfeb7c528f466a925acdc05b200e0994 URL: https://gitlab.winehq.org/wine/wine/-/commit/60e4722bcfeb7c528f466a925acdc0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 14 16:40:10 2023 -0500 wined3d: Trigger constant update when an SRV requiring NPOT fixup is bound. Ported from state_sampler(). This is currently relevant to the case where a d3d11 device is created with a 9.x feature level—this will have resources bound via SRVs [and will therefore go through wined3d_context_gl_bind_shader_resources() rather than state_sampler()] but need not support ARB_texture_non_power_of_two. The NPOT non-requirement is explicitly called out in the d3d11 documentation, and because we need some degree of emulation for conditional NPOT textures, we need to hook that up for feature level 9.x d3d11 devices as well. Looking forward, d3d 1-9 will be normalized to creating internal SRVs and binding those through the d3d10+ path, so this will also be necessary for that reason. --- dlls/wined3d/context_gl.c | 12 ++++++------ dlls/wined3d/view.c | 4 ++++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 57fd182d926..bdea2879a51 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -4290,12 +4290,6 @@ static BOOL context_apply_draw_state(struct wined3d_context *context, context->shader_update_mask &= 1u << WINED3D_SHADER_TYPE_COMPUTE; } - if (context->constant_update_mask) - { - device->shader_backend->shader_load_constants(device->shader_priv, context, state); - context->constant_update_mask = 0; - } - if (context->update_shader_resource_bindings) { for (i = 0; i < WINED3D_SHADER_TYPE_GRAPHICS_COUNT; ++i) @@ -4317,6 +4311,12 @@ static BOOL context_apply_draw_state(struct wined3d_context *context, if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) wined3d_context_gl_check_fbo_status(context_gl, GL_FRAMEBUFFER); + if (context->constant_update_mask) + { + device->shader_backend->shader_load_constants(device->shader_priv, context, state); + context->constant_update_mask = 0; + } + context->last_was_blit = FALSE; context->last_was_ffp_blit = FALSE; diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 5729d5909e6..4b0ccea7bb2 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1266,6 +1266,10 @@ void wined3d_shader_resource_view_gl_bind(struct wined3d_shader_resource_view_gl texture_gl = wined3d_texture_gl(wined3d_texture_from_resource(view_gl->v.resource)); wined3d_texture_gl_bind(texture_gl, context_gl, FALSE); wined3d_sampler_gl_bind(sampler_gl, unit, texture_gl, context_gl); + + /* Trigger shader constant reloading (for NP2 texcoord fixup) */ + if (!(texture_gl->t.flags & WINED3D_TEXTURE_POW2_MAT_IDENT)) + context_gl->c.constant_update_mask |= WINED3D_SHADER_CONST_PS_NP2_FIXUP; } /* Context activation is done by the caller. */

1 0

Zebediah Figura : wined3d: Set the active texture in sampler_texdim().
by Alexandre Julliard 17 Nov '23

17 Nov '23

Module: wine Branch: master Commit: 8da8dc94e27f0254cd1c21e833ef5205d310abb5 URL: https://gitlab.winehq.org/wine/wine/-/commit/8da8dc94e27f0254cd1c21e833ef52… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Nov 10 18:20:25 2023 -0600 wined3d: Set the active texture in sampler_texdim(). This was probably accidentally omitted in 51e64b3fe95afb3246c8690d9ea1e7b4c38ce2b4. In practice, this is guaranteed to work anyway, since due to the state table construction the equivalent misc handler, i.e. sampler(), is always guaranteed to be called right before the fragment pipeline handler for each stage. However, this is a subtle detail and best not to be depended on. --- dlls/wined3d/utils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index d9a051065ef..05a0ab36af8 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -6811,6 +6811,7 @@ void sampler_texdim(struct wined3d_context *context, const struct wined3d_state if (isStateDirty(context, STATE_TEXTURESTAGE(sampler, WINED3D_TSS_COLOR_OP))) return; + wined3d_context_gl_active_texture(context_gl, context_gl->gl_info, sampler); texture_activate_dimensions(wined3d_state_get_ffp_texture(state, sampler), context_gl->gl_info); }

1 0

Zebediah Figura : wined3d: Set the active texture in nvts_texdim().
by Alexandre Julliard 17 Nov '23

17 Nov '23

Module: wine Branch: master Commit: 877a072efa046a8323ae5c2f10b2a92e075e2213 URL: https://gitlab.winehq.org/wine/wine/-/commit/877a072efa046a8323ae5c2f10b2a9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Nov 10 18:23:33 2023 -0600 wined3d: Set the active texture in nvts_texdim(). --- dlls/wined3d/nvidia_texture_shader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index 2793b6ff1df..0e56f5f58e0 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -616,6 +616,7 @@ static void nvts_texdim(struct wined3d_context *context, const struct wined3d_st if (isStateDirty(context, STATE_TEXTURESTAGE(sampler, WINED3D_TSS_COLOR_OP))) return; + wined3d_context_gl_active_texture(context_gl, context_gl->gl_info, sampler); nvts_activate_dimensions(state, sampler, context_gl); }

1 0

Jacek Caban : msi: Store Context as MSIINSTALLCONTEXT in MSIPACKAGE.
by Alexandre Julliard 17 Nov '23

17 Nov '23

Module: wine Branch: master Commit: 2daa8c9f95b35983c885f5f7efe9e1b48e91f679 URL: https://gitlab.winehq.org/wine/wine/-/commit/2daa8c9f95b35983c885f5f7efe9e1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 17 13:28:40 2023 +0100 msi: Store Context as MSIINSTALLCONTEXT in MSIPACKAGE. Avoids casting to enum pointer in msi_locate_product call. --- dlls/msi/msipriv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 85cc5e257a7..4c2f2ae2589 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -456,7 +456,7 @@ typedef struct tagMSIPACKAGE float center_y; UINT WordCount; - UINT Context; + MSIINSTALLCONTEXT Context; struct list subscriptions;

1 0

Jacek Caban : msi/tests: Initialize pathkey in test_installprops.
by Alexandre Julliard 17 Nov '23

17 Nov '23

Module: wine Branch: master Commit: 93668319dd63add97036fbb79b5745c699117313 URL: https://gitlab.winehq.org/wine/wine/-/commit/93668319dd63add97036fbb79b5745… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 17 13:30:11 2023 +0100 msi/tests: Initialize pathkey in test_installprops. It could be used uninitialized on early no access return. --- dlls/msi/tests/package.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 3d7569499e5..75bb330db9d 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -5583,7 +5583,7 @@ static void test_installprops(void) CHAR path[MAX_PATH], buf[MAX_PATH]; DWORD size, type; LANGID langid; - HKEY hkey1, hkey2, pathkey; + HKEY hkey1, hkey2, pathkey = NULL; int res; UINT r; REGSAM access = KEY_ALL_ACCESS;

1 0

Jacek Caban : gdiplus: Remove unused variable.
by Alexandre Julliard 17 Nov '23

17 Nov '23

Module: wine Branch: master Commit: e3709b0c9d0bdacfef9c837672d63677c69d7531 URL: https://gitlab.winehq.org/wine/wine/-/commit/e3709b0c9d0bdacfef9c837672d636… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 17 13:38:31 2023 +0100 gdiplus: Remove unused variable. --- dlls/gdiplus/pen.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index 05acd54b36d..b463ca05f9b 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -629,7 +629,6 @@ GpStatus WINGDIPAPI GdipSetPenDashArray(GpPen *pen, GDIPCONST REAL *dash, INT count) { INT i; - REAL sum = 0; TRACE("(%p, %p, %d)\n", pen, dash, count); @@ -640,7 +639,6 @@ GpStatus WINGDIPAPI GdipSetPenDashArray(GpPen *pen, GDIPCONST REAL *dash, return OutOfMemory; for(i = 0; i < count; i++){ - sum += dash[i]; if(dash[i] <= 0.0) return InvalidParameter; }

1 0

Tim Clem : msvcrt: Pass INT_MAX as the length in implementations of the _mbscoll family.
by Alexandre Julliard 17 Nov '23

17 Nov '23

Module: wine Branch: master Commit: adfb58f17d492c5451fdb5dfcf111303b9d1eaad URL: https://gitlab.winehq.org/wine/wine/-/commit/adfb58f17d492c5451fdb5dfcf1113… Author: Tim Clem <tclem(a)codeweavers.com> Date: Thu Nov 16 12:01:59 2023 -0800 msvcrt: Pass INT_MAX as the length in implementations of the _mbscoll family. A length of -1 has no special meaning for the mbsn*coll functions, and since it is > INT_MAX, it will eventually trigger _invalid_parameter in _strnicmp_l in newer versions of msvcrt. --- dlls/msvcrt/mbcs.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 9b52170d4e9..385274a44a4 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1118,7 +1118,7 @@ int CDECL _mbsnbicoll_l(const unsigned char *str1, const unsigned char *str2, si */ int CDECL _mbsicoll_l(const unsigned char *str1, const unsigned char *str2, _locale_t locale) { - return _mbsnbicoll_l(str1, str2, -1, locale); + return _mbsnbicoll_l(str1, str2, INT_MAX, locale); } /********************************************************************* @@ -1138,7 +1138,7 @@ int CDECL _mbsicoll(const unsigned char* str, const unsigned char* cmp) return CompareStringA(get_mbcinfo()->mblcid, NORM_IGNORECASE, (const char*)str, -1, (const char*)cmp, -1)-CSTR_EQUAL; #else - return _mbsnbicoll_l(str, cmp, -1, NULL); + return _mbsnbicoll_l(str, cmp, INT_MAX, NULL); #endif } @@ -1164,7 +1164,7 @@ int CDECL _mbsnbcoll_l(const unsigned char *str1, const unsigned char *str2, siz */ int CDECL _mbscoll_l(const unsigned char *str1, const unsigned char *str2, _locale_t locale) { - return _mbsnbcoll_l(str1, str2, -1, locale); + return _mbsnbcoll_l(str1, str2, INT_MAX, locale); } /********************************************************************* @@ -1184,7 +1184,7 @@ int CDECL _mbscoll(const unsigned char* str, const unsigned char* cmp) return CompareStringA(get_mbcinfo()->mblcid, 0, (const char*)str, -1, (const char*)cmp, -1)-CSTR_EQUAL; #else - return _mbsnbcoll_l(str, cmp, -1, NULL); + return _mbsnbcoll_l(str, cmp, INT_MAX, NULL); #endif }

1 0

Bartosz Kosiorek : msvcrt: Fix _mbsspn_l implementation.
by Alexandre Julliard 17 Nov '23

17 Nov '23

Module: wine Branch: master Commit: c94671324ea2a3c9185da0850a2be213d13fdcfb URL: https://gitlab.winehq.org/wine/wine/-/commit/c94671324ea2a3c9185da0850a2be2… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Sat Nov 11 23:23:44 2023 +0100 msvcrt: Fix _mbsspn_l implementation. --- dlls/msvcrt/mbcs.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 385274a44a4..1a595a44ced 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2791,6 +2791,9 @@ size_t CDECL _mbsspn_l(const unsigned char* string, { const unsigned char *p, *q; + if (!MSVCRT_CHECK_PMT(string && set)) + return 0; + for (p = string; *p; p++) { for (q = set; *q; q++)

1 0