January 2022 - Wine-Devel - list.winehq.org

Re: [PATCH] iphlpapi: Avoid use of uninitialized variable

by Huw Davies

On Thu, Jan 27, 2022 at 11:18:53PM +0100, Gerald Pfeifer wrote: > In gateway_and_prefix_addresses_alloc prefix_len isn't set in the > error case, but used unconditionally. Avoid this by initializing > upon declaration. > > (Identified by GCC 12.) It's actually not used unconditionally, since it's only used if sockaddr.si_family is non-zero, in which case it will have been initialised. It makes more sense to zero-init where sockaddr in also initialised since we're in a loop. I've sent in v2. Huw.

Jan. 28, 2022

Re: [PATCH v4 1/4] wdscore: Implement CurrentIP.

by Giovanni Mascellani

Hi, Il 28/01/22 00:20, Mohamad Al-Jaf ha scritto: > Since WINAPI cleans the stack, it doesn't make sense to use it in > this context. Calling conventions are not just about cleaning the stack, though it's true that for a function that takes no argument and just return a pointer most of the differences make little sense. Name mangling is something that (on i386) changes between WINAPI and CDECL, but I don't know how that appears in DLL linking, so I don't know how to help you. BTW, you mention bug https://bugs.winehq.org/show_bug.cgi?id=51850 in your patch description. Does the patch solve the bug? Is there any different if you use STDCALL/WINAPI or CDECL? If there is, choose the alternative that fixes the application. If they are the same, I guess I'd choose WINAPI. Giovanni.

Jan. 28, 2022

Re: [PATCH] dwrite/tests: Remove remaining kernel32 heap calls.

by Saulius Krasuckas

Hello folks, * On 2022-01-28 10:29, Nikolay Sivov wrote: > --- a/dlls/dwrite/tests/analyzer.c > +++ b/dlls/dwrite/tests/analyzer.c ... > @@ -155,7 +152,7 @@ static inline void flush_sequence(struct > call_sequence **seg, int sequence_index > { > struct call_sequence *call_seq = seg[sequence_index]; > > - HeapFree(GetProcessHeap(), 0, call_seq->sequence); > + free(call_seq->sequence); > call_seq->sequence = NULL; > call_seq->count = call_seq->size = 0; > } may I ask: what's about all the HeapAlloc() => malloc() huss inside the test (or any tests) ? 15y ago the idea was to use as much of WinAPI as possible (at least in DLLs implementation). I say the project is splitting modules into PE-part and the *nix-part these days. Looks nice. But why to reverse the HeapAlloc() usage in tests? S.

Jan. 28, 2022

[PATCH v2] iphlpapi: Zero-init prefix_len to avoid a compiler warning.

by Huw Davies

From: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index c94f869c9f9..387589cc03d 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1057,6 +1057,7 @@ static DWORD gateway_and_prefix_addresses_alloc( IP_ADAPTER_ADDRESSES *aa, ULONG if (flags & GAA_FLAG_INCLUDE_PREFIX) { memset( &sockaddr, 0, sizeof(sockaddr) ); + prefix_len = 0; if (family == AF_INET) { if (!key4->next_hop.s_addr) -- 2.23.0

Jan. 28, 2022

Re: [PATCH 3/3] hidclass.sys: Add input.inf that matches all HID devices.

by Rémi Bernon

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com>

Jan. 28, 2022

Re: [PATCH 2/3] winebus.sys: Process quirky DualSense bluetooth reports.

by Rémi Bernon

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com>

Jan. 28, 2022

Re: [PATCH 1/3] winebus.sys: Enable extended BT reports for DualShock 4 controllers when requested.

by Rémi Bernon

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com>

Jan. 28, 2022

[PATCH] dwrite/tests: Remove remaining kernel32 heap calls.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/tests/analyzer.c | 11 ++++------- dlls/dwrite/tests/font.c | 35 +++++++++++++++++++---------------- dlls/dwrite/tests/layout.c | 14 ++++++-------- 3 files changed, 29 insertions(+), 31 deletions(-) diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 875503ed5a3..d1d44c94012 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -134,16 +134,13 @@ static void add_call(struct call_sequence **seq, int sequence_index, const struc if (!call_seq->sequence) { call_seq->size = 10; - call_seq->sequence = HeapAlloc(GetProcessHeap(), 0, - call_seq->size * sizeof (struct call_entry)); + call_seq->sequence = malloc(call_seq->size * sizeof(*call_seq->sequence)); } if (call_seq->count == call_seq->size) { call_seq->size *= 2; - call_seq->sequence = HeapReAlloc(GetProcessHeap(), 0, - call_seq->sequence, - call_seq->size * sizeof (struct call_entry)); + call_seq->sequence = realloc(call_seq->sequence, call_seq->size * sizeof(*call_seq->sequence)); } assert(call_seq->sequence); @@ -155,7 +152,7 @@ static inline void flush_sequence(struct call_sequence **seg, int sequence_index { struct call_sequence *call_seq = seg[sequence_index]; - HeapFree(GetProcessHeap(), 0, call_seq->sequence); + free(call_seq->sequence); call_seq->sequence = NULL; call_seq->count = call_seq->size = 0; } @@ -165,7 +162,7 @@ static void init_call_sequences(struct call_sequence **seq, int n) int i; for (i = 0; i < n; i++) - seq[i] = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct call_sequence)); + seq[i] = calloc(1, sizeof(*seq[i])); } static void test_uint(UINT32 actual, UINT32 expected, const char *name, const struct testcontext *ctxt) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 26f94a1e3b1..10722fee444 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -783,11 +783,13 @@ static ULONG WINAPI fontdatastream_AddRef(IDWriteFontFileStream *iface) static ULONG WINAPI fontdatastream_Release(IDWriteFontFileStream *iface) { - struct test_fontdatastream *This = impl_from_IDWriteFontFileStream(iface); - ULONG ref = InterlockedDecrement(&This->ref); - if (ref == 0) - HeapFree(GetProcessHeap(), 0, This); - return ref; + struct test_fontdatastream *stream = impl_from_IDWriteFontFileStream(iface); + ULONG refcount = InterlockedDecrement(&stream->ref); + + if (!refcount) + free(stream); + + return refcount; } static HRESULT WINAPI fontdatastream_ReadFileFragment(IDWriteFontFileStream *iface, void const **fragment_start, UINT64 offset, UINT64 fragment_size, void **fragment_context) @@ -836,16 +838,17 @@ static const IDWriteFontFileStreamVtbl fontdatastreamvtbl = static HRESULT create_fontdatastream(LPVOID data, UINT size, IDWriteFontFileStream** iface) { - struct test_fontdatastream *This = HeapAlloc(GetProcessHeap(), 0, sizeof(struct test_fontdatastream)); - if (!This) + struct test_fontdatastream *object = calloc(1, sizeof(*object)); + if (!object) return E_OUTOFMEMORY; - This->data = data; - This->size = size; - This->ref = 1; - This->IDWriteFontFileStream_iface.lpVtbl = &fontdatastreamvtbl; + object->IDWriteFontFileStream_iface.lpVtbl = &fontdatastreamvtbl; + object->ref = 1; + object->data = data; + object->size = size; + + *iface = &object->IDWriteFontFileStream_iface; - *iface = &This->IDWriteFontFileStream_iface; return S_OK; } @@ -6014,7 +6017,7 @@ static void test_CreateGlyphRunAnalysis(void) ok(!IsRectEmpty(&rect), "Unexpected empty bbox.\n"); size = (rect.right - rect.left) * (rect.bottom - rect.top); - bits = HeapAlloc(GetProcessHeap(), 0, size); + bits = malloc(size); hr = IDWriteGlyphRunAnalysis_CreateAlphaTexture(analysis, DWRITE_TEXTURE_ALIASED_1x1, &rect, bits, size); ok(hr == S_OK, "Failed to get alpha texture, hr %#x.\n", hr); @@ -6029,7 +6032,7 @@ static void test_CreateGlyphRunAnalysis(void) todo_wine ok(hr == DWRITE_E_UNSUPPORTEDOPERATION, "Unexpected hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, bits); + free(bits); hr = IDWriteFactory_CreateCustomRenderingParams(factory, 0.1f, 0.0f, 1.0f, DWRITE_PIXEL_GEOMETRY_FLAT, DWRITE_RENDERING_MODE_NATURAL, &params); @@ -6095,7 +6098,7 @@ static void test_CreateGlyphRunAnalysis(void) ok(!IsRectEmpty(&rect), "Unexpected empty bbox.\n"); size = (rect.right - rect.left) * (rect.bottom - rect.top); - bits = HeapAlloc(GetProcessHeap(), 0, size); + bits = malloc(size); hr = IDWriteGlyphRunAnalysis_CreateAlphaTexture(analysis, DWRITE_TEXTURE_ALIASED_1x1, &rect, bits, size); ok(hr == S_OK, "Failed to get alpha texture, hr %#x.\n", hr); @@ -6110,7 +6113,7 @@ static void test_CreateGlyphRunAnalysis(void) todo_wine ok(hr == DWRITE_E_UNSUPPORTEDOPERATION, "Unexpected hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, bits); + free(bits); IDWriteGlyphRunAnalysis_Release(analysis); diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 3a6add954d9..95166376ac7 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -343,14 +343,12 @@ static void add_call(struct drawcall_sequence **seq, int sequence_index, const s if (!call_seq->sequence) { call_seq->size = 10; - call_seq->sequence = HeapAlloc(GetProcessHeap(), 0, call_seq->size * sizeof (struct drawcall_entry)); + call_seq->sequence = malloc(call_seq->size * sizeof(*call_seq->sequence)); } if (call_seq->count == call_seq->size) { call_seq->size *= 2; - call_seq->sequence = HeapReAlloc(GetProcessHeap(), 0, - call_seq->sequence, - call_seq->size * sizeof (struct drawcall_entry)); + call_seq->sequence = realloc(call_seq->sequence, call_seq->size * sizeof(*call_seq->sequence)); } assert(call_seq->sequence); @@ -361,7 +359,7 @@ static inline void flush_sequence(struct drawcall_sequence **seg, int sequence_i { struct drawcall_sequence *call_seq = seg[sequence_index]; - HeapFree(GetProcessHeap(), 0, call_seq->sequence); + free(call_seq->sequence); call_seq->sequence = NULL; call_seq->count = call_seq->size = 0; } @@ -371,7 +369,7 @@ static void init_call_sequences(struct drawcall_sequence **seq, int n) int i; for (i = 0; i < n; i++) - seq[i] = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct drawcall_sequence)); + seq[i] = calloc(1, sizeof(*seq[i])); } static void ok_sequence_(struct drawcall_sequence **seq, int sequence_index, @@ -879,7 +877,7 @@ static ULONG WINAPI testeffect_Release(IUnknown *iface) LONG ref = InterlockedDecrement(&effect->ref); if (!ref) - HeapFree(GetProcessHeap(), 0, effect); + free(effect); return ref; } @@ -894,7 +892,7 @@ static IUnknown *create_test_effect(void) { struct test_effect *effect; - effect = HeapAlloc(GetProcessHeap(), 0, sizeof(*effect)); + effect = calloc(1, sizeof(*effect)); effect->IUnknown_iface.lpVtbl = &testeffectvtbl; effect->ref = 1; -- 2.34.1

Jan. 28, 2022

Re: [PATCH 07/24] mf/tests: Avoid "misleading indentation" warnings.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>

Jan. 28, 2022

Re: [PATCH vkd3d v5 5/6] vkd3d-shader/hlsl: Remove Texture3DArrays from lexer and parser.

by Giovanni Mascellani

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Il 27/01/22 19:31, Francisco Casas ha scritto: > Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> > > --- > > For they don't exist. *mystic noises* > > Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> > --- > libs/vkd3d-shader/hlsl.l | 1 - > libs/vkd3d-shader/hlsl.y | 1 - > 2 files changed, 2 deletions(-) > > diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l > index e9281ec3..a37e5d88 100644 > --- a/libs/vkd3d-shader/hlsl.l > +++ b/libs/vkd3d-shader/hlsl.l > @@ -131,7 +131,6 @@ Texture2DMS {return KW_TEXTURE2DMS; } > Texture2DMSArray {return KW_TEXTURE2DMSARRAY; } > texture3D {return KW_TEXTURE3D; } > Texture3D {return KW_TEXTURE3D; } > -Texture3DArray {return KW_TEXTURE3DARRAY; } > textureCUBE {return KW_TEXTURECUBE; } > TextureCube {return KW_TEXTURECUBE; } > true {return KW_TRUE; } > diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y > index 2f1bd447..ec688764 100644 > --- a/libs/vkd3d-shader/hlsl.y > +++ b/libs/vkd3d-shader/hlsl.y > @@ -2137,7 +2137,6 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl > %token KW_TEXTURE2DMS > %token KW_TEXTURE2DMSARRAY > %token KW_TEXTURE3D > -%token KW_TEXTURE3DARRAY > %token KW_TEXTURECUBE > %token KW_TRUE > %token KW_TYPEDEF

Jan. 28, 2022