August 2021 - Wine-Devel - list.winehq.org

Re: [PATCH 3/3] dbghelp: fix failing SymInitialize for a live 32bit target from a 64bit caller in WOW64

by Alexandre Julliard

Eric Pouech <eric.pouech(a)orange.fr> writes: >> Offsetting by 0x1000 is fine. >> >> But I'd say that the ELF data should be stored in the 64-bit PEB. Also >> note that once the new Wow64 architecture is enabled, all ELF data >> inside 32-bit processes is going to be 64-bit. >> > ok I'll resend the serie with just offsetting for now. > > is there a way to test the new WoW64 arch before it's enabled? You can try the patch below. Note that you need to apply the ntdll-NtAlertThreadByThreadId series from wine-staging first. -- Alexandre Julliard julliard(a)winehq.org

Aug. 31, 2021

Re: [PATCH 4/5] d3d10/effect: Support stream output declaration when creating geometry shaders.

by Matteo Bruni

On Mon, Aug 30, 2021 at 7:07 AM Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > > Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> > --- > dlls/d3d10/effect.c | 172 ++++++++++++++++++++++++++++++++++++++++++-- > 1 file changed, 166 insertions(+), 6 deletions(-) Patch is okay, a few notes below. > diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c > index 113125e9cbd..c3c98a0da31 100644 > --- a/dlls/d3d10/effect.c > +++ b/dlls/d3d10/effect.c > @@ -566,6 +592,127 @@ static HRESULT get_fx10_shader_resources(struct d3d10_effect_variable *v, const > return S_OK; > } > > +struct d3d10_effect_so_decl > +{ > + D3D10_SO_DECLARATION_ENTRY *entries; > + SIZE_T capacity; > + SIZE_T count; > + unsigned int stride; > + char *decl; > +}; > + > +static void d3d10_effect_cleanup_so_decl(struct d3d10_effect_so_decl *so_decl) > +{ > + heap_free(so_decl->entries); > + heap_free(so_decl->decl); > + memset(so_decl, 0, sizeof(*so_decl)); > +} > + > +static HRESULT d3d10_effect_parse_stream_output_declaration(const char *decl, > + struct d3d10_effect_so_decl *so_decl) > +{ > + static const char * allmask = "xyzw"; Usually in HLSL you can use "rgba" in place of "xyzw" for swizzles / writemasks, it might be worth checking if those also work (and are passed through to the effect bytecode unchanged). > + char *p, *ptr, *end, *next, *mask, *m, *slot; > + unsigned int len = strlen(decl); > + D3D10_SO_DECLARATION_ENTRY e; > + > + memset(so_decl, 0, sizeof(*so_decl)); > + > + if (!(so_decl->decl = heap_alloc(len + 1))) > + return E_OUTOFMEMORY; > + memcpy(so_decl->decl, decl, len + 1); > + > + p = so_decl->decl; I think it would be nice to have a small comment showing the expected syntax of a stream out declaration (entry) somewhere around here. Just something to quickly glance at while reading the following code. > + > + while (p && *p) > + { > + memset(&e, 0, sizeof(e)); > + > + end = strchr(p, ';'); > + next = end ? end + 1 : p + strlen(p); > + > + len = next - p; > + if (end) len--; > + > + /* Remove leading and trailing spaces. */ > + while (len && isspace(*p)) { len--; p++; } > + while (len && isspace(p[len - 1])) len--; > + > + p[len] = 0; > + > + /* Output slot */ > + if ((slot = strchr(p, ':'))) > + { > + *slot = 0; > + > + ptr = p; > + while (*ptr) > + { > + if (!isdigit(*ptr)) > + { > + WARN("Invalid output slot %s.\n", debugstr_a(p)); > + goto failed; > + } > + ptr++; > + } > + > + e.OutputSlot = atoi(p); > + p = slot + 1; > + } > + > + /* Mask */ > + if ((mask = strchr(p, '.'))) > + { > + *mask = 0; mask++; > + > + if (!(m = strstr(allmask, mask))) > + { > + WARN("Invalid component mask %s.\n", debugstr_a(mask)); > + goto failed; > + } > + > + e.StartComponent = m - allmask; > + e.ComponentCount = strlen(mask); Did you verify that it's illegal to have a wrongly ordered mask (e.g. something like .wzyx)? I expect that to be invalid but better to be sure. Likewise for other assumptions involved here, like repeating the same component twice. In general, some more tests with interesting stream out declarations would be nice. I guess you have more planned after the test in patch 5/5. > + } > + else > + { > + e.StartComponent = 0; > + e.ComponentCount = 4; > + } > + > + /* Semantic index and name */ > + len = strlen(p); > + while (isdigit(p[len - 1])) > + len--; > + > + if (p[len]) > + { > + e.SemanticIndex = atoi(&p[len]); > + p[len] = 0; > + } > + > + e.SemanticName = p; > + > + if (!d3d_array_reserve((void **)&so_decl->entries, &so_decl->capacity, so_decl->count + 1, > + sizeof(*so_decl->entries))) > + goto failed; > + > + so_decl->entries[so_decl->count++] = e; > + > + if (e.OutputSlot == 0) > + so_decl->stride += e.ComponentCount * sizeof(float); This looks weird, but that's probably because the API for ID3D10Device_CreateGeometryShaderWithStreamOutput() is confusing (just one stride for up to 4 output buffers? What does it even mean?) and neither the documentation nor our tests seem to clarify that. Any clue what's supposed to happen with multiple output buffers? FWIW that function's signature makes a lot more sense in d3d11.

Aug. 31, 2021

Re: [PATCH] shlwapi/tests: Document where SHFormatDateTimeA() crashes for NULL pointers.

by Francois Gouget

On Tue, 31 Aug 2021, Marvin wrote: [...] > === debiant2 (32 bit Hindi:India report) === > > shlwapi: > ordinal.c:1724: Test failed: expected ( ), got (08:02) > ordinal.c:1731: Test failed: expected ( ), got (08:02:55) > ordinal.c:1739: Test failed: expected ( ), got (08:02:55) > ordinal.c:1746: Test failed: expected ( ), got (31-08-2021) > ordinal.c:1753: Test failed: expected ( ), got (31 ????? 2021) > ordinal.c:1761: Test failed: expected ( ), got (31 ????? 2021) > ordinal.c:1769: Test failed: expected (F), got (2) for time part > ordinal.c:1783: Test failed: expected (F), got (5) for time part > ordinal.c:1801: Test failed: expected ( F), got (31-08-2021 08:02) > ordinal.c:1812: Test failed: expected ( F F), got (31-08-2021 08:02:55) This is the Hindi locale issue (will also appear on the other shlwapi patch): https://bugs.winehq.org//show_bug.cgi?id=51407 -- Francois Gouget <fgouget(a)codeweavers.com>

Aug. 31, 2021

Re: [PATCH] user32: Fix ASCII / ANSI mixups in comments.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=96888 Your paranoid android. === debiant2 (32 bit report) === user32: menu.c:2337: Test failed: test 25

Aug. 31, 2021

Re: [PATCH] iphlpapi: Make the adapters_addresses_*() functions static.

by Huw Davies

Signed-off-by: Huw Davies <huw(a)codeweavers.com>

Aug. 31, 2021

[PATCH] msxml3: SchemaCache_version() is unused so remove it.

by Francois Gouget

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- I could not even find any trace of it ever being used... --- dlls/msxml3/main.c | 12 ------------ dlls/msxml3/msxml_private.h | 1 - 2 files changed, 13 deletions(-) diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index 11781a1ca2d..25400b698ca 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -406,18 +406,6 @@ const CLSID* DOMDocument_version(MSXML_VERSION v) } } -const CLSID* SchemaCache_version(MSXML_VERSION v) -{ - switch (v) - { - default: - case MSXML_DEFAULT: return &CLSID_XMLSchemaCache; - case MSXML3: return &CLSID_XMLSchemaCache30; - case MSXML4: return &CLSID_XMLSchemaCache40; - case MSXML6: return &CLSID_XMLSchemaCache60; - } -} - BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID reserved) { MSXML_hInstance = hInstDLL; diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 29b1156775c..f16040f3542 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -34,7 +34,6 @@ #endif extern const CLSID * DOMDocument_version(MSXML_VERSION v) DECLSPEC_HIDDEN; -extern const CLSID * SchemaCache_version(MSXML_VERSION v) DECLSPEC_HIDDEN; /* The XDR datatypes (urn:schemas-microsoft-com:datatypes) -- 2.30.2

Aug. 31, 2021

[PATCH] msi: Remove CDECL on static functions where not needed.

by Francois Gouget

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- --- dlls/msi/media.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 41c82af1b59..cc4648481ba 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -271,7 +271,7 @@ static LONG CDECL cabinet_seek_stream( INT_PTR hf, LONG dist, int seektype ) return -1; } -static UINT CDECL msi_media_get_disk_info(MSIPACKAGE *package, MSIMEDIAINFO *mi) +static UINT msi_media_get_disk_info(MSIPACKAGE *package, MSIMEDIAINFO *mi) { MSIRECORD *row; -- 2.30.2

Aug. 31, 2021

[PATCH] dnsapi: Make the resolv_*() functions static.

by Francois Gouget

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/dnsapi/dnsapi.h | 5 ----- dlls/dnsapi/libresolv.c | 10 +++++----- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/dnsapi/dnsapi.h b/dlls/dnsapi/dnsapi.h index 5b4fc1019e2..c598ade756e 100644 --- a/dlls/dnsapi/dnsapi.h +++ b/dlls/dnsapi/dnsapi.h @@ -121,11 +121,6 @@ static inline char *strdup_ua( const char *src ) extern const char *type_to_str( unsigned short ) DECLSPEC_HIDDEN; -extern DNS_STATUS CDECL resolv_get_searchlist( DNS_TXT_DATAW *, DWORD * ) DECLSPEC_HIDDEN; -extern DNS_STATUS CDECL resolv_get_serverlist( USHORT, DNS_ADDR_ARRAY *, DWORD * ) DECLSPEC_HIDDEN; -extern DNS_STATUS CDECL resolv_query( const char *, WORD, DWORD, DNS_RECORDA ** ) DECLSPEC_HIDDEN; -extern DNS_STATUS CDECL resolv_set_serverlist( const IP4_ARRAY * ) DECLSPEC_HIDDEN; - struct resolv_funcs { DNS_STATUS (CDECL *get_searchlist)( DNS_TXT_DATAW *list, DWORD *len ); diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c index 864c517333d..197ca84aeae 100644 --- a/dlls/dnsapi/libresolv.c +++ b/dlls/dnsapi/libresolv.c @@ -277,7 +277,7 @@ static DNS_STATUS map_h_errno( int error ) } } -DNS_STATUS CDECL resolv_get_searchlist( DNS_TXT_DATAW *list, DWORD *len ) +static DNS_STATUS CDECL resolv_get_searchlist( DNS_TXT_DATAW *list, DWORD *len ) { DWORD i, needed, str_needed = 0; char *ptr, *end; @@ -320,7 +320,7 @@ static inline int filter( unsigned short sin_family, USHORT family ) #ifdef HAVE_RES_GETSERVERS -DNS_STATUS CDECL resolv_get_serverlist( USHORT family, DNS_ADDR_ARRAY *addrs, DWORD *len ) +static DNS_STATUS CDECL resolv_get_serverlist( USHORT family, DNS_ADDR_ARRAY *addrs, DWORD *len ) { struct __res_state *state = &_res; DWORD i, found, total, needed; @@ -386,7 +386,7 @@ DNS_STATUS CDECL resolv_get_serverlist( USHORT family, DNS_ADDR_ARRAY *addrs, DW #else -DNS_STATUS CDECL resolv_get_serverlist( USHORT family, DNS_ADDR_ARRAY *addrs, DWORD *len ) +static DNS_STATUS CDECL resolv_get_serverlist( USHORT family, DNS_ADDR_ARRAY *addrs, DWORD *len ) { DWORD needed, found, i; @@ -451,7 +451,7 @@ DNS_STATUS CDECL resolv_get_serverlist( USHORT family, DNS_ADDR_ARRAY *addrs, DW } #endif -DNS_STATUS CDECL resolv_set_serverlist( const IP4_ARRAY *addrs ) +static DNS_STATUS CDECL resolv_set_serverlist( const IP4_ARRAY *addrs ) { int i; @@ -872,7 +872,7 @@ static void free_record_list( DNS_RECORD *list ) } #define DNS_MAX_PACKET_SIZE 4096 -DNS_STATUS CDECL resolv_query( const char *name, WORD type, DWORD options, DNS_RECORDA **result ) +static DNS_STATUS CDECL resolv_query( const char *name, WORD type, DWORD options, DNS_RECORDA **result ) { DNS_STATUS ret = DNS_ERROR_RCODE_NOT_IMPLEMENTED; unsigned int i, num; -- 2.30.2

Aug. 31, 2021

[PATCH] crypt32: Make gnutls_(un)?initialize() static.

by Francois Gouget

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/crypt32/unixlib.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/unixlib.c b/dlls/crypt32/unixlib.c index 0c2370968e9..dcfca5b1966 100644 --- a/dlls/crypt32/unixlib.c +++ b/dlls/crypt32/unixlib.c @@ -84,7 +84,7 @@ static void gnutls_log( int level, const char *msg ) TRACE( "<%d> %s", level, msg ); } -BOOL gnutls_initialize(void) +static BOOL gnutls_initialize(void) { const char *env_str; int ret; @@ -146,7 +146,7 @@ fail: return FALSE; } -void gnutls_uninitialize(void) +static void gnutls_uninitialize(void) { pgnutls_global_deinit(); dlclose( libgnutls_handle ); -- 2.30.2

Aug. 31, 2021

[PATCH] iphlpapi: Make the adapters_addresses_*() functions static.

by Francois Gouget

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/iphlpapi/iphlpapi_main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index f83271eae97..b2e996a6241 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -832,7 +832,7 @@ static void address_lists_iterate( IP_ADAPTER_ADDRESSES *aa, void (*fn)(void *en } } -void adapters_addresses_free( IP_ADAPTER_ADDRESSES *info ) +static void adapters_addresses_free( IP_ADAPTER_ADDRESSES *info ) { IP_ADAPTER_ADDRESSES *aa; @@ -845,7 +845,7 @@ void adapters_addresses_free( IP_ADAPTER_ADDRESSES *info ) heap_free( info ); } -ULONG adapters_addresses_size( IP_ADAPTER_ADDRESSES *info ) +static ULONG adapters_addresses_size( IP_ADAPTER_ADDRESSES *info ) { IP_ADAPTER_ADDRESSES *aa; ULONG size = 0, align = sizeof(ULONGLONG) - 1; @@ -861,7 +861,7 @@ ULONG adapters_addresses_size( IP_ADAPTER_ADDRESSES *info ) return size; } -void adapters_addresses_copy( IP_ADAPTER_ADDRESSES *dst, IP_ADAPTER_ADDRESSES *src ) +static void adapters_addresses_copy( IP_ADAPTER_ADDRESSES *dst, IP_ADAPTER_ADDRESSES *src ) { char *ptr; DWORD len; @@ -3115,7 +3115,7 @@ static int tcp6_row_owner_cmp( const void *a, const void *b ) * Implementation of GetExtendedTcpTable() which additionally handles TCP_TABLE2 * corresponding to GetTcp(6)Table2() */ -DWORD get_extended_tcp_table( void *table, DWORD *size, BOOL sort, ULONG family, ULONG table_class ) +static DWORD get_extended_tcp_table( void *table, DWORD *size, BOOL sort, ULONG family, ULONG table_class ) { DWORD err, count, needed, i, num = 0, row_size = 0; struct nsi_tcp_conn_key *key; -- 2.30.2

Aug. 31, 2021