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

[PATCH 3/3] ws2_32: Disallow NULL in socket lookups.
by Akihiro Sagawa 24 Aug '21

24 Aug '21

NULL means an unused slot, not a valid socket. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/ws2_32/socket.c | 4 ++++ 1 file changed, 4 insertions(+)

2 1

[PATCH 2/3] ws2_32: Explicitly return WSAENOTSOCK for a file handle in getsockopt() except SO_OPENTYPE.
by Akihiro Sagawa 24 Aug '21

24 Aug '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51671 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/ws2_32/socket.c | 7 +++++++ dlls/ws2_32/tests/sock.c | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-)

3 2

[PATCH 1/3] ws2_32/tests: Add socket option validity tests for a file handle.
by Akihiro Sagawa 24 Aug '21

24 Aug '21

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/ws2_32/tests/sock.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)

2 1

[PATCH] oleaut32: Fully initialize VARIANT structure in VariantInit().
by Nikolay Sivov 24 Aug '21

24 Aug '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- This follows newer behavior, and fixes application I'm testing that's using stack variable: - initializing it; - setting type to VT_I4; - setting only lower data word to 0, leading to occasional garbage in top word. dlls/oleaut32/tests/vartest.c | 13 +++++++++---- dlls/oleaut32/variant.c | 17 +++-------------- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 05efb5a888b..f25a448645c 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -673,11 +673,16 @@ static void _test_bstr_var(unsigned line, const VARIANT *v, const WCHAR *str) static void test_VariantInit(void) { - VARIANT v; + VARIANT v, v2, v3; - memset(&v, -1, sizeof(v)); - VariantInit(&v); - ok(V_VT(&v) == VT_EMPTY, "VariantInit() returned vt %d\n", V_VT(&v)); + memset(&v, -1, sizeof(v)); + memset(&v2, 0, sizeof(v2)); + memset(&v3, -1, sizeof(v3)); + V_VT(&v3) = VT_EMPTY; + + VariantInit(&v); + ok(!memcmp(&v, &v2, sizeof(v)) || + broken(!memcmp(&v, &v3, sizeof(v3)) /* pre Win8 */), "Unexpected contents.\n"); } /* All possible combinations of extra V_VT() flags */ diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 40a1170e247..2c60f920f5e 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -545,24 +545,13 @@ static inline HRESULT VARIANT_ValidateType(VARTYPE vt) /****************************************************************************** * VariantInit [OLEAUT32.8] * - * Initialise a variant. - * - * PARAMS - * pVarg [O] Variant to initialise - * - * RETURNS - * Nothing. - * - * NOTES - * This function simply sets the type of the variant to VT_EMPTY. It does not - * free any existing value, use VariantClear() for that. + * Since Windows 8.1 whole structure is initialized, before that only type field was reset to VT_EMPTY. */ void WINAPI VariantInit(VARIANTARG* pVarg) { - TRACE("(%p)\n", pVarg); + TRACE("(%p)\n", pVarg); - /* Win8.1 zeroes whole struct. Previous implementations don't set any other fields. */ - V_VT(pVarg) = VT_EMPTY; + memset(pVarg, 0, sizeof(*pVarg)); } HRESULT VARIANT_ClearInd(VARIANTARG *pVarg) -- 2.32.0

1 0

[PATCH 6/6] gdi32: Merge enhmetafiledrv.h into emfdc.c.
by Jacek Caban 24 Aug '21

24 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/emfdc.c | 35 ++++++++++++++------ dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 49 ---------------------------- 2 files changed, 25 insertions(+), 59 deletions(-) delete mode 100644 dlls/gdi32/enhmfdrv/enhmetafiledrv.h

2 1

[PATCH 5/6] gdi32: Merge enhmfdrv/bitblt.c into emfdc.c.
by Jacek Caban 24 Aug '21

24 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/Makefile.in | 1 - dlls/gdi32/emfdc.c | 297 +++++++++++++++++++++++- dlls/gdi32/enhmfdrv/bitblt.c | 326 --------------------------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 3 - 4 files changed, 295 insertions(+), 332 deletions(-) delete mode 100644 dlls/gdi32/enhmfdrv/bitblt.c

2 1

[PATCH 4/6] gdi32: Merge enhmfdrv/graphics.c into emfdc.c.
by Jacek Caban 24 Aug '21

24 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/Makefile.in | 1 - dlls/gdi32/emfdc.c | 699 +++++++++++++++++++++- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/graphics.c | 834 --------------------------- 4 files changed, 698 insertions(+), 837 deletions(-) delete mode 100644 dlls/gdi32/enhmfdrv/graphics.c

2 1

[PATCH 3/6] gdi32: Merge enhmfdrv/objects.c into emfdc.c.
by Jacek Caban 24 Aug '21

24 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/Makefile.in | 1 - dlls/gdi32/emfdc.c | 433 ++++++++++++++++++++++++++++ dlls/gdi32/enhmfdrv/objects.c | 514 ---------------------------------- 3 files changed, 433 insertions(+), 515 deletions(-) delete mode 100644 dlls/gdi32/enhmfdrv/objects.c

2 1

[PATCH 2/6] gdi32: Merge enhmfdrv/init.c into emfdc.c.
by Jacek Caban 24 Aug '21

24 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/Makefile.in | 1 - dlls/gdi32/emfdc.c | 291 ++++++++++++++++++++++++++++++++ dlls/gdi32/enhmfdrv/init.c | 333 ------------------------------------- 3 files changed, 291 insertions(+), 334 deletions(-) delete mode 100644 dlls/gdi32/enhmfdrv/init.c

2 1

[PATCH 1/6] gdi32: Move enhmfdrv/dc.c into new emfdc.c file.
by Jacek Caban 24 Aug '21

24 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/Makefile.in | 2 +- dlls/gdi32/{enhmfdrv/dc.c => emfdc.c} | 19 +++++++++++++------ 2 files changed, 14 insertions(+), 7 deletions(-) rename dlls/gdi32/{enhmfdrv/dc.c => emfdc.c} (99%)

2 1