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

[PATCH] iphlpapi: Make the adapters_addresses_*() functions static.
by Francois Gouget Aug. 31, 2021

Aug. 31, 2021

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

2 1

[PATCH] dnsapi: Make the resolv_*() functions static.
by Francois Gouget Aug. 31, 2021

Aug. 31, 2021

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

1 0

[PATCH] crypt32: Make gnutls_(un)?initialize() static.
by Francois Gouget Aug. 31, 2021

Aug. 31, 2021

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

1 0

[PATCH] shlwapi: Fix the length returned by SHFormatDateTimeA().
by Francois Gouget Aug. 31, 2021

Aug. 31, 2021

The ANSI string may be longer than the Unicode one. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This fixes the ja_JP and zh_CN tests. https://test.winehq.org/data/patterns.html#shlwapi:ordinal Hindi still fails because it is a Unicode-only locale so all the underlying kernel32 ANSI functions fail (bug 51407). --- dlls/shlwapi/ordinal.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 52cc3b725fa..a45d75254a9 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -4360,7 +4360,8 @@ INT WINAPI SHFormatDateTimeA(const FILETIME UNALIGNED *fileTime, DWORD *flags, retval = SHFormatDateTimeW(fileTime, flags, bufW, size); if (retval != 0) - WideCharToMultiByte(CP_ACP, 0, bufW, -1, buf, size, NULL, NULL); + /* the ANSI length may differ from the Unicode one */ + retval = WideCharToMultiByte(CP_ACP, 0, bufW, -1, buf, size, NULL, NULL); HeapFree(GetProcessHeap(), 0, bufW); return retval; -- 2.30.2

1 0

[PATCH] d3dx10_39/tests: Enable tests.
by Nikolay Sivov Aug. 31, 2021

Aug. 31, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- configure.ac | 1 + dlls/d3dx10_39/tests/Makefile.in | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 dlls/d3dx10_39/tests/Makefile.in diff --git a/configure.ac b/configure.ac index 594794ed93c..11c43cdce47 100644 --- a/configure.ac +++ b/configure.ac @@ -3085,6 +3085,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3dx10_36) WINE_CONFIG_MAKEFILE(dlls/d3dx10_37) WINE_CONFIG_MAKEFILE(dlls/d3dx10_38) WINE_CONFIG_MAKEFILE(dlls/d3dx10_39) +WINE_CONFIG_MAKEFILE(dlls/d3dx10_39/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx10_40) WINE_CONFIG_MAKEFILE(dlls/d3dx10_40/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx10_41) diff --git a/dlls/d3dx10_39/tests/Makefile.in b/dlls/d3dx10_39/tests/Makefile.in new file mode 100644 index 00000000000..d4554399554 --- /dev/null +++ b/dlls/d3dx10_39/tests/Makefile.in @@ -0,0 +1,6 @@ +TESTDLL = d3dx10_39.dll +IMPORTS = d3dx10_39 ole32 gdi32 +PARENTSRC = ../../d3dx10_43/tests + +C_SRCS = \ + d3dx10.c -- 2.33.0

2 1

[PATCH 1/3] d3dx10/font: Store font description data.
by Nikolay Sivov Aug. 31, 2021

Aug. 31, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3dx10_43/font.c | 26 ++++++++++++++++++++++---- dlls/d3dx10_43/tests/d3dx10.c | 6 +----- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx10_43/font.c b/dlls/d3dx10_43/font.c index 7b2295cc414..77604895903 100644 --- a/dlls/d3dx10_43/font.c +++ b/dlls/d3dx10_43/font.c @@ -32,6 +32,7 @@ struct d3dx_font ID3DX10Font ID3DX10Font_iface; LONG refcount; + D3DX10_FONT_DESCW desc; ID3D10Device *device; }; @@ -97,16 +98,32 @@ static HRESULT WINAPI d3dx_font_GetDevice(ID3DX10Font *iface, ID3D10Device **dev static HRESULT WINAPI d3dx_font_GetDescA(ID3DX10Font *iface, D3DX10_FONT_DESCA *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct d3dx_font *font = impl_from_ID3DX10Font(iface); - return E_NOTIMPL; + TRACE("iface %p, desc %p.\n", iface, desc); + + if (!desc) + return D3DERR_INVALIDCALL; + + memcpy(desc, &font->desc, FIELD_OFFSET(D3DX10_FONT_DESCA, FaceName)); + WideCharToMultiByte(CP_ACP, 0, font->desc.FaceName, -1, desc->FaceName, + ARRAY_SIZE(desc->FaceName), NULL, NULL); + + return S_OK; } static HRESULT WINAPI d3dx_font_GetDescW(ID3DX10Font *iface, D3DX10_FONT_DESCW *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct d3dx_font *font = impl_from_ID3DX10Font(iface); - return E_NOTIMPL; + TRACE("iface %p, desc %p.\n", iface, desc); + + if (!desc) + return D3DERR_INVALIDCALL; + + *desc = font->desc; + + return S_OK; } static BOOL WINAPI d3dx_font_GetTextMetricsA(ID3DX10Font *iface, TEXTMETRICA *metrics) @@ -345,6 +362,7 @@ HRESULT WINAPI D3DX10CreateFontIndirectW(ID3D10Device *device, const D3DX10_FONT object->ID3DX10Font_iface.lpVtbl = &d3dx_font_vtbl; object->refcount = 1; object->device = device; + object->desc = *desc; ID3D10Device_AddRef(device); *font = &object->ID3DX10Font_iface; diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 1b875e4fc09..eec2bfd3206 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -2176,15 +2176,11 @@ static void test_font(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = ID3DX10Font_GetDescA(font, NULL); -todo_wine ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); hr = ID3DX10Font_GetDescA(font, &desc); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -if (SUCCEEDED(hr)) -{ ok(desc.Height == 12, "Unexpected height %d.\n", desc.Height); ok(desc.Width == 8, "Unexpected width %u.\n", desc.Width); ok(desc.Weight == FW_BOLD, "Unexpected weight %u.\n", desc.Weight); @@ -2195,7 +2191,7 @@ if (SUCCEEDED(hr)) ok(desc.Quality == ANTIALIASED_QUALITY, "Unexpected quality %u.\n", desc.Quality); ok(desc.PitchAndFamily == VARIABLE_PITCH, "Unexpected pitch and family %#x.\n", desc.PitchAndFamily); ok(!strcmp(desc.FaceName, "Tahoma"), "Unexpected facename %s.\n", debugstr_a(desc.FaceName)); -} + ID3DX10Font_Release(font); /* GetDC + GetTextMetrics */ -- 2.33.0

2 5

[v3 PATCH 1/5] d3d10/effect: Add a semi-stub for GetShaderDesc().
by Matteo Bruni Aug. 31, 2021

Aug. 31, 2021

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v3 (Matteo): Flatten an else, tiny formatting fixes. dlls/d3d10/effect.c | 84 ++++++++++++++++-------- dlls/d3d10/tests/effect.c | 134 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 184 insertions(+), 34 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index acc7199138b..025ed60d97b 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -6780,12 +6780,64 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetRawValue( /* ID3D10EffectShaderVariable methods */ +static HRESULT d3d10_get_shader_variable(struct d3d10_effect_variable *v, UINT shader_index, + struct d3d10_effect_shader_variable **s) +{ + unsigned int i; + + if (v->type->element_count) + v = &v->elements[0]; + + if (!shader_index) + { + *s = &v->u.shader; + return S_OK; + } + + /* Index is used as an offset from this variable. */ + + for (i = 0; i < v->effect->used_shader_count; ++i) + { + if (v == v->effect->used_shaders[i]) break; + } + + if (i + shader_index >= v->effect->used_shader_count) + { + WARN("Invalid shader index %u.\n", shader_index); + return E_FAIL; + } + + *s = &v->effect->used_shaders[i + shader_index]->u.shader; + return S_OK; +} + static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetShaderDesc( ID3D10EffectShaderVariable *iface, UINT index, D3D10_EFFECT_SHADER_DESC *desc) { - FIXME("iface %p, index %u, desc %p stub!\n", iface, index, desc); + struct d3d10_effect_variable *v = impl_from_ID3D10EffectShaderVariable(iface); + struct d3d10_effect_shader_variable *s; + D3D10_SHADER_DESC shader_desc; + HRESULT hr; - return E_NOTIMPL; + FIXME("iface %p, index %u, desc %p semi-stub.\n", iface, index, desc); + + if (FAILED(hr = d3d10_get_shader_variable(v, index, &s))) + return hr; + + memset(desc, 0, sizeof(*desc)); + if (s->input_signature) + desc->pInputSignature = ID3D10Blob_GetBufferPointer(s->input_signature); + desc->SODecl = s->stream_output_declaration; + if (s->reflection) + { + if (SUCCEEDED(hr = s->reflection->lpVtbl->GetDesc(s->reflection, &shader_desc))) + { + desc->NumInputSignatureEntries = shader_desc.InputParameters; + desc->NumOutputSignatureEntries = shader_desc.OutputParameters; + } + } + + return hr; } static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetVertexShader( @@ -6858,32 +6910,10 @@ static HRESULT d3d10_get_shader_variable_signature(struct d3d10_effect_variable UINT shader_index, UINT element_index, BOOL output, D3D10_SIGNATURE_PARAMETER_DESC *desc) { struct d3d10_effect_shader_variable *s; - unsigned int i; - - if (v->type->element_count) - v = &v->elements[0]; - - if (shader_index == 0) - { - s = &v->u.shader; - } - else - { - /* Index is used as an offset from this variable. */ - - for (i = 0; i < v->effect->used_shader_count; ++i) - { - if (v == v->effect->used_shaders[i]) break; - } - - if (i + shader_index >= v->effect->used_shader_count) - { - WARN("This should crash!\n"); - return E_FAIL; - } + HRESULT hr; - s = &v->effect->used_shaders[i + shader_index]->u.shader; - } + if (FAILED(hr = d3d10_get_shader_variable(v, shader_index, &s))) + return hr; if (!s->reflection) return D3DERR_INVALIDCALL; diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 5fcece4695b..7645b6c45ab 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -3642,14 +3642,10 @@ if (0) v = effect->lpVtbl->GetVariableByName(effect, "g_so"); gs = v->lpVtbl->AsShader(v); hr = gs->lpVtbl->GetShaderDesc(gs, 0, &shaderdesc); -todo_wine ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); - if (hr == S_OK) - { - ok(!shaderdesc.IsInline, "Unexpected inline flag.\n"); - ok(!strcmp(shaderdesc.SODecl, "SV_POSITION.x"), "Unexpected stream output declaration %s.\n", - shaderdesc.SODecl); - } + ok(!shaderdesc.IsInline, "Unexpected inline flag.\n"); + ok(!strcmp(shaderdesc.SODecl, "SV_POSITION.x"), "Unexpected stream output declaration %s.\n", + shaderdesc.SODecl); /* Signature description */ v = effect->lpVtbl->GetVariableByName(effect, "p"); @@ -5865,6 +5861,128 @@ static void test_effect_resource_variable(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_effect_optimize(void) +{ + D3D10_EFFECT_SHADER_DESC shaderdesc; + ID3D10EffectShaderVariable *gs; + ID3D10EffectVariable *v; + ID3D10Effect *effect; + ID3D10Device *device; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + + hr = create_effect(fx_local_shader, 0, device, NULL, &effect); + ok(SUCCEEDED(hr), "Failed to create an effect.\n"); + + v = effect->lpVtbl->GetVariableByName(effect, "g_so"); + + gs = v->lpVtbl->AsShader(v); + hr = gs->lpVtbl->GetShaderDesc(gs, 0, &shaderdesc); + ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); + ok(!!shaderdesc.pInputSignature, "Expected input signature.\n"); + ok(!shaderdesc.IsInline, "Unexpected inline flag.\n"); +todo_wine { + ok(!!shaderdesc.pBytecode, "Expected bytecode.\n"); + ok(!!shaderdesc.BytecodeLength, "Unexpected bytecode length.\n"); +} + ok(!strcmp(shaderdesc.SODecl, "SV_POSITION.x"), "Unexpected stream output declaration %s.\n", shaderdesc.SODecl); + ok(!!shaderdesc.NumInputSignatureEntries, "Unexpected input signature count.\n"); + ok(!!shaderdesc.NumOutputSignatureEntries, "Unexpected output signature count.\n"); + + hr = effect->lpVtbl->Optimize(effect); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = gs->lpVtbl->GetShaderDesc(gs, 0, &shaderdesc); + ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); + ok(!!shaderdesc.pInputSignature, "Expected input signature.\n"); + ok(!shaderdesc.IsInline, "Unexpected inline flag.\n"); + ok(!shaderdesc.pBytecode, "Unexpected bytecode.\n"); + ok(!shaderdesc.BytecodeLength, "Unexpected bytecode length.\n"); +todo_wine { + ok(!shaderdesc.SODecl, "Unexpected stream output declaration %p.\n", shaderdesc.SODecl); + ok(!shaderdesc.NumInputSignatureEntries, "Unexpected input signature count.\n"); + ok(!shaderdesc.NumOutputSignatureEntries, "Unexpected output signature count.\n"); +} + effect->lpVtbl->Release(effect); + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + +static void test_effect_shader_description(void) +{ + D3D10_EFFECT_SHADER_DESC shaderdesc; + ID3D10EffectShaderVariable *s; + ID3D10EffectVariable *v; + ID3D10Effect *effect; + ID3D10Device *device; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + + hr = create_effect(fx_local_shader, 0, device, NULL, &effect); + ok(SUCCEEDED(hr), "Failed to create an effect.\n"); + + v = effect->lpVtbl->GetVariableByName(effect, "v0"); + + /* GetShaderDesc() is indexing through all shaders in the effect.*/ + s = v->lpVtbl->AsShader(v); + hr = s->lpVtbl->GetShaderDesc(s, 0, &shaderdesc); + ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); + ok(!shaderdesc.BytecodeLength, "Unexpected bytecode length %u.\n", shaderdesc.BytecodeLength); + hr = s->lpVtbl->GetShaderDesc(s, 1, &shaderdesc); + ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); + ok(!shaderdesc.BytecodeLength, "Unexpected bytecode length %u.\n", shaderdesc.BytecodeLength); + hr = s->lpVtbl->GetShaderDesc(s, 2, &shaderdesc); + ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); + ok(!shaderdesc.BytecodeLength, "Unexpected bytecode length %u.\n", shaderdesc.BytecodeLength); + hr = s->lpVtbl->GetShaderDesc(s, 3, &shaderdesc); + ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); +todo_wine + ok(shaderdesc.BytecodeLength == 424, "Unexpected bytecode length %u.\n", + shaderdesc.BytecodeLength); + hr = s->lpVtbl->GetShaderDesc(s, 4, &shaderdesc); + ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); +todo_wine + ok(shaderdesc.BytecodeLength == 424, "Unexpected bytecode length %u.\n", + shaderdesc.BytecodeLength); + hr = s->lpVtbl->GetShaderDesc(s, 5, &shaderdesc); + ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); +todo_wine + ok(shaderdesc.BytecodeLength == 420, "Unexpected bytecode length %u.\n", + shaderdesc.BytecodeLength); + hr = s->lpVtbl->GetShaderDesc(s, 6, &shaderdesc); + ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); +todo_wine + ok(shaderdesc.BytecodeLength == 516, "Unexpected bytecode length %u.\n", + shaderdesc.BytecodeLength); + ok(!shaderdesc.SODecl, "Unexpected SO declaration %p.\n", shaderdesc.SODecl); + hr = s->lpVtbl->GetShaderDesc(s, 7, &shaderdesc); + ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); +todo_wine + ok(shaderdesc.BytecodeLength == 516, "Unexpected bytecode length %u.\n", + shaderdesc.BytecodeLength); + ok(!strcmp(shaderdesc.SODecl, "SV_POSITION.x"), "Unexpected SO declaration %s.\n", + wine_dbgstr_a(shaderdesc.SODecl)); + + effect->lpVtbl->Release(effect); + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(effect) { test_effect_constant_buffer_type(); @@ -5881,4 +5999,6 @@ START_TEST(effect) test_effect_vector_variable(); test_effect_matrix_variable(); test_effect_resource_variable(); + test_effect_optimize(); + test_effect_shader_description(); } -- 2.26.3

1 0

[PATCH] comctl32: Fix an ASCII / ANSI mixup in a comment.
by Francois Gouget Aug. 31, 2021

Aug. 31, 2021

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/comctl32/toolbar.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 2585e11530e..cf1dc42449b 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -156,7 +156,7 @@ typedef struct BOOL bAnchor; /* anchor highlight enabled */ BOOL bDoRedraw; /* Redraw status */ BOOL bDragOutSent; /* has TBN_DRAGOUT notification been sent for this drag? */ - BOOL bUnicode; /* Notifications are ASCII (FALSE) or Unicode (TRUE)? */ + BOOL bUnicode; /* Notifications are ANSI (FALSE) or Unicode (TRUE)? */ BOOL bCaptured; /* mouse captured? */ DWORD dwStyle; /* regular toolbar style */ DWORD dwExStyle; /* extended toolbar style */ -- 2.30.2

1 0

[tools] testbot/WineRunTask: Extract the tests to a WineTest.exe subdirectory.
by Francois Gouget Aug. 31, 2021

Aug. 31, 2021

This simplifies shielding all the test executables from anti-virus tools like Microsoft Defender by excluding the directory WineTest is in. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Next the VMs will need to be updated to explicitly tell the anti-virus to not scan for viruses in the directory tree where we put WineTest.exe. --- testbot/bin/WineRunTask.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index db274b489..ac9091d6c 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -478,7 +478,7 @@ elsif ($Step->Type eq "suite") $Info .= $VM->Details; } # Escape the arguments for cmd's command interpreter - $Script .= "-q -o $RptFileName -t $Tag -m ". BatchQuote($AdminEMail) ." -i ". BatchQuote($Info) ."\r\n"; + $Script .= "-q -d tests -o $RptFileName -t $Tag -m ". BatchQuote($AdminEMail) ." -i ". BatchQuote($Info) ."\r\n"; $Script .= "$FileName -q -s $RptFileName\r\n" if (!$Mission->{nosubmit}); } Debug(Elapsed($Start), " Sending the script: [$Script]\n"); -- 2.30.2

1 0

[PATCH 7/8] gdi32: Use NtGdiCreateDIBitmapInternal for CreateDIBitmap.
by Jacek Caban Aug. 31, 2021

Aug. 31, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dib.c | 29 ++++++++++++----------------- dlls/gdi32/objects.c | 29 +++++++++++++++++++++++++++++ include/ntgdi.h | 4 ++++ 3 files changed, 45 insertions(+), 17 deletions(-)

2 1