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

Jacek Caban : gdi32: Handle metafiles directly in SelectPalette.
by Alexandre Julliard 09 Aug '21

09 Aug '21

Module: wine Branch: master Commit: c589da991cf784de6980aa8034e35660e666f7f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c589da991cf784de6980aa80… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 9 11:30:56 2021 +0200 gdi32: Handle metafiles directly in SelectPalette. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/enhmfdrv/objects.c | 18 ++++++++---------- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 18 ++++++++++++++++++ dlls/gdi32/metafile.c | 2 +- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - dlls/gdi32/mfdrv/objects.c | 20 +++++++++----------- dlls/gdi32/palette.c | 28 ++-------------------------- 10 files changed, 42 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c589da991cf784de6980…

1 0

Jacek Caban : gdi32: Handle metafiles directly in RealizePalette.
by Alexandre Julliard 09 Aug '21

09 Aug '21

Module: wine Branch: master Commit: acf56f57e85f5d4b282714098027f4d4e76a8908 URL: https://source.winehq.org/git/wine.git/?a=commit;h=acf56f57e85f5d4b28271409… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 9 11:31:13 2021 +0200 gdi32: Handle metafiles directly in RealizePalette. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 11 ++++++ dlls/gdi32/metafile.c | 2 +- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - dlls/gdi32/mfdrv/objects.c | 19 ++-------- dlls/gdi32/ntgdi_private.h | 1 - dlls/gdi32/palette.c | 20 ----------- dlls/gdi32/tests/metafile.c | 81 ++++++++++++++++++++++++++++++++++++++++++ 9 files changed, 98 insertions(+), 40 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=acf56f57e85f5d4b2827…

1 0

Ziqing Hui : d2d1: Implement d2d_effect_GetInputCount().
by Alexandre Julliard 09 Aug '21

09 Aug '21

Module: wine Branch: master Commit: d6fe15b8f5110dcf29d561b457a5e805c25093d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6fe15b8f5110dcf29d561b4… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Sun Aug 8 12:40:32 2021 +0800 d2d1: Implement d2d_effect_GetInputCount(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 5 ++++- dlls/d2d1/device.c | 8 +++++++- dlls/d2d1/effect.c | 25 +++++++++++++++++++++---- dlls/d2d1/tests/d2d1.c | 2 +- 4 files changed, 33 insertions(+), 7 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index ce99e7c3432..48d15dfcf22 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -572,9 +572,12 @@ struct d2d_effect LONG refcount; ID2D1Factory *factory; + ID2D1Image **inputs; + size_t inputs_size; + size_t input_count; }; -void d2d_effect_init(struct d2d_effect *effect, ID2D1Factory *factory) DECLSPEC_HIDDEN; +HRESULT d2d_effect_init(struct d2d_effect *effect, ID2D1Factory *factory) DECLSPEC_HIDDEN; static inline BOOL d2d_array_reserve(void **elements, size_t *capacity, size_t count, size_t size) { diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 0647bc57fc3..d8704f1b43b 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1887,13 +1887,19 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateEffect(ID2D1DeviceCont { struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); struct d2d_effect *object; + HRESULT hr; FIXME("iface %p, effect_id %s, effect %p stub!\n", iface, debugstr_guid(effect_id), effect); if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; - d2d_effect_init(object, context->factory); + if (FAILED(hr = d2d_effect_init(object, context->factory))) + { + WARN("Failed to initialize effect, hr %#x.\n", hr); + heap_free(object); + return hr; + } TRACE("Created effect %p.\n", object); *effect = &object->ID2D1Effect_iface; diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 40dd2187953..acf83ab1b02 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -25,6 +25,12 @@ static inline struct d2d_effect *impl_from_ID2D1Effect(ID2D1Effect *iface) return CONTAINING_RECORD(iface, struct d2d_effect, ID2D1Effect_iface); } +static void d2d_effect_cleanup(struct d2d_effect *effect) +{ + heap_free(effect->inputs); + ID2D1Factory_Release(effect->factory); +} + static HRESULT STDMETHODCALLTYPE d2d_effect_QueryInterface(ID2D1Effect *iface, REFIID iid, void **out) { struct d2d_effect *effect = impl_from_ID2D1Effect(iface); @@ -72,7 +78,7 @@ static ULONG STDMETHODCALLTYPE d2d_effect_Release(ID2D1Effect *iface) if (!refcount) { - ID2D1Factory_Release(effect->factory); + d2d_effect_cleanup(effect); heap_free(effect); } @@ -183,9 +189,11 @@ static void STDMETHODCALLTYPE d2d_effect_GetInput(ID2D1Effect *iface, UINT32 ind static UINT32 STDMETHODCALLTYPE d2d_effect_GetInputCount(ID2D1Effect *iface) { - FIXME("iface %p stub!\n", iface); + struct d2d_effect *effect = impl_from_ID2D1Effect(iface); - return 0; + TRACE("iface %p.\n", iface); + + return effect->input_count; } static void STDMETHODCALLTYPE d2d_effect_GetOutput(ID2D1Effect *iface, ID2D1Image **output) @@ -269,10 +277,19 @@ static const ID2D1ImageVtbl d2d_effect_image_vtbl = d2d_effect_image_GetFactory, }; -void d2d_effect_init(struct d2d_effect *effect, ID2D1Factory *factory) +HRESULT d2d_effect_init(struct d2d_effect *effect, ID2D1Factory *factory) { effect->ID2D1Effect_iface.lpVtbl = &d2d_effect_vtbl; effect->ID2D1Image_iface.lpVtbl = &d2d_effect_image_vtbl; effect->refcount = 1; + + effect->input_count = 1; + if (!d2d_array_reserve((void **)&effect->inputs, &effect->inputs_size, + effect->input_count, sizeof(*effect->inputs))) + return E_OUTOFMEMORY; + memset(effect->inputs, 0, sizeof(*effect->inputs) * effect->input_count); + ID2D1Factory_AddRef(effect->factory = factory); + + return S_OK; } diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 146952d7418..64d9765e866 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9802,7 +9802,7 @@ static void test_effect(BOOL d3d11) } input_count = ID2D1Effect_GetInputCount(effect); - todo_wine + todo_wine_if(test->default_input_count != 1) ok (input_count == test->default_input_count, "Got unexpected input count %u, expected %u.\n", input_count, test->default_input_count);

1 0

Ziqing Hui : d2d1: Add a properties list for builtin effects.
by Alexandre Julliard 09 Aug '21

09 Aug '21

Module: wine Branch: master Commit: b2b73446e572cc321e5f961021ba781b18b98263 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2b73446e572cc321e5f9610… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Sun Aug 8 12:40:33 2021 +0800 d2d1: Add a properties list for builtin effects. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 2 +- dlls/d2d1/device.c | 2 +- dlls/d2d1/effect.c | 41 +++++++++++++++++++++++++++++++++-------- dlls/d2d1/tests/d2d1.c | 1 - 4 files changed, 35 insertions(+), 11 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 48d15dfcf22..88c712cf51c 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -577,7 +577,7 @@ struct d2d_effect size_t input_count; }; -HRESULT d2d_effect_init(struct d2d_effect *effect, ID2D1Factory *factory) DECLSPEC_HIDDEN; +HRESULT d2d_effect_init(struct d2d_effect *effect, ID2D1Factory *factory, const CLSID *effect_id) DECLSPEC_HIDDEN; static inline BOOL d2d_array_reserve(void **elements, size_t *capacity, size_t count, size_t size) { diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index d8704f1b43b..c6ef2e28690 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1894,7 +1894,7 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateEffect(ID2D1DeviceCont if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = d2d_effect_init(object, context->factory))) + if (FAILED(hr = d2d_effect_init(object, context->factory, effect_id))) { WARN("Failed to initialize effect, hr %#x.\n", hr); heap_free(object); diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index acf83ab1b02..c884c3b8d4f 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -20,6 +20,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d); +struct d2d_effect_info +{ + const CLSID *clsid; + UINT32 default_input_count; +}; + +static const struct d2d_effect_info builtin_effects[] = +{ + {&CLSID_D2D12DAffineTransform, 1}, + {&CLSID_D2D13DPerspectiveTransform, 1}, + {&CLSID_D2D1Composite, 2} +}; + static inline struct d2d_effect *impl_from_ID2D1Effect(ID2D1Effect *iface) { return CONTAINING_RECORD(iface, struct d2d_effect, ID2D1Effect_iface); @@ -277,19 +290,31 @@ static const ID2D1ImageVtbl d2d_effect_image_vtbl = d2d_effect_image_GetFactory, }; -HRESULT d2d_effect_init(struct d2d_effect *effect, ID2D1Factory *factory) +HRESULT d2d_effect_init(struct d2d_effect *effect, ID2D1Factory *factory, const CLSID *effect_id) { + unsigned int i; + effect->ID2D1Effect_iface.lpVtbl = &d2d_effect_vtbl; effect->ID2D1Image_iface.lpVtbl = &d2d_effect_image_vtbl; effect->refcount = 1; - effect->input_count = 1; - if (!d2d_array_reserve((void **)&effect->inputs, &effect->inputs_size, - effect->input_count, sizeof(*effect->inputs))) - return E_OUTOFMEMORY; - memset(effect->inputs, 0, sizeof(*effect->inputs) * effect->input_count); + for (i = 0; i < ARRAY_SIZE(builtin_effects); ++i) + { + if (IsEqualGUID(effect_id, builtin_effects[i].clsid)) + { + effect->input_count = builtin_effects[i].default_input_count; - ID2D1Factory_AddRef(effect->factory = factory); + if (!d2d_array_reserve((void **)&effect->inputs, &effect->inputs_size, + effect->input_count, sizeof(*effect->inputs))) + return E_OUTOFMEMORY; + memset(effect->inputs, 0, sizeof(*effect->inputs) * effect->input_count); - return S_OK; + ID2D1Factory_AddRef(effect->factory = factory); + + return S_OK; + } + } + + WARN("Unsupported effect clsid %s.\n", debugstr_guid(effect_id)); + return E_FAIL; } diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 64d9765e866..36882dc4918 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9802,7 +9802,6 @@ static void test_effect(BOOL d3d11) } input_count = ID2D1Effect_GetInputCount(effect); - todo_wine_if(test->default_input_count != 1) ok (input_count == test->default_input_count, "Got unexpected input count %u, expected %u.\n", input_count, test->default_input_count);

1 0

Ziqing Hui : d2d1: Implement d2d_effect_SetInput().
by Alexandre Julliard 09 Aug '21

09 Aug '21

Module: wine Branch: master Commit: d5fb0dec564c6ddd2687e34f5010e36088ccdc9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5fb0dec564c6ddd2687e34f… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Sun Aug 8 12:40:35 2021 +0800 d2d1: Implement d2d_effect_SetInput(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/effect.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index c884c3b8d4f..951ad9c5101 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -40,6 +40,13 @@ static inline struct d2d_effect *impl_from_ID2D1Effect(ID2D1Effect *iface) static void d2d_effect_cleanup(struct d2d_effect *effect) { + unsigned int i; + + for (i = 0; i < effect->input_count; ++i) + { + if (effect->inputs[i]) + ID2D1Image_Release(effect->inputs[i]); + } heap_free(effect->inputs); ID2D1Factory_Release(effect->factory); } @@ -185,7 +192,17 @@ static HRESULT STDMETHODCALLTYPE d2d_effect_GetSubProperties(ID2D1Effect *iface, static void STDMETHODCALLTYPE d2d_effect_SetInput(ID2D1Effect *iface, UINT32 index, ID2D1Image *input, BOOL invalidate) { - FIXME("iface %p, index %u, input %p, invalidate %d stub!\n", iface, index, input, invalidate); + struct d2d_effect *effect = impl_from_ID2D1Effect(iface); + + TRACE("iface %p, index %u, input %p, invalidate %#x.\n", iface, index, input, invalidate); + + if (index >= effect->input_count) + return; + + ID2D1Image_AddRef(input); + if (effect->inputs[index]) + ID2D1Image_Release(effect->inputs[index]); + effect->inputs[index] = input; } static HRESULT STDMETHODCALLTYPE d2d_effect_SetInputCount(ID2D1Effect *iface, UINT32 count)

1 0

Ziqing Hui : d2d1: Implement d2d_effect_GetInput().
by Alexandre Julliard 09 Aug '21

09 Aug '21

Module: wine Branch: master Commit: 8bf26038381169ea589327c03899f9d5b29ecb50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bf26038381169ea589327c0… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Sun Aug 8 12:40:36 2021 +0800 d2d1: Implement d2d_effect_GetInput(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/effect.c | 9 ++++++++- dlls/d2d1/tests/d2d1.c | 7 +------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 951ad9c5101..560d87479a9 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -214,7 +214,14 @@ static HRESULT STDMETHODCALLTYPE d2d_effect_SetInputCount(ID2D1Effect *iface, UI static void STDMETHODCALLTYPE d2d_effect_GetInput(ID2D1Effect *iface, UINT32 index, ID2D1Image **input) { - FIXME("iface %p, index %u, input %p stub!\n", iface, index, input); + struct d2d_effect *effect = impl_from_ID2D1Effect(iface); + + TRACE("iface %p, index %u, input %p.\n", iface, index, input); + + if (index < effect->input_count && effect->inputs[index]) + ID2D1Image_AddRef(*input = effect->inputs[index]); + else + *input = NULL; } static UINT32 STDMETHODCALLTYPE d2d_effect_GetInputCount(ID2D1Effect *iface) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 36882dc4918..a6f7ac88d0d 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9824,7 +9824,6 @@ static void test_effect(BOOL d3d11) { winetest_push_context("Input %u", j); ID2D1Effect_GetInput(effect, j, &image_a); - todo_wine ok(image_a == NULL, "Got unexpected image_a %p.\n", image_a); winetest_pop_context(); } @@ -9845,14 +9844,11 @@ static void test_effect(BOOL d3d11) ID2D1Effect_GetInput(effect, j, &image_a); if (j == 0) { - todo_wine ok(image_a == (ID2D1Image *)bitmap, "Got unexpected image_a %p.\n", image_a); - if (image_a == (ID2D1Image *)bitmap) - ID2D1Image_Release(image_a); + ID2D1Image_Release(image_a); } else { - todo_wine ok(image_a == NULL, "Got unexpected image_a %p.\n", image_a); } winetest_pop_context(); @@ -9864,7 +9860,6 @@ static void test_effect(BOOL d3d11) image_a = (ID2D1Image *)0xdeadbeef; ID2D1Effect_SetInput(effect, j, (ID2D1Image *)bitmap, FALSE); ID2D1Effect_GetInput(effect, j, &image_a); - todo_wine ok(image_a == NULL, "Got unexpected image_a %p.\n", image_a); winetest_pop_context(); }

1 0

Hugh McMaster : conhost: Use correct size when storing font FaceName in the registry.
by Alexandre Julliard 09 Aug '21

09 Aug '21

Module: wine Branch: master Commit: bd9db4b6de30bbbb8c357f7401ae609c3a688c2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd9db4b6de30bbbb8c357f74… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Aug 9 21:52:29 2021 +1000 conhost: Use correct size when storing font FaceName in the registry. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/window.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index 4033eefa313..5881ad9c3ad 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -303,7 +303,8 @@ static void save_registry_key( HKEY key, const struct console_config *config ) val = config->edition_mode; RegSetValueExW( key, L"EditionMode", 0, REG_DWORD, (BYTE *)&val, sizeof(val) ); - RegSetValueExW( key, L"FaceName", 0, REG_SZ, (BYTE *)&config->face_name, sizeof(config->face_name) ); + RegSetValueExW( key, L"FaceName", 0, REG_SZ, (BYTE *)&config->face_name, + (lstrlenW(config->face_name) + 1) * sizeof(WCHAR) ); val = config->font_pitch_family; RegSetValueExW( key, L"FontPitchFamily", 0, REG_DWORD, (BYTE *)&val, sizeof(val) );

1 0

Hugh McMaster : kernel32/tests: Fix rounding error when calculating console font size.
by Alexandre Julliard 09 Aug '21

09 Aug '21

Module: wine Branch: master Commit: 9ce8aafdae85be6e79c152f7118d8204becae10b URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ce8aafdae85be6e79c152f7… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Aug 9 23:27:45 2021 +1000 kernel32/tests: Fix rounding error when calculating console font size. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 6ee00aa49a6..bd5cad428bc 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3579,8 +3579,8 @@ static void test_GetConsoleFontSize(HANDLE std_output) ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); GetClientRect(GetConsoleWindow(), &r); GetConsoleScreenBufferInfo(std_output, &csbi); - font_width = (r.right - r.left + 1) / csbi.srWindow.Right; - font_height = (r.bottom - r.top + 1) / csbi.srWindow.Bottom; + font_width = (r.right - r.left) / (csbi.srWindow.Right - csbi.srWindow.Left + 1); + font_height = (r.bottom - r.top) / (csbi.srWindow.Bottom - csbi.srWindow.Top + 1); ok(c.X == font_width, "got %d, expected %d\n", c.X, font_width); ok(c.Y == font_height, "got %d, expected %d\n", c.Y, font_height);

1 0

Alex Henrie : include: Add remaining IPv4 socket options.
by Alexandre Julliard 09 Aug '21

09 Aug '21

Module: wine Branch: master Commit: efb050284ae7a94b2b4f95399b6360151811c660 URL: https://source.winehq.org/git/wine.git/?a=commit;h=efb050284ae7a94b2b4f9539… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 8 21:44:03 2021 -0600 include: Add remaining IPv4 socket options. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ws2ipdef.h | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/include/ws2ipdef.h b/include/ws2ipdef.h index d5a4dab6ce0..3025a9c6fe9 100644 --- a/include/ws2ipdef.h +++ b/include/ws2ipdef.h @@ -83,6 +83,7 @@ typedef struct _INTERFACE_INFO #define IP_UNBLOCK_SOURCE 18 #define IP_PKTINFO 19 #define IP_HOPLIMIT 21 +#define IP_RECVTTL 21 #define IP_RECEIVE_BROADCAST 22 #define IP_RECVIF 24 #define IP_RECVDSTADDR 25 @@ -91,7 +92,21 @@ typedef struct _INTERFACE_INFO #define IP_DEL_IFLIST 30 #define IP_UNICAST_IF 31 #define IP_RTHDR 32 +#define IP_GET_IFLIST 33 #define IP_RECVRTHDR 38 +#define IP_TCLASS 39 +#define IP_RECVTCLASS 40 +#define IP_RECVTOS 40 +#define IP_ORIGINAL_ARRIVAL_IF 47 +#define IP_ECN 50 +#define IP_PKTINFO_EX 51 +#define IP_WFP_REDIRECT_RECORDS 60 +#define IP_WFP_REDIRECT_CONTEXT 70 +#define IP_MTU_DISCOVER 71 +#define IP_MTU 73 +#define IP_NRT_INTERFACE 74 +#define IP_RECVERR 75 +#define IP_USER_MTU 76 #else #define WS_IP_OPTIONS 1 #define WS_IP_HDRINCL 2 @@ -109,6 +124,7 @@ typedef struct _INTERFACE_INFO #define WS_IP_UNBLOCK_SOURCE 18 #define WS_IP_PKTINFO 19 #define WS_IP_HOPLIMIT 21 +#define WS_IP_RECVTTL 21 #define WS_IP_RECEIVE_BROADCAST 22 #define WS_IP_RECVIF 24 #define WS_IP_RECVDSTADDR 25 @@ -117,7 +133,21 @@ typedef struct _INTERFACE_INFO #define WS_IP_DEL_IFLIST 30 #define WS_IP_UNICAST_IF 31 #define WS_IP_RTHDR 32 +#define WS_IP_GET_IFLIST 33 #define WS_IP_RECVRTHDR 38 +#define WS_IP_TCLASS 39 +#define WS_IP_RECVTCLASS 40 +#define WS_IP_RECVTOS 40 +#define WS_IP_ORIGINAL_ARRIVAL_IF 47 +#define WS_IP_ECN 50 +#define WS_IP_PKTINFO_EX 51 +#define WS_IP_WFP_REDIRECT_RECORDS 60 +#define WS_IP_WFP_REDIRECT_CONTEXT 70 +#define WS_IP_MTU_DISCOVER 71 +#define WS_IP_MTU 73 +#define WS_IP_NRT_INTERFACE 74 +#define WS_IP_RECVERR 75 +#define WS_IP_USER_MTU 76 #endif /* USE_WS_PREFIX */ typedef struct WS(sockaddr_in6)

1 0

Alex Henrie : include: Add IPV6_HOPOPTS and IPV6_GET_IFLIST.
by Alexandre Julliard 09 Aug '21

09 Aug '21

Module: wine Branch: master Commit: cf74090cbdcf29928e5681e1cc0bb5151eb4205d URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf74090cbdcf29928e5681e1… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 8 21:44:04 2021 -0600 include: Add IPV6_HOPOPTS and IPV6_GET_IFLIST. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ws2ipdef.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/ws2ipdef.h b/include/ws2ipdef.h index 3025a9c6fe9..0344a193dc1 100644 --- a/include/ws2ipdef.h +++ b/include/ws2ipdef.h @@ -214,6 +214,7 @@ typedef struct WS(in6_pktinfo) { #ifndef USE_WS_PREFIX #define IPV6_OPTIONS 1 +#define IPV6_HOPOPTS 1 #define IPV6_HDRINCL 2 #define IPV6_UNICAST_HOPS 4 #define IPV6_MULTICAST_IF 9 @@ -236,6 +237,7 @@ typedef struct WS(in6_pktinfo) { #define IPV6_DEL_IFLIST 30 #define IPV6_UNICAST_IF 31 #define IPV6_RTHDR 32 +#define IPV6_GET_IFLIST 33 #define IPV6_RECVRTHDR 38 #define IPV6_TCLASS 39 #define IPV6_RECVTCLASS 40 @@ -250,6 +252,7 @@ typedef struct WS(in6_pktinfo) { #define IPV6_USER_MTU 76 #else #define WS_IPV6_OPTIONS 1 +#define WS_IPV6_HOPOPTS 1 #define WS_IPV6_HDRINCL 2 #define WS_IPV6_UNICAST_HOPS 4 #define WS_IPV6_MULTICAST_IF 9 @@ -271,6 +274,7 @@ typedef struct WS(in6_pktinfo) { #define WS_IPV6_DEL_IFLIST 30 #define WS_IPV6_UNICAST_IF 31 #define WS_IPV6_RTHDR 32 +#define WS_IPV6_GET_IFLIST 33 #define WS_IPV6_RECVRTHDR 38 #define WS_IPV6_TCLASS 39 #define WS_IPV6_RECVTCLASS 40

1 0