- wine-devel - winehq.org

[PATCH 1/4] msvcrt/tests: Add test for fopen sequential access hint
by Luke Deller 02 Aug '21

02 Aug '21

Test that adding "S" to the fopen mode results in the underlying file handle having the sequential access hint set. Signed-off-by: Luke Deller <luke(a)deller.id.au> --- dlls/msvcrt/tests/file.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index fb242d81282..d02087be46c 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -35,6 +35,7 @@ #include <process.h> #include <errno.h> #include <locale.h> +#include <winternl.h> #define MSVCRT_FD_BLOCK_SIZE 32 typedef struct { @@ -2731,6 +2732,39 @@ static void test_lseek(void) DeleteFileA("_creat.tst"); } +static void test_fopen_hints(void) +{ + char *tempf; + FILE *fp; + HANDLE handle; + FILE_MODE_INFORMATION mode_info; + IO_STATUS_BLOCK io; + NTSTATUS status; + + /* create a test file */ + tempf = _tempnam(".","wne"); + fp = fopen(tempf, "wb"); + ok(fp != NULL, "unable to create test file\n"); + fwrite("abc\n", 1, 4, fp); + fclose(fp); + + /* open test file with sequential access hint */ + fp = fopen(tempf, "rbS"); + ok(fp != NULL, "unable to open test file with sequential access hint\n"); + + /* check that sequential access hint is set on underlying file handle */ + handle = (HANDLE)_get_osfhandle(_fileno(fp)); + status = NtQueryInformationFile(handle, &io, &mode_info, sizeof(mode_info), + FileModeInformation); + ok(!status, "NtQueryInformationFile failed\n"); + ok(mode_info.Mode & FILE_SEQUENTIAL_ONLY, "handle missing hint\n"); + + /* clean up */ + fclose(fp); + unlink(tempf); + free(tempf); +} + START_TEST(file) { int arg_c; @@ -2803,6 +2837,7 @@ START_TEST(file) test_close(); test__creat(); test_lseek(); + test_fopen_hints(); /* Wait for the (_P_NOWAIT) spawned processes to finish to make sure the report * file contains lines in the correct order -- 2.25.1

2 5

[PATCH vkd3d 1/7] vkd3d: Resolve D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND during table parsing.
by Conor McCarthy 02 Aug '21

02 Aug '21

Simplifies the code path for handling array bindings and unbounded ranges. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d/command.c | 6 +----- libs/vkd3d/state.c | 26 +++++++++++++++++++++----- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 7150c59b..8bed7303 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2674,7 +2674,6 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list descriptor_table = root_signature_get_descriptor_table(root_signature, index); - descriptor = base_descriptor; descriptor_count = 0; current_descriptor_write = descriptor_writes; current_image_info = image_infos; @@ -2682,10 +2681,7 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list { range = &descriptor_table->ranges[i]; - if (range->offset != D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND) - { - descriptor = base_descriptor + range->offset; - } + descriptor = base_descriptor + range->offset; for (j = 0; j < range->descriptor_count; ++j, ++descriptor) { diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index a381679e..d62cb9a0 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -591,6 +591,8 @@ static HRESULT d3d12_root_signature_init_root_descriptor_tables(struct d3d12_roo for (i = 0; i < desc->NumParameters; ++i) { const D3D12_ROOT_PARAMETER *p = &desc->pParameters[i]; + unsigned int offset = 0; + if (p->ParameterType != D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE) continue; @@ -604,6 +606,25 @@ static HRESULT d3d12_root_signature_init_root_descriptor_tables(struct d3d12_roo if (!(table->ranges = vkd3d_calloc(table->range_count, sizeof(*table->ranges)))) return E_OUTOFMEMORY; + for (j = 0; j < range_count; ++j) + { + range = &p->u.DescriptorTable.pDescriptorRanges[j]; + + if (range->OffsetInDescriptorsFromTableStart != D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND) + offset = range->OffsetInDescriptorsFromTableStart; + + table->ranges[j].offset = offset; + table->ranges[j].descriptor_count = range->NumDescriptors; + table->ranges[j].descriptor_magic = vkd3d_descriptor_magic_from_d3d12(range->RangeType); + table->ranges[j].register_space = range->RegisterSpace; + table->ranges[j].base_register_idx = range->BaseShaderRegister; + + TRACE("Descriptor table %u, range %u, offset %u, type %#x, count %u.\n", i, j, + offset, range->RangeType, range->NumDescriptors); + + offset += range->NumDescriptors; + } + for (j = 0; j < range_count; ++j) { range = &p->u.DescriptorTable.pDescriptorRanges[j]; @@ -638,12 +659,7 @@ static HRESULT d3d12_root_signature_init_root_descriptor_tables(struct d3d12_roo ++cur_binding; } - table->ranges[j].offset = range->OffsetInDescriptorsFromTableStart; - table->ranges[j].descriptor_count = range->NumDescriptors; table->ranges[j].binding = vk_binding; - table->ranges[j].descriptor_magic = vkd3d_descriptor_magic_from_d3d12(range->RangeType); - table->ranges[j].register_space = range->RegisterSpace; - table->ranges[j].base_register_idx = range->BaseShaderRegister; } } -- 2.32.0

3 14

[PATCH v13 1/4] winevulkan: Support use of extensions which mustn't be exposed.
by Derek Lesho 02 Aug '21

02 Aug '21

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/winevulkan/make_vulkan | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index e8534cbd5f5..c46ef02dcb9 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -124,6 +124,11 @@ UNSUPPORTED_EXTENSIONS = [ "VK_NV_external_memory_win32", ] +# Either internal extensions which aren't present on the win32 platform which +# winevulkan may nonetheless use, or extensions we want to generate headers for +# but not expose to applications (useful for test commits) +UNEXPOSED_EXTENSIONS = {} + # The Vulkan loader provides entry-points for core functionality and important # extensions. Based on vulkan-1.def this amounts to WSI extensions on 1.0.51. CORE_EXTENSIONS = [ @@ -513,8 +518,8 @@ class VkEnumValue(object): class VkFunction(object): - def __init__(self, _type=None, name=None, params=[], extensions=[], alias=None): - self.extensions = [] + def __init__(self, _type=None, name=None, params=[], alias=None): + self.extensions = set() self.name = name self.type = _type self.params = params @@ -657,6 +662,10 @@ class VkFunction(object): def needs_private_thunk(self): return self.thunk_type == ThunkType.PRIVATE + def needs_exposing(self): + # The function needs exposed if at-least one extension isn't both UNSUPPORTED and UNEXPOSED + return self.is_required() and (not self.extensions or not self.extensions.issubset(UNEXPOSED_EXTENSIONS)) + def pfn(self, prefix="p", call_conv=None, conv=False): """ Create function pointer. """ @@ -2682,7 +2691,7 @@ class VkGenerator(object): # Create thunks for instance and device functions. # Global functions don't go through the thunks. for vk_func in self.registry.funcs.values(): - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue if vk_func.is_global_func(): @@ -2702,6 +2711,8 @@ class VkGenerator(object): for ext in self.registry.extensions: if ext["type"] != "device": continue + if ext["name"] in UNEXPOSED_EXTENSIONS: + continue f.write(" \"{0}\",\n".format(ext["name"])) f.write("};\n\n") @@ -2711,6 +2722,8 @@ class VkGenerator(object): for ext in self.registry.extensions: if ext["type"] != "instance": continue + if ext["name"] in UNEXPOSED_EXTENSIONS: + continue f.write(" \"{0}\",\n".format(ext["name"])) f.write("};\n\n") @@ -2770,7 +2783,7 @@ class VkGenerator(object): f.write("const struct unix_funcs loader_funcs =\n") f.write("{\n") for vk_func in self.registry.funcs.values(): - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue if vk_func.loader_thunk_type == ThunkType.NONE: continue @@ -2789,7 +2802,7 @@ class VkGenerator(object): # Generate prototypes for device and instance functions requiring a custom implementation. f.write("/* Functions for which we have custom implementations outside of the thunks. */\n") for vk_func in self.registry.funcs.values(): - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue if vk_func.needs_thunk() and not vk_func.needs_private_thunk(): continue @@ -2888,7 +2901,7 @@ class VkGenerator(object): f.write("WINE_DEFAULT_DEBUG_CHANNEL(vulkan);\n\n") for vk_func in self.registry.funcs.values(): - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue if vk_func.loader_thunk_type != ThunkType.PUBLIC: continue @@ -2897,7 +2910,7 @@ class VkGenerator(object): f.write("static const struct vulkan_func vk_device_dispatch_table[] =\n{\n") for vk_func in self.registry.device_funcs: - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue f.write(" {{\"{0}\", &{0}}},\n".format(vk_func.name)) @@ -2905,7 +2918,7 @@ class VkGenerator(object): f.write("static const struct vulkan_func vk_phys_dev_dispatch_table[] =\n{\n") for vk_func in self.registry.phys_dev_funcs: - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue f.write(" {{\"{0}\", &{0}}},\n".format(vk_func.name)) @@ -2913,7 +2926,7 @@ class VkGenerator(object): f.write("static const struct vulkan_func vk_instance_dispatch_table[] =\n{\n") for vk_func in self.registry.instance_funcs: - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue f.write(" {{\"{0}\", &{0}}},\n".format(vk_func.name)) @@ -2970,7 +2983,7 @@ class VkGenerator(object): f.write("struct unix_funcs\n") f.write("{\n") for vk_func in self.registry.funcs.values(): - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue if vk_func.loader_thunk_type == ThunkType.NONE: continue @@ -3464,7 +3477,7 @@ class VkRegistry(object): # the XML file to handle this, but because of the manner in which we parse the XML # file we pre-populate from <commands> before we check if a command is enabled. if cmd_name in self.funcs: - self.funcs[cmd_name].extensions.append(ext_name) + self.funcs[cmd_name].extensions.add(ext_name) # Some extensions are not ready or have numbers reserved as a place holder. if ext.attrib["supported"] == "disabled": -- 2.32.0

2 7

[PATCH] include: Add IMFVideoProcessorControl3 definition.
by Nikolay Sivov 02 Aug '21

02 Aug '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/mfidl.idl | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/include/mfidl.idl b/include/mfidl.idl index 5b16c08bb90..62e0ca3025a 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -1231,6 +1231,48 @@ interface IMFVideoProcessorControl2 : IMFVideoProcessorControl ); } +typedef enum _MFVideoSphericalFormat +{ + MFVideoSphericalFormat_Unsupported, + MFVideoSphericalFormat_Equirectangular, +} MFVideoSphericalFormat; + +typedef enum MFVideoSphericalProjectionMode +{ + MFVideoSphericalProjectionMode_Spherical, + MFVideoSphericalProjectionMode_Flat, +} MFVideoSphericalProjectionMode; + +[ + object, + uuid(2424b3f2-eb23-40f1-91aa-74bddeea0883), + local +] +interface IMFVideoProcessorControl3 : IMFVideoProcessorControl2 +{ + HRESULT GetNaturalOutputType( + [out] IMFMediaType **media_type + ); + + HRESULT EnableSphericalVideoProcessing( + [in] BOOL enable, + [in] MFVideoSphericalFormat format, + [in] MFVideoSphericalProjectionMode projection_mode + ); + + HRESULT SetSphericalVideoProperties( + [in] float x, + [in] float y, + [in] float z, + [in] float w, + [in] float fov + ); + + HRESULT SetOutputDevice( + [in] IUnknown *output_device + ); +} + [ object, uuid(2347d60b-3fb5-480c-8803-8df3adcd3ef0), -- 2.30.2

1 0

[PATCH] evr: Added MFIsFormatYUV().
by Nikolay Sivov 02 Aug '21

02 Aug '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/evr.spec | 2 +- dlls/evr/main.c | 26 ++++++++++++++++++++++++++ dlls/evr/tests/evr.c | 42 ++++++++++++++++++++++++++++++++++++++++++ include/mfapi.h | 1 + 4 files changed, 70 insertions(+), 1 deletion(-) diff --git a/dlls/evr/evr.spec b/dlls/evr/evr.spec index 8aea0a607a8..fd96781e903 100644 --- a/dlls/evr/evr.spec +++ b/dlls/evr/evr.spec @@ -25,4 +25,4 @@ @ stub MFGetUncompressedVideoFormat @ stub MFInitVideoFormat @ stdcall -import MFInitVideoFormat_RGB(ptr long long long) -@ stub MFIsFormatYUV +@ stdcall MFIsFormatYUV(long) diff --git a/dlls/evr/main.c b/dlls/evr/main.c index e843f15c04f..b5bab74c4f6 100644 --- a/dlls/evr/main.c +++ b/dlls/evr/main.c @@ -25,6 +25,7 @@ #include "ole2.h" #include "rpcproxy.h" +#include "d3d9.h" #include "evr_private.h" @@ -206,3 +207,28 @@ HRESULT WINAPI MFCreateVideoMixerAndPresenter(IUnknown *mixer_outer, IUnknown *p return hr; } + +/*********************************************************************** + * MFIsFormatYUV (evr.@) + */ +BOOL WINAPI MFIsFormatYUV(DWORD format) +{ + TRACE("%s.\n", debugstr_an((char *)&format, 4)); + + switch (format) + { + case D3DFMT_UYVY: + case D3DFMT_YUY2: + case MAKEFOURCC('A','Y','U','V'): + case MAKEFOURCC('I','M','C','1'): + case MAKEFOURCC('I','M','C','2'): + case MAKEFOURCC('Y','V','1','2'): + case MAKEFOURCC('N','V','1','1'): + case MAKEFOURCC('N','V','1','2'): + case MAKEFOURCC('Y','2','1','0'): + case MAKEFOURCC('Y','2','1','6'): + return TRUE; + default: + return FALSE; + } +} diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index d240ebe4456..01edda7bc9b 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -2722,6 +2722,47 @@ done: DestroyWindow(window); } +static void test_MFIsFormatYUV(void) +{ + static const DWORD formats[] = + { + D3DFMT_UYVY, + D3DFMT_YUY2, + MAKEFOURCC('A','Y','U','V'), + MAKEFOURCC('I','M','C','1'), + MAKEFOURCC('I','M','C','2'), + MAKEFOURCC('Y','V','1','2'), + MAKEFOURCC('N','V','1','1'), + MAKEFOURCC('N','V','1','2'), + MAKEFOURCC('Y','2','1','0'), + MAKEFOURCC('Y','2','1','6'), + }; + static const DWORD unsupported_formats[] = + { + D3DFMT_A8R8G8B8, + MAKEFOURCC('I','Y','U','V'), + MAKEFOURCC('I','4','2','0'), + MAKEFOURCC('Y','V','Y','U'), + MAKEFOURCC('Y','V','U','9'), + MAKEFOURCC('Y','4','1','0'), + MAKEFOURCC('Y','4','1','6'), + }; + unsigned int i; + BOOL ret; + + for (i = 0; i < ARRAY_SIZE(formats); ++i) + { + ret = MFIsFormatYUV(formats[i]); + ok(ret, "Unexpected ret %d, format %s.\n", ret, debugstr_an((char *)&formats[i], 4)); + } + + for (i = 0; i < ARRAY_SIZE(unsupported_formats); ++i) + { + ret = MFIsFormatYUV(unsupported_formats[i]); + ok(!ret, "Unexpected ret %d, format %s.\n", ret, debugstr_an((char *)&unsupported_formats[i], 4)); + } +} + START_TEST(evr) { CoInitialize(NULL); @@ -2746,6 +2787,7 @@ START_TEST(evr) test_mixer_output_rectangle(); test_mixer_zorder(); test_mixer_samples(); + test_MFIsFormatYUV(); CoUninitialize(); } diff --git a/include/mfapi.h b/include/mfapi.h index 382210ad9e2..bcb5d26121e 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -558,6 +558,7 @@ HRESULT WINAPI MFTEnum2(GUID category, UINT32 flags, const MFT_REGISTER_TYPE_INF HRESULT WINAPI MFTEnumEx(GUID category, UINT32 flags, const MFT_REGISTER_TYPE_INFO *input_type, const MFT_REGISTER_TYPE_INFO *output_type, IMFActivate ***activate, UINT32 *pcount); +BOOL WINAPI MFIsFormatYUV(DWORD format); HRESULT WINAPI MFInitAttributesFromBlob(IMFAttributes *attributes, const UINT8 *buffer, UINT size); HRESULT WINAPI MFInitMediaTypeFromWaveFormatEx(IMFMediaType *mediatype, const WAVEFORMATEX *format, UINT32 size); HRESULT WINAPI MFInitVideoFormat_RGB(MFVIDEOFORMAT *format, DWORD width, DWORD height, DWORD d3dformat); -- 2.30.2

1 0

[PATCH 8/8] gdi32: Store brush origin in DC_ATTR.
by Jacek Caban 02 Aug '21

02 Aug '21

2 1

[PATCH 7/8] gdi32: Store window extent in DC_ATTR.
by Jacek Caban 02 Aug '21

02 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/clipping.c | 4 ++-- dlls/gdi32/dc.c | 24 +++++---------------- dlls/gdi32/font.c | 3 ++- dlls/gdi32/gdidc.c | 11 ++++++++++ dlls/gdi32/mapping.c | 44 +++++++++++++++++++------------------- dlls/gdi32/ntgdi_private.h | 1 - include/ntgdi.h | 1 + 7 files changed, 43 insertions(+), 45 deletions(-)

2 1

[PATCH 6/8] gdi32: Store window origin in DC_ATTR.
by Jacek Caban 02 Aug '21

02 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dc.c | 24 +++++------------------- dlls/gdi32/gdidc.c | 11 +++++++++++ dlls/gdi32/mapping.c | 12 ++++++------ dlls/gdi32/ntgdi_private.h | 1 - include/ntgdi.h | 1 + 5 files changed, 23 insertions(+), 26 deletions(-)

2 1

[PATCH 5/8] gdi32: Store viewport origin in DC_ATTR.
by Jacek Caban 02 Aug '21

02 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dc.c | 24 +++++------------------- dlls/gdi32/gdidc.c | 11 +++++++++++ dlls/gdi32/mapping.c | 13 ++++++------- dlls/gdi32/ntgdi_private.h | 1 - dlls/gdi32/tests/metafile.c | 2 +- include/ntgdi.h | 1 + 6 files changed, 24 insertions(+), 28 deletions(-)

2 1

[PATCH 3/8] gdi32: Store vis_rect in DC_ATTR.
by Jacek Caban 02 Aug '21

02 Aug '21

2 1

[PATCH 2/8] gdi32: Use ntgdi names for GetBoundsRect and SetBoundsRect.
by Jacek Caban 02 Aug '21

02 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dc.c | 10 +++++----- dlls/gdi32/gdi32.spec | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-)

2 1

[PATCH 1/8] gdi32: Use ntgdi names for GetDeviceGammaRamp and SetDeviceGammaRamp.
by Jacek Caban 02 Aug '21

02 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dc.c | 20 ++++++++++---------- dlls/gdi32/gdi32.spec | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-)

2 1

[PATCH] mailmap: Add a mailmap entry for myself with the proper spelling
by Martin Storsjo 02 Aug '21

02 Aug '21

From: Martin Storsjö <martin(a)martin.st> Signed-off-by: Martin Storsjö <martin(a)martin.st> --- I guess it's time to trust the tools with proper unicode... --- .mailmap | 1 + 1 file changed, 1 insertion(+) diff --git a/.mailmap b/.mailmap index 81ca6946268..c545fa05d81 100644 --- a/.mailmap +++ b/.mailmap @@ -90,6 +90,7 @@ Luis Carlos Busquets Pérez <luiscar2001(a)yahoo.es> Mariusz Pluciński <vshader(a)gmail.com> Mark G. Adams <mark(a)transgaming.com> Markus Gömmel <m.goemmel(a)compulab.de> +Martin Storsjö <martin(a)martin.st> Matej Špindler <matej.spindler(a)gmail.com> Matej Špindler <spindler.matej(a)gmail.com> Matthew Finnicum <mattfinn(a)gmail.com> -- 2.25.1

1 0

[PATCH] winebuild: Spell out "x30" instead of "lr" for arm64
by Martin Storsjo 02 Aug '21

02 Aug '21

This fixes building with older binutils versions. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- tools/winebuild/import.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 064ab1b4768..ef12b5fa4b0 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1772,14 +1772,14 @@ static void output_syscall_dispatcher(void) output( "\tstp x4, x5, [sp, #32]\n" ); output( "\tstp x6, x7, [sp, #48]\n" ); output( "\tstp x8, x9, [sp, #64]\n" ); - output( "\tstr lr, [sp, #80]\n" ); + output( "\tstr x30, [sp, #80]\n" ); output( "\tbl %s\n", asm_name("NtCurrentTeb") ); output( "\tmov x18, x0\n" ); output( "\tldp x2, x3, [sp, #16]\n" ); output( "\tldp x4, x5, [sp, #32]\n" ); output( "\tldp x6, x7, [sp, #48]\n" ); output( "\tldp x8, x9, [sp, #64]\n" ); - output( "\tldr lr, [sp, #80]\n" ); + output( "\tldr x30, [sp, #80]\n" ); output( "\tldp x0, x1, [sp], #96\n" ); output( "\tldr x10, [x18, #0x2f8]\n" ); /* arm64_thread_data()->syscall_frame */ @@ -1792,7 +1792,7 @@ static void output_syscall_dispatcher(void) output( "\tmov x19, sp\n" ); output( "\tstp x9, x19, [x10, #0xf0]\n" ); output( "\tmrs x9, NZCV\n" ); - output( "\tstp lr, x9, [x10, #0x100]\n" ); + output( "\tstp x30, x9, [x10, #0x100]\n" ); output( "\tstr xzr, [x10, #0x110]\n" ); /* frame->restore_flags */ output( "\tmrs x9, FPCR\n" ); output( "\tstr w9, [x10, #0x118]\n" ); -- 2.25.1

1 0

[PATCH 4/4] iphlpapi: Implement AllocateAndGetIpForwardTable() on top of GetIpForwardTable().
by Huw Davies 02 Aug '21

02 Aug '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 37 +++++ dlls/iphlpapi/ipstats.c | 265 ---------------------------------- 2 files changed, 37 insertions(+), 265 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 7637553780a..4b13b42fc6a 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2278,6 +2278,43 @@ err: return err; } +/****************************************************************** + * AllocateAndGetIpForwardTableFromStack (IPHLPAPI.@) + * + * Get the route table. + * Like GetIpForwardTable(), but allocate the returned table from heap. + * + * PARAMS + * table [Out] pointer into which the MIB_IPFORWARDTABLE is + * allocated and returned. + * sort [In] whether to sort the table + * heap [In] heap from which the table is allocated + * flags [In] flags to HeapAlloc + * + * RETURNS + * ERROR_INVALID_PARAMETER if ppIfTable is NULL, other error codes + * on failure, NO_ERROR on success. + */ +DWORD WINAPI AllocateAndGetIpForwardTableFromStack( MIB_IPFORWARDTABLE **table, BOOL sort, HANDLE heap, DWORD flags ) +{ + DWORD err, size = FIELD_OFFSET(MIB_IPFORWARDTABLE, table[2]), attempt; + + TRACE( "table %p, sort %d, heap %p, flags 0x%08x\n", table, sort, heap, flags ); + + for (attempt = 0; attempt < 5; attempt++) + { + *table = HeapAlloc( heap, flags, size ); + if (!*table) return ERROR_NOT_ENOUGH_MEMORY; + + err = GetIpForwardTable( *table, &size, sort ); + if (!err) break; + HeapFree( heap, flags, *table ); + if (err != ERROR_INSUFFICIENT_BUFFER) break; + } + + return err; +} + static void forward_row2_fill( MIB_IPFORWARD_ROW2 *row, USHORT fam, void *key, struct nsi_ip_forward_rw *rw, void *dyn, struct nsi_ip_forward_static *stat ) { diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 43c481c749f..7bb4ff0603e 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -1220,271 +1220,6 @@ static void *append_table_row( HANDLE heap, DWORD flags, void *table, DWORD *tab return table; } -static int compare_ipforward_rows(const void *a, const void *b) -{ - const MIB_IPFORWARDROW *rowA = a; - const MIB_IPFORWARDROW *rowB = b; - int ret; - - if ((ret = rowA->dwForwardDest - rowB->dwForwardDest) != 0) return ret; - if ((ret = rowA->u2.dwForwardProto - rowB->u2.dwForwardProto) != 0) return ret; - if ((ret = rowA->dwForwardPolicy - rowB->dwForwardPolicy) != 0) return ret; - return rowA->dwForwardNextHop - rowB->dwForwardNextHop; -} - -/****************************************************************** - * AllocateAndGetIpForwardTableFromStack (IPHLPAPI.@) - * - * Get the route table. - * Like GetIpForwardTable(), but allocate the returned table from heap. - * - * PARAMS - * ppIpForwardTable [Out] pointer into which the MIB_IPFORWARDTABLE is - * allocated and returned. - * bOrder [In] whether to sort the table - * heap [In] heap from which the table is allocated - * flags [In] flags to HeapAlloc - * - * RETURNS - * ERROR_INVALID_PARAMETER if ppIfTable is NULL, other error codes - * on failure, NO_ERROR on success. - */ -DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE *ppIpForwardTable, BOOL bOrder, - HANDLE heap, DWORD flags) -{ - MIB_IPFORWARDTABLE *table; - MIB_IPFORWARDROW row; - DWORD ret = NO_ERROR, count = 16, table_size = FIELD_OFFSET( MIB_IPFORWARDTABLE, table[count] ); - - TRACE("table %p, bOrder %d, heap %p, flags 0x%08x\n", ppIpForwardTable, bOrder, heap, flags); - - if (!ppIpForwardTable) return ERROR_INVALID_PARAMETER; - - if (!(table = HeapAlloc( heap, flags, table_size ))) - return ERROR_OUTOFMEMORY; - - table->dwNumEntries = 0; - -#ifdef __linux__ - { - FILE *fp; - - if ((fp = fopen("/proc/net/route", "r"))) - { - char buf[512], *ptr; - DWORD rtf_flags; - - /* skip header line */ - ptr = fgets(buf, sizeof(buf), fp); - while ((ptr = fgets(buf, sizeof(buf), fp))) - { - memset( &row, 0, sizeof(row) ); - - while (!isspace(*ptr)) ptr++; - *ptr++ = 0; - if (getInterfaceIndexByName(buf, &row.dwForwardIfIndex) != NO_ERROR) - continue; - - row.dwForwardDest = strtoul(ptr, &ptr, 16); - row.dwForwardNextHop = strtoul(ptr + 1, &ptr, 16); - rtf_flags = strtoul(ptr + 1, &ptr, 16); - - if (!(rtf_flags & RTF_UP)) row.u1.ForwardType = MIB_IPROUTE_TYPE_INVALID; - else if (rtf_flags & RTF_GATEWAY) row.u1.ForwardType = MIB_IPROUTE_TYPE_INDIRECT; - else row.u1.ForwardType = MIB_IPROUTE_TYPE_DIRECT; - - strtoul(ptr + 1, &ptr, 16); /* refcount, skip */ - strtoul(ptr + 1, &ptr, 16); /* use, skip */ - row.dwForwardMetric1 = strtoul(ptr + 1, &ptr, 16); - row.dwForwardMask = strtoul(ptr + 1, &ptr, 16); - /* FIXME: other protos might be appropriate, e.g. the default - * route is typically set with MIB_IPPROTO_NETMGMT instead */ - row.u2.ForwardProto = MIB_IPPROTO_LOCAL; - - if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, sizeof(row) ))) - break; - } - fclose(fp); - } - else ret = ERROR_NOT_SUPPORTED; - } -#elif defined(HAVE_SYS_TIHDR_H) && defined(T_OPTMGMT_ACK) - { - void *data; - int fd, len, namelen; - mib2_ipRouteEntry_t *entry; - char name[64]; - - if ((fd = open_streams_mib( NULL )) != -1) - { - if ((data = read_mib_entry( fd, MIB2_IP, MIB2_IP_ROUTE, &len ))) - { - for (entry = data; (char *)(entry + 1) <= (char *)data + len; entry++) - { - row.dwForwardDest = entry->ipRouteDest; - row.dwForwardMask = entry->ipRouteMask; - row.dwForwardPolicy = 0; - row.dwForwardNextHop = entry->ipRouteNextHop; - row.u1.dwForwardType = entry->ipRouteType; - row.u2.dwForwardProto = entry->ipRouteProto; - row.dwForwardAge = entry->ipRouteAge; - row.dwForwardNextHopAS = 0; - row.dwForwardMetric1 = entry->ipRouteMetric1; - row.dwForwardMetric2 = entry->ipRouteMetric2; - row.dwForwardMetric3 = entry->ipRouteMetric3; - row.dwForwardMetric4 = entry->ipRouteMetric4; - row.dwForwardMetric5 = entry->ipRouteMetric5; - namelen = min( sizeof(name) - 1, entry->ipRouteIfIndex.o_length ); - memcpy( name, entry->ipRouteIfIndex.o_bytes, namelen ); - name[namelen] = 0; - getInterfaceIndexByName( name, &row.dwForwardIfIndex ); - if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, sizeof(row) ))) - break; - } - HeapFree( GetProcessHeap(), 0, data ); - } - close( fd ); - } - else ret = ERROR_NOT_SUPPORTED; - } -#elif defined(HAVE_SYS_SYSCTL_H) && defined(NET_RT_DUMP) - { - int mib[6] = {CTL_NET, PF_ROUTE, 0, PF_INET, NET_RT_DUMP, 0}; - size_t needed; - char *buf = NULL, *lim, *next, *addrPtr; - struct rt_msghdr *rtm; - - if (sysctl (mib, 6, NULL, &needed, NULL, 0) < 0) - { - ERR ("sysctl 1 failed!\n"); - ret = ERROR_NOT_SUPPORTED; - goto done; - } - - buf = HeapAlloc (GetProcessHeap (), 0, needed); - if (!buf) - { - ret = ERROR_OUTOFMEMORY; - goto done; - } - - if (sysctl (mib, 6, buf, &needed, NULL, 0) < 0) - { - ret = ERROR_NOT_SUPPORTED; - goto done; - } - - lim = buf + needed; - for (next = buf; next < lim; next += rtm->rtm_msglen) - { - int i; - sa_family_t dst_family = AF_UNSPEC; - - rtm = (struct rt_msghdr *)next; - - if (rtm->rtm_type != RTM_GET) - { - WARN ("Got unexpected message type 0x%x!\n", - rtm->rtm_type); - continue; - } - - /* Ignore gateway routes which are multicast */ - if ((rtm->rtm_flags & RTF_GATEWAY) && (rtm->rtm_flags & RTF_MULTICAST)) - continue; - - memset( &row, 0, sizeof(row) ); - row.dwForwardIfIndex = rtm->rtm_index; - row.u1.ForwardType = (rtm->rtm_flags & RTF_GATEWAY) ? MIB_IPROUTE_TYPE_INDIRECT : MIB_IPROUTE_TYPE_DIRECT; - row.dwForwardMetric1 = rtm->rtm_rmx.rmx_hopcount; - row.u2.ForwardProto = MIB_IPPROTO_LOCAL; - - addrPtr = (char *)(rtm + 1); - - for (i = 1; i; i <<= 1) - { - struct sockaddr *sa; - DWORD addr; - - if (!(i & rtm->rtm_addrs)) - continue; - - sa = (struct sockaddr *)addrPtr; - if (addrPtr + sa->sa_len > next + rtm->rtm_msglen) - { - ERR ("struct sockaddr extends beyond the route message, %p > %p\n", - addrPtr + sa->sa_len, next + rtm->rtm_msglen ); - } - - ADVANCE (addrPtr, sa); - - /* Apple's netstat prints the netmask together with the destination - * and only looks at the destination's address family. The netmask's - * sa_family sometimes contains the non-existent value 0xff. */ - switch(i == RTA_NETMASK ? dst_family : sa->sa_family) { - case AF_INET: { - /* Netmasks (and possibly other addresses) have only enough size - * to represent the non-zero bits, e.g. a netmask of 255.0.0.0 has - * 5 bytes (1 sa_len, 1 sa_family, 2 sa_port and 1 for the first - * byte of sin_addr). Due to the alignment constraint we can de - * facto read the full 4 bytes of sin_addr (except for the case of - * netmask 0). Don't assume though that the extra bytes are zeroed. */ - struct sockaddr_in sin = {0}; - memcpy(&sin, sa, sa->sa_len); - addr = sin.sin_addr.s_addr; - break; - } -#ifdef AF_LINK - case AF_LINK: - if(i == RTA_GATEWAY && row.u1.ForwardType == MIB_IPROUTE_TYPE_DIRECT) { - /* For direct route we may simply use dest addr as next hop */ - C_ASSERT(RTA_DST < RTA_GATEWAY); - addr = row.dwForwardDest; - break; - } - /* fallthrough */ -#endif - default: - WARN ("Received unsupported sockaddr family 0x%x\n", sa->sa_family); - addr = 0; - } - - switch (i) - { - case RTA_DST: - row.dwForwardDest = addr; - dst_family = sa->sa_family; - break; - case RTA_GATEWAY: row.dwForwardNextHop = addr; break; - case RTA_NETMASK: row.dwForwardMask = addr; break; - default: - WARN ("Unexpected address type 0x%x\n", i); - } - } - - if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, sizeof(row) ))) - break; - } -done: - HeapFree( GetProcessHeap (), 0, buf ); - } -#else - FIXME( "not implemented\n" ); - ret = ERROR_NOT_SUPPORTED; -#endif - - if (!table) return ERROR_OUTOFMEMORY; - if (!ret) - { - if (bOrder && table->dwNumEntries) - qsort( table->table, table->dwNumEntries, sizeof(row), compare_ipforward_rows ); - *ppIpForwardTable = table; - } - else HeapFree( heap, flags, table ); - TRACE( "returning ret %u table %p\n", ret, table ); - return ret; -} - static int compare_ipnet_rows(const void *a, const void *b) { const MIB_IPNETROW *rowA = a; -- 2.23.0

1 0

[PATCH 3/4] iphlpapi: Implement GetIpForwardTable() on top of nsi.
by Huw Davies 02 Aug '21

02 Aug '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 107 +++++++++++++++++++++--------- dlls/iphlpapi/tests/iphlpapi.c | 116 +++++++++++++++++++-------------- 2 files changed, 146 insertions(+), 77 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index f53c77ba434..7637553780a 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2182,51 +2182,100 @@ DWORD WINAPI AllocateAndGetIpAddrTableFromStack( MIB_IPADDRTABLE **table, BOOL s return err; } +static int ipforward_row_cmp( const void *a, const void *b ) +{ + const MIB_IPFORWARDROW *rowA = a; + const MIB_IPFORWARDROW *rowB = b; + int ret; + + if ((ret = rowA->dwForwardDest - rowB->dwForwardDest) != 0) return ret; + if ((ret = rowA->u2.dwForwardProto - rowB->u2.dwForwardProto) != 0) return ret; + if ((ret = rowA->dwForwardPolicy - rowB->dwForwardPolicy) != 0) return ret; + return rowA->dwForwardNextHop - rowB->dwForwardNextHop; +} + /****************************************************************** * GetIpForwardTable (IPHLPAPI.@) * * Get the route table. * * PARAMS - * pIpForwardTable [Out] buffer for route table - * pdwSize [In/Out] length of output buffer - * bOrder [In] whether to sort the table + * table [Out] buffer for route table + * size [In/Out] length of output buffer + * sort [In] whether to sort the table * * RETURNS * Success: NO_ERROR * Failure: error code from winerror.h - * - * NOTES - * If pdwSize is less than required, the function will return - * ERROR_INSUFFICIENT_BUFFER, and *pdwSize will be set to the required byte - * size. - * If bOrder is true, the returned table will be sorted by the next hop and - * an assortment of arbitrary parameters. */ -DWORD WINAPI GetIpForwardTable(PMIB_IPFORWARDTABLE pIpForwardTable, PULONG pdwSize, BOOL bOrder) +DWORD WINAPI GetIpForwardTable( MIB_IPFORWARDTABLE *table, ULONG *size, BOOL sort ) { - DWORD ret; - PMIB_IPFORWARDTABLE table; + DWORD err, count, uni_count, needed, i, addr; + struct nsi_ipv4_forward_key *keys; + struct nsi_ip_forward_rw *rw; + struct nsi_ipv4_forward_dynamic *dyn; + struct nsi_ip_forward_static *stat; + struct nsi_ipv4_unicast_key *uni_keys = NULL; - TRACE("pIpForwardTable %p, pdwSize %p, bOrder %d\n", pIpForwardTable, pdwSize, bOrder); + TRACE( "table %p, size %p, sort %d\n", table, size, sort ); + if (!size) return ERROR_INVALID_PARAMETER; - if (!pdwSize) return ERROR_INVALID_PARAMETER; + err = NsiAllocateAndGetTable( 1, &NPI_MS_IPV4_MODULEID, NSI_IP_FORWARD_TABLE, (void **)&keys, sizeof(*keys), + (void **)&rw, sizeof(*rw), (void **)&dyn, sizeof(*dyn), + (void **)&stat, sizeof(*stat), &count, 0 ); + if (err) return err; - ret = AllocateAndGetIpForwardTableFromStack(&table, bOrder, GetProcessHeap(), 0); - if (!ret) { - DWORD size = FIELD_OFFSET( MIB_IPFORWARDTABLE, table[table->dwNumEntries] ); - if (!pIpForwardTable || *pdwSize < size) { - *pdwSize = size; - ret = ERROR_INSUFFICIENT_BUFFER; - } - else { - *pdwSize = size; - memcpy(pIpForwardTable, table, size); - } - HeapFree(GetProcessHeap(), 0, table); + needed = FIELD_OFFSET( MIB_IPFORWARDTABLE, table[count] ); + + if (!table || *size < needed) + { + *size = needed; + err = ERROR_INSUFFICIENT_BUFFER; + goto err; } - TRACE("returning %d\n", ret); - return ret; + + err = NsiAllocateAndGetTable( 1, &NPI_MS_IPV4_MODULEID, NSI_IP_UNICAST_TABLE, (void **)&uni_keys, sizeof(*uni_keys), + NULL, 0, NULL, 0, NULL, 0, &uni_count, 0 ); + if (err) goto err; + + table->dwNumEntries = count; + for (i = 0; i < count; i++) + { + MIB_IPFORWARDROW *row = table->table + i; + + row->dwForwardDest = keys[i].prefix.WS_s_addr; + ConvertLengthToIpv4Mask( keys[i].prefix_len, &row->dwForwardMask ); + row->dwForwardPolicy = 0; + row->dwForwardNextHop = keys[i].next_hop.WS_s_addr; + row->u1.dwForwardType = row->dwForwardNextHop ? MIB_IPROUTE_TYPE_INDIRECT : MIB_IPROUTE_TYPE_DIRECT; + if (!row->dwForwardNextHop) /* find the interface's addr */ + { + for (addr = 0; addr < uni_count; addr++) + { + if (uni_keys[addr].luid.Value == keys[i].luid.Value) + { + row->dwForwardNextHop = uni_keys[addr].addr.WS_s_addr; + break; + } + } + } + row->dwForwardIfIndex = stat[i].if_index; + row->u2.dwForwardProto = rw[i].protocol; + row->dwForwardAge = dyn[i].age; + row->dwForwardNextHopAS = 0; + row->dwForwardMetric1 = rw[i].metric; /* FIXME: add interface metric */ + row->dwForwardMetric2 = 0; + row->dwForwardMetric3 = 0; + row->dwForwardMetric4 = 0; + row->dwForwardMetric5 = 0; + } + + if (sort) qsort( table->table, count, sizeof(MIB_IPFORWARDROW), ipforward_row_cmp ); +err: + NsiFreeTable( uni_keys, NULL, NULL, NULL ); + NsiFreeTable( keys, rw, dyn, stat ); + + return err; } static void forward_row2_fill( MIB_IPFORWARD_ROW2 *row, USHORT fam, void *key, struct nsi_ip_forward_rw *rw, diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 51566034f51..785e4e9fb70 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -286,63 +286,83 @@ static void testGetIfTable(void) static void testGetIpForwardTable(void) { - DWORD apiReturn; - ULONG dwSize = 0; + DWORD err, i, j; + ULONG size = 0; + MIB_IPFORWARDTABLE *buf; + MIB_IPFORWARD_TABLE2 *table2; + MIB_UNICASTIPADDRESS_TABLE *unicast; - apiReturn = GetIpForwardTable(NULL, NULL, FALSE); - if (apiReturn == ERROR_NOT_SUPPORTED) { - skip("GetIpForwardTable is not supported\n"); - return; - } - ok(apiReturn == ERROR_INVALID_PARAMETER, - "GetIpForwardTable(NULL, NULL, FALSE) returned %d, expected ERROR_INVALID_PARAMETER\n", - apiReturn); - apiReturn = GetIpForwardTable(NULL, &dwSize, FALSE); - ok(apiReturn == ERROR_INSUFFICIENT_BUFFER, - "GetIpForwardTable(NULL, &dwSize, FALSE) returned %d, expected ERROR_INSUFFICIENT_BUFFER\n", - apiReturn); - if (apiReturn == ERROR_INSUFFICIENT_BUFFER) { - PMIB_IPFORWARDTABLE buf = HeapAlloc(GetProcessHeap(), 0, dwSize); + err = GetIpForwardTable( NULL, NULL, FALSE ); + ok( err == ERROR_INVALID_PARAMETER, "got %d\n", err ); - apiReturn = GetIpForwardTable(buf, &dwSize, FALSE); - ok(apiReturn == NO_ERROR, - "GetIpForwardTable(buf, &dwSize, FALSE) returned %d, expected NO_ERROR\n", - apiReturn); + err = GetIpForwardTable( NULL, &size, FALSE ); + ok( err == ERROR_INSUFFICIENT_BUFFER, "got %d\n", err ); - if (apiReturn == NO_ERROR) - { - DWORD i; + buf = malloc( size ); + err = GetIpForwardTable( buf, &size, FALSE ); + ok( !err, "got %d\n", err ); - trace( "IP forward table: %u entries\n", buf->dwNumEntries ); - for (i = 0; i < buf->dwNumEntries; i++) + err = GetIpForwardTable2( AF_INET, &table2 ); + ok( !err, "got %d\n", err ); + ok( buf->dwNumEntries == table2->NumEntries, "got %d vs %d\n", + buf->dwNumEntries, table2->NumEntries ); + + err = GetUnicastIpAddressTable( AF_INET, &unicast ); + ok( !err, "got %d\n", err ); + + trace( "IP forward table: %u entries\n", buf->dwNumEntries ); + for (i = 0; i < buf->dwNumEntries; i++) + { + MIB_IPFORWARDROW *row = buf->table + i; + MIB_IPFORWARD_ROW2 *row2 = table2->Table + i; + DWORD mask, next_hop; + + winetest_push_context( "%d", i ); + + trace( "dest %s mask %s gw %s if %u type %u proto %u\n", + ntoa( row->dwForwardDest ), ntoa( row->dwForwardMask ), + ntoa( row->dwForwardNextHop ), row->dwForwardIfIndex, + row->dwForwardType, row->dwForwardProto ); + ok( row->dwForwardDest == row2->DestinationPrefix.Prefix.Ipv4.sin_addr.s_addr, + "got %08x vs %08x\n", row->dwForwardDest, row2->DestinationPrefix.Prefix.Ipv4.sin_addr.s_addr ); + ConvertLengthToIpv4Mask( row2->DestinationPrefix.PrefixLength, &mask ); + ok( row->dwForwardMask == mask, "got %08x vs %08x\n", row->dwForwardMask, mask ); + ok( row->dwForwardPolicy == 0, "got %d\n", row->dwForwardPolicy ); + + next_hop = row2->NextHop.Ipv4.sin_addr.s_addr; + if (!next_hop) /* for direct addresses, dwForwardNextHop is set to the address of the appropriate interface */ + { + for (j = 0; j < unicast->NumEntries; j++) { - if (!U1(buf->table[i]).dwForwardDest) /* Default route */ - { - todo_wine - ok (U1(buf->table[i]).dwForwardProto == MIB_IPPROTO_NETMGMT, - "Unexpected dwForwardProto %d\n", U1(buf->table[i]).dwForwardProto); - ok (U1(buf->table[i]).dwForwardType == MIB_IPROUTE_TYPE_INDIRECT, - "Unexpected dwForwardType %d\n", U1(buf->table[i]).dwForwardType); - } - else + if (unicast->Table[j].InterfaceLuid.Value == row2->InterfaceLuid.Value) { - /* In general we should get MIB_IPPROTO_LOCAL but does not work - * for Vista, 2008 and 7. */ - ok (U1(buf->table[i]).dwForwardProto == MIB_IPPROTO_LOCAL || - broken(U1(buf->table[i]).dwForwardProto == MIB_IPPROTO_NETMGMT), - "Unexpected dwForwardProto %d\n", U1(buf->table[i]).dwForwardProto); - /* The forward type varies depending on the address and gateway - * value so it is not worth testing in this case. */ + next_hop = unicast->Table[j].Address.Ipv4.sin_addr.s_addr; + break; } - - trace( "%u: dest %s mask %s gw %s if %u type %u proto %u\n", i, - ntoa( buf->table[i].dwForwardDest ), ntoa( buf->table[i].dwForwardMask ), - ntoa( buf->table[i].dwForwardNextHop ), buf->table[i].dwForwardIfIndex, - U1(buf->table[i]).dwForwardType, U1(buf->table[i]).dwForwardProto ); } } - HeapFree(GetProcessHeap(), 0, buf); - } + ok( row->dwForwardNextHop == next_hop, "got %08x vs %08x\n", row->dwForwardNextHop, next_hop ); + + ok( row->dwForwardIfIndex == row2->InterfaceIndex, "got %d vs %d\n", row->dwForwardIfIndex, row2->InterfaceIndex ); + if (!row2->NextHop.Ipv4.sin_addr.s_addr) + ok( buf->table[i].dwForwardType == MIB_IPROUTE_TYPE_DIRECT, "got %d\n", buf->table[i].dwForwardType ); + else + ok( buf->table[i].dwForwardType == MIB_IPROUTE_TYPE_INDIRECT, "got %d\n", buf->table[i].dwForwardType ); + ok( row->dwForwardProto == row2->Protocol, "got %d vs %d\n", row->dwForwardProto, row2->Protocol ); + ok( row->dwForwardAge == row2->Age, "got %d vs %d\n", row->dwForwardAge, row2->Age ); + ok( row->dwForwardNextHopAS == 0, "got %08x\n", row->dwForwardNextHopAS ); + /* FIXME: need to add the interface's metric from GetIpInterfaceTable() */ + ok( row->dwForwardMetric1 >= row2->Metric, "got %d vs %d\n", row->dwForwardMetric1, row2->Metric ); + ok( row->dwForwardMetric2 == 0, "got %d\n", row->dwForwardMetric2 ); + ok( row->dwForwardMetric3 == 0, "got %d\n", row->dwForwardMetric3 ); + ok( row->dwForwardMetric4 == 0, "got %d\n", row->dwForwardMetric4 ); + ok( row->dwForwardMetric5 == 0, "got %d\n", row->dwForwardMetric5 ); + + winetest_pop_context(); + } + FreeMibTable( unicast ); + FreeMibTable( table2 ); + free( buf ); } static void testGetIpNetTable(void) -- 2.23.0

1 0

[PATCH 2/4] iphlpapi: Implement GetIpForwardTable2().
by Huw Davies 02 Aug '21

02 Aug '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 128 +++++++++++++++++++++++++++++++--- dlls/nsi/tests/nsi.c | 2 - 2 files changed, 117 insertions(+), 13 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index b2d597fd9ab..f53c77ba434 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2229,6 +2229,123 @@ DWORD WINAPI GetIpForwardTable(PMIB_IPFORWARDTABLE pIpForwardTable, PULONG pdwSi return ret; } +static void forward_row2_fill( MIB_IPFORWARD_ROW2 *row, USHORT fam, void *key, struct nsi_ip_forward_rw *rw, + void *dyn, struct nsi_ip_forward_static *stat ) +{ + struct nsi_ipv4_forward_key *key4 = (struct nsi_ipv4_forward_key *)key; + struct nsi_ipv6_forward_key *key6 = (struct nsi_ipv6_forward_key *)key; + struct nsi_ipv4_forward_dynamic *dyn4 = (struct nsi_ipv4_forward_dynamic *)dyn; + struct nsi_ipv6_forward_dynamic *dyn6 = (struct nsi_ipv6_forward_dynamic *)dyn; + + if (fam == WS_AF_INET) + { + row->InterfaceLuid = key4->luid; + row->DestinationPrefix.Prefix.Ipv4.sin_family = fam; + row->DestinationPrefix.Prefix.Ipv4.sin_port = 0; + row->DestinationPrefix.Prefix.Ipv4.sin_addr = key4->prefix; + memset( &row->DestinationPrefix.Prefix.Ipv4.sin_zero, 0, sizeof(row->DestinationPrefix.Prefix.Ipv4.sin_zero) ); + row->DestinationPrefix.PrefixLength = key4->prefix_len; + row->NextHop.Ipv4.sin_family = fam; + row->NextHop.Ipv4.sin_port = 0; + row->NextHop.Ipv4.sin_addr = key4->next_hop; + memset( &row->NextHop.Ipv4.sin_zero, 0, sizeof(row->NextHop.Ipv4.sin_zero) ); + + row->Age = dyn4->age; + } + else + { + row->InterfaceLuid = key6->luid; + + row->DestinationPrefix.Prefix.Ipv6.sin6_family = fam; + row->DestinationPrefix.Prefix.Ipv6.sin6_port = 0; + row->DestinationPrefix.Prefix.Ipv6.sin6_flowinfo = 0; + row->DestinationPrefix.Prefix.Ipv6.sin6_addr = key6->prefix; + row->DestinationPrefix.Prefix.Ipv6.sin6_scope_id = 0; + row->DestinationPrefix.PrefixLength = key6->prefix_len; + row->NextHop.Ipv6.sin6_family = fam; + row->NextHop.Ipv6.sin6_port = 0; + row->NextHop.Ipv6.sin6_flowinfo = 0; + row->NextHop.Ipv6.sin6_addr = key6->next_hop; + row->NextHop.Ipv6.sin6_scope_id = 0; + + row->Age = dyn6->age; + } + + row->InterfaceIndex = stat->if_index; + + row->SitePrefixLength = rw->site_prefix_len; + row->ValidLifetime = rw->valid_lifetime; + row->PreferredLifetime = rw->preferred_lifetime; + row->Metric = rw->metric; + row->Protocol = rw->protocol; + row->Loopback = rw->loopback; + row->AutoconfigureAddress = rw->autoconf; + row->Publish = rw->publish; + row->Immortal = rw->immortal; + + row->Origin = stat->origin; +} + +/****************************************************************** + * GetIpForwardTable2 (IPHLPAPI.@) + */ +DWORD WINAPI GetIpForwardTable2( ADDRESS_FAMILY family, MIB_IPFORWARD_TABLE2 **table ) +{ + void *key[2] = { NULL, NULL }; + struct nsi_ip_forward_rw *rw[2] = { NULL, NULL }; + void *dyn[2] = { NULL, NULL }; + struct nsi_ip_forward_static *stat[2] = { NULL, NULL }; + static const USHORT fam[2] = { WS_AF_INET, WS_AF_INET6 }; + static const DWORD key_size[2] = { sizeof(struct nsi_ipv4_forward_key), sizeof(struct nsi_ipv6_forward_key) }; + static const DWORD dyn_size[2] = { sizeof(struct nsi_ipv4_forward_dynamic), sizeof(struct nsi_ipv6_forward_dynamic) }; + DWORD err = ERROR_SUCCESS, i, size, count[2] = { 0, 0 }; + + TRACE( "%u, %p\n", family, table ); + + if (!table || (family != WS_AF_INET && family != WS_AF_INET6 && family != WS_AF_UNSPEC)) + return ERROR_INVALID_PARAMETER; + + for (i = 0; i < 2; i++) + { + if (family != WS_AF_UNSPEC && family != fam[i]) continue; + + err = NsiAllocateAndGetTable( 1, ip_module_id( fam[i] ), NSI_IP_FORWARD_TABLE, key + i, key_size[i], + (void **)rw + i, sizeof(**rw), dyn + i, dyn_size[i], + (void **)stat + i, sizeof(**stat), count + i, 0 ); + if (err) count[i] = 0; + } + + size = FIELD_OFFSET(MIB_IPFORWARD_TABLE2, Table[ count[0] + count[1] ]); + *table = heap_alloc( size ); + if (!*table) + { + err = ERROR_NOT_ENOUGH_MEMORY; + goto err; + } + + (*table)->NumEntries = count[0] + count[1]; + for (i = 0; i < count[0]; i++) + { + MIB_IPFORWARD_ROW2 *row = (*table)->Table + i; + struct nsi_ipv4_forward_key *key4 = (struct nsi_ipv4_forward_key *)key[0]; + struct nsi_ipv4_forward_dynamic *dyn4 = (struct nsi_ipv4_forward_dynamic *)dyn[0]; + + forward_row2_fill( row, fam[0], key4 + i, rw[0] + i, dyn4 + i, stat[0] + i ); + } + + for (i = 0; i < count[1]; i++) + { + MIB_IPFORWARD_ROW2 *row = (*table)->Table + count[0] + i; + struct nsi_ipv6_forward_key *key6 = (struct nsi_ipv6_forward_key *)key[1]; + struct nsi_ipv6_forward_dynamic *dyn6 = (struct nsi_ipv6_forward_dynamic *)dyn[1]; + + forward_row2_fill( row, fam[1], key6 + i, rw[1] + i, dyn6 + i, stat[1] + i ); + } + +err: + for (i = 0; i < 2; i++) NsiFreeTable( key[i], rw[i], dyn[i], stat[i] ); + return err; +} /****************************************************************** * GetIpNetTable (IPHLPAPI.@) @@ -3556,17 +3673,6 @@ char *WINAPI IPHLP_if_indextoname( NET_IFINDEX index, char *name ) return name; } -/****************************************************************** - * GetIpForwardTable2 (IPHLPAPI.@) - */ -DWORD WINAPI GetIpForwardTable2(ADDRESS_FAMILY family, PMIB_IPFORWARD_TABLE2 *table) -{ - static int once; - - if (!once++) FIXME("(%u %p): stub\n", family, table); - return ERROR_NOT_SUPPORTED; -} - /****************************************************************** * GetIpNetTable2 (IPHLPAPI.@) */ diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index 9f6349bd0e7..c689aca6754 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -531,9 +531,7 @@ todo_wine_if (family == AF_INET6) dyn_size = dyn_sizes[i]; err = GetIpForwardTable2( family, &table ); -todo_wine ok( !err, "got %d\n", err ); - if (err) { winetest_pop_context(); return; } ok( table->NumEntries == count, "table entries %d count %d\n", table->NumEntries, count ); for (i = 0; i < count; i++) -- 2.23.0

1 0

[PATCH 1/4] nsiproxy: Implement IPv4 forward enumerate_all.
by Huw Davies 02 Aug '21

02 Aug '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/tests/nsi.c | 117 ++++++++++++ dlls/nsiproxy.sys/ip.c | 268 +++++++++++++++++++++++++++ dlls/nsiproxy.sys/nsiproxy_private.h | 38 ++++ include/netioapi.h | 2 + include/wine/nsi.h | 62 +++++++ 5 files changed, 487 insertions(+) diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index 869fa255bb2..9f6349bd0e7 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -485,6 +485,121 @@ static void test_ip_unicast( int family ) winetest_pop_context(); } +static void test_ip_forward( int family ) +{ + DWORD rw_sizes[] = { FIELD_OFFSET(struct nsi_ip_forward_rw, unk), + FIELD_OFFSET(struct nsi_ip_forward_rw, unk2), sizeof(struct nsi_ip_forward_rw) }; + DWORD dyn_sizes4[] = { sizeof(struct nsi_ipv4_forward_dynamic) - 3 * sizeof(DWORD), + sizeof(struct nsi_ipv4_forward_dynamic) }; + DWORD dyn_sizes6[] = { sizeof(struct nsi_ipv6_forward_dynamic) - 3 * sizeof(DWORD), + sizeof(struct nsi_ipv6_forward_dynamic) }; + DWORD *dyn_sizes = family == AF_INET ? dyn_sizes4 : dyn_sizes6; + struct nsi_ipv4_forward_key *key_tbl, *key4; + struct nsi_ipv6_forward_key *key6; + struct nsi_ip_forward_rw *rw_tbl, *rw; + struct nsi_ipv4_forward_dynamic *dyn_tbl, *dyn4; + struct nsi_ipv6_forward_dynamic *dyn6; + struct nsi_ip_forward_static *stat_tbl, *stat; + MIB_IPFORWARD_TABLE2 *table; + const NPI_MODULEID *mod = (family == AF_INET) ? &NPI_MS_IPV4_MODULEID : &NPI_MS_IPV6_MODULEID; + DWORD key_size = (family == AF_INET) ? sizeof(*key4) : sizeof(*key6); + DWORD err, count, i, rw_size, dyn_size; + + winetest_push_context( family == AF_INET ? "AF_INET" : "AF_INET6" ); + + for (i = 0; i < ARRAY_SIZE(rw_sizes); i++) + { + err = NsiAllocateAndGetTable( 1, mod, NSI_IP_FORWARD_TABLE, (void **)&key_tbl, key_size, + (void **)&rw_tbl, rw_sizes[i], NULL, 0, + NULL, 0, &count, 0 ); + if (!err) break; + } +todo_wine_if (family == AF_INET6) + ok( !err, "got %d\n", err ); + if (err) { winetest_pop_context(); return; } + rw_size = rw_sizes[i]; + NsiFreeTable( key_tbl, rw_tbl, NULL, NULL ); + + for (i = 0; i < ARRAY_SIZE(dyn_sizes4); i++) + { + err = NsiAllocateAndGetTable( 1, mod, NSI_IP_FORWARD_TABLE, (void **)&key_tbl, key_size, + (void **)&rw_tbl, rw_size, (void **)&dyn_tbl, dyn_sizes[i], + (void **)&stat_tbl, sizeof(*stat_tbl), &count, 0 ); + if (!err) break; + } + ok( !err, "got %d\n", err ); + dyn_size = dyn_sizes[i]; + + err = GetIpForwardTable2( family, &table ); +todo_wine + ok( !err, "got %d\n", err ); + if (err) { winetest_pop_context(); return; } + ok( table->NumEntries == count, "table entries %d count %d\n", table->NumEntries, count ); + + for (i = 0; i < count; i++) + { + MIB_IPFORWARD_ROW2 *row = table->Table + i; + rw = (struct nsi_ip_forward_rw *)((BYTE *)rw_tbl + i * rw_size); + stat = stat_tbl + i; + winetest_push_context( "%d", i ); + + ok( row->DestinationPrefix.Prefix.si_family == family, "mismatch\n" ); + + if (family == AF_INET) + { + key4 = key_tbl + i; + dyn4 = (struct nsi_ipv4_forward_dynamic *)((BYTE *)dyn_tbl + i * dyn_size); + + ok( row->InterfaceLuid.Value == key4->luid.Value, "mismatch\n" ); + ok( row->InterfaceLuid.Value == key4->luid2.Value, "mismatch\n" ); + ok( row->DestinationPrefix.Prefix.Ipv4.sin_addr.s_addr == key4->prefix.s_addr, "mismatch\n" ); + ok( row->DestinationPrefix.Prefix.Ipv4.sin_port == 0, "mismatch\n" ); + ok( row->DestinationPrefix.PrefixLength == key4->prefix_len, "mismatch\n" ); + ok( row->NextHop.Ipv4.sin_addr.s_addr == key4->next_hop.s_addr, "mismatch\n" ); + ok( row->NextHop.Ipv4.sin_port == 0, "mismatch\n" ); + ok( row->Age == dyn4->age, "mismatch\n" ); + } + else + { + key6 = (struct nsi_ipv6_forward_key *)key_tbl + i; + dyn6 = (struct nsi_ipv6_forward_dynamic *)((BYTE *)dyn_tbl + i * dyn_size); + + ok( row->InterfaceLuid.Value == key6->luid.Value, "mismatch\n" ); + ok( row->InterfaceLuid.Value == key6->luid2.Value, "mismatch\n" ); + ok( !memcmp( &row->DestinationPrefix.Prefix.Ipv6.sin6_addr, &key6->prefix, sizeof(key6->prefix) ), + "mismatch\n" ); + ok( row->DestinationPrefix.Prefix.Ipv6.sin6_port == 0, "mismatch\n" ); + ok( row->DestinationPrefix.Prefix.Ipv6.sin6_flowinfo == 0, "mismatch\n" ); + ok( row->DestinationPrefix.Prefix.Ipv6.sin6_scope_id == 0, "mismatch\n" ); + ok( row->DestinationPrefix.PrefixLength == key6->prefix_len, "mismatch\n" ); + ok( !memcmp( &row->NextHop.Ipv6.sin6_addr, &key6->next_hop, sizeof(key6->next_hop) ), "mismatch\n" ); + ok( row->NextHop.Ipv6.sin6_port == 0, "mismatch\n" ); + ok( row->NextHop.Ipv6.sin6_flowinfo == 0, "mismatch\n" ); + ok( row->NextHop.Ipv6.sin6_scope_id == 0, "mismatch\n" ); + ok( row->Age == dyn6->age, "mismatch\n" ); + } + + ok( row->InterfaceIndex == stat->if_index, "mismatch\n" ); + ok( row->SitePrefixLength == rw->site_prefix_len, "mismatch\n" ); + ok( row->ValidLifetime == rw->valid_lifetime, "mismatch\n" ); + ok( row->PreferredLifetime == rw->preferred_lifetime, "mismatch\n" ); + + ok( row->Metric == rw->metric, "mismatch\n" ); + ok( row->Protocol == rw->protocol, "mismatch\n" ); + ok( row->Loopback == rw->loopback, "mismatch\n" ); + ok( row->AutoconfigureAddress == rw->autoconf, "mismatch\n" ); + ok( row->Publish == rw->publish, "mismatch\n" ); + ok( row->Immortal == rw->immortal, "mismatch\n" ); + ok( row->Origin == stat->origin, "mismatch\n" ); + + winetest_pop_context(); + } + + FreeMibTable( table ); + NsiFreeTable( key_tbl, rw_tbl, dyn_tbl, stat_tbl ); + winetest_pop_context(); +} + START_TEST( nsi ) { test_nsi_api(); @@ -494,4 +609,6 @@ START_TEST( nsi ) test_ip_unicast( AF_INET ); test_ip_unicast( AF_INET6 ); + test_ip_forward( AF_INET ); + test_ip_forward( AF_INET6 ); } diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c index 93fdefa24cc..dbd019c8442 100644 --- a/dlls/nsiproxy.sys/ip.c +++ b/dlls/nsiproxy.sys/ip.c @@ -25,6 +25,14 @@ #include <sys/socket.h> #endif +#ifdef HAVE_NET_ROUTE_H +#include <net/route.h> +#endif + +#ifdef HAVE_SYS_SYSCTL_H +#include <sys/sysctl.h> +#endif + #ifdef HAVE_NETINET_IN_H #include <netinet/in.h> #endif @@ -45,6 +53,7 @@ #include "nldef.h" #include "ifdef.h" #include "netiodef.h" +#include "wine/heap.h" #include "wine/nsi.h" #include "wine/debug.h" @@ -221,6 +230,249 @@ static NTSTATUS ip_unicast_get_all_parameters( const void *key, DWORD key_size, return status; } +struct ipv4_route_data +{ + NET_LUID luid; + DWORD if_index; + struct in_addr prefix; + DWORD prefix_len; + struct in_addr next_hop; + DWORD metric; + DWORD protocol; + BYTE loopback; +}; + +static void ipv4_forward_fill_entry( struct ipv4_route_data *entry, struct nsi_ipv4_forward_key *key, + struct nsi_ip_forward_rw *rw, struct nsi_ipv4_forward_dynamic *dyn, + struct nsi_ip_forward_static *stat ) +{ + if (key) + { + key->unk = 0; + key->prefix.WS_s_addr = entry->prefix.s_addr; + key->prefix_len = entry->prefix_len; + memset( key->unk2, 0, sizeof(key->unk2) ); + memset( key->unk3, 0, sizeof(key->unk3) ); + key->luid = entry->luid; + key->luid2 = entry->luid; + key->next_hop.WS_s_addr = entry->next_hop.s_addr; + key->pad = 0; + } + + if (rw) + { + rw->site_prefix_len = 0; + rw->valid_lifetime = ~0u; + rw->preferred_lifetime = ~0u; + rw->metric = entry->metric; + rw->protocol = entry->protocol; + rw->loopback = entry->loopback; + rw->autoconf = 1; + rw->publish = 0; + rw->immortal = 1; + memset( rw->unk, 0, sizeof(rw->unk) ); + rw->unk2 = 0; + } + + if (dyn) + { + memset( dyn, 0, sizeof(*dyn) ); + } + + if (stat) + { + stat->origin = NlroManual; + stat->if_index = entry->if_index; + } +} + +static NTSTATUS ipv4_forward_enumerate_all( void *key_data, DWORD key_size, void *rw_data, DWORD rw_size, + void *dynamic_data, DWORD dynamic_size, + void *static_data, DWORD static_size, DWORD_PTR *count ) +{ + DWORD num = 0; + NTSTATUS status = STATUS_SUCCESS; + BOOL want_data = key_size || rw_size || dynamic_size || static_size; + struct ipv4_route_data entry; + + TRACE( "%p %d %p %d %p %d %p %d %p\n", key_data, key_size, rw_data, rw_size, + dynamic_data, dynamic_size, static_data, static_size, count ); + +#ifdef __linux__ + { + char buf[512], *ptr; + struct in_addr mask; + DWORD rtf_flags; + FILE *fp; + + if (!(fp = fopen( "/proc/net/route", "r" ))) return STATUS_NOT_SUPPORTED; + + /* skip header line */ + fgets( buf, sizeof(buf), fp ); + while ((ptr = fgets( buf, sizeof(buf), fp ))) + { + while (!isspace( *ptr )) ptr++; + *ptr++ = '\0'; + + if (!convert_unix_name_to_luid( buf, &entry.luid )) continue; + if (!convert_luid_to_index( &entry.luid, &entry.if_index )) continue; + + entry.prefix.s_addr = strtoul( ptr, &ptr, 16 ); + entry.next_hop.s_addr = strtoul( ptr + 1, &ptr, 16 ); + rtf_flags = strtoul( ptr + 1, &ptr, 16 ); + strtoul( ptr + 1, &ptr, 16 ); /* refcount, skip */ + strtoul( ptr + 1, &ptr, 16 ); /* use, skip */ + entry.metric = strtoul( ptr + 1, &ptr, 16 ); + mask.s_addr = strtoul( ptr + 1, &ptr, 16 ); + entry.prefix_len = mask_v4_to_prefix( &mask ); + entry.protocol = (rtf_flags & RTF_GATEWAY) ? MIB_IPPROTO_NETMGMT : MIB_IPPROTO_LOCAL; + entry.loopback = entry.protocol == MIB_IPPROTO_LOCAL && entry.prefix_len == 32; + + if (num < *count) + { + ipv4_forward_fill_entry( &entry, key_data, rw_data, dynamic_data, static_data ); + key_data = (BYTE *)key_data + key_size; + rw_data = (BYTE *)rw_data + rw_size; + dynamic_data = (BYTE *)dynamic_data + dynamic_size; + static_data = (BYTE *)static_data + static_size; + } + num++; + } + fclose( fp ); + } +#elif defined(HAVE_SYS_SYSCTL_H) && defined(NET_RT_DUMP) + { + int mib[6] = { CTL_NET, PF_ROUTE, 0, PF_INET, NET_RT_DUMP, 0 }; + size_t needed; + char *buf = NULL, *lim, *next, *addr_ptr; + struct rt_msghdr *rtm; + + if (sysctl( mib, ARRAY_SIZE(mib), NULL, &needed, NULL, 0 ) < 0) return STATUS_NOT_SUPPORTED; + + buf = heap_alloc( needed ); + if (!buf) return STATUS_NO_MEMORY; + + if (sysctl( mib, 6, buf, &needed, NULL, 0 ) < 0) + { + heap_free( buf ); + return STATUS_NOT_SUPPORTED; + } + + lim = buf + needed; + for (next = buf; next < lim; next += rtm->rtm_msglen) + { + int i; + sa_family_t dst_family = AF_UNSPEC; + + rtm = (struct rt_msghdr *)next; + + if (rtm->rtm_type != RTM_GET) + { + WARN( "Got unexpected message type 0x%x!\n", rtm->rtm_type ); + continue; + } + + /* Ignore gateway routes which are multicast */ + if ((rtm->rtm_flags & RTF_GATEWAY) && (rtm->rtm_flags & RTF_MULTICAST)) continue; + + entry.if_index = rtm->rtm_index; + if (!convert_index_to_luid( entry.if_index, &entry.luid )) continue; + entry.protocol = (rtm->rtm_flags & RTF_GATEWAY) ? MIB_IPPROTO_NETMGMT : MIB_IPPROTO_LOCAL; + entry.metric = rtm->rtm_rmx.rmx_hopcount; + + addr_ptr = (char *)(rtm + 1); + + for (i = 1; i; i <<= 1) + { + struct sockaddr *sa; + struct in_addr addr; + + if (!(i & rtm->rtm_addrs)) continue; + + sa = (struct sockaddr *)addr_ptr; + if (addr_ptr + sa->sa_len > next + rtm->rtm_msglen) + { + ERR( "struct sockaddr extends beyond the route message, %p > %p\n", + addr_ptr + sa->sa_len, next + rtm->rtm_msglen ); + } + + if (sa->sa_len) addr_ptr += (sa->sa_len + sizeof(int)-1) & ~(sizeof(int)-1); + else addr_ptr += sizeof(int); + /* Apple's netstat prints the netmask together with the destination + * and only looks at the destination's address family. The netmask's + * sa_family sometimes contains the non-existent value 0xff. */ + switch (i == RTA_NETMASK ? dst_family : sa->sa_family) + { + case AF_INET: + { + /* Netmasks (and possibly other addresses) have only enough size + * to represent the non-zero bits, e.g. a netmask of 255.0.0.0 has + * 5 bytes (1 sa_len, 1 sa_family, 2 sa_port and 1 for the first + * byte of sin_addr). */ + struct sockaddr_in sin = {0}; + memcpy( &sin, sa, sa->sa_len ); + addr = sin.sin_addr; + break; + } +#ifdef AF_LINK + case AF_LINK: + if (i == RTA_GATEWAY && entry.protocol == MIB_IPPROTO_NETMGMT) + { + /* For direct route we may simply use dest addr as next hop */ + C_ASSERT(RTA_DST < RTA_GATEWAY); + addr = entry.prefix; + break; + } + /* fallthrough */ +#endif + default: + WARN( "Received unsupported sockaddr family 0x%x\n", sa->sa_family ); + addr.s_addr = 0; + } + switch (i) + { + case RTA_DST: + entry.prefix = addr; + dst_family = sa->sa_family; + break; + case RTA_GATEWAY: entry.next_hop = addr; break; + case RTA_NETMASK: entry.prefix_len = mask_v4_to_prefix( &addr ); break; + default: + WARN( "Unexpected address type 0x%x\n", i ); + } + } + + if (num < *count) + { + ipv4_forward_fill_entry( &entry, key_data, rw_data, dynamic_data, static_data ); + key_data = (BYTE *)key_data + key_size; + rw_data = (BYTE *)rw_data + rw_size; + dynamic_data = (BYTE *)dynamic_data + dynamic_size; + static_data = (BYTE *)static_data + static_size; + } + num++; + } + HeapFree( GetProcessHeap (), 0, buf ); + } +#else + FIXME( "not implemented\n" ); + return STATUS_NOT_IMPLEMENTED; +#endif + + if (!want_data || num <= *count) *count = num; + else status = STATUS_MORE_ENTRIES; + + return status; +} + +static NTSTATUS ipv6_forward_enumerate_all( void *key_data, DWORD key_size, void *rw_data, DWORD rw_size, + void *dynamic_data, DWORD dynamic_size, + void *static_data, DWORD static_size, DWORD_PTR *count ) +{ + FIXME( "not implemented\n" ); + return STATUS_NOT_IMPLEMENTED; +} + static struct module_table ipv4_tables[] = { { @@ -232,6 +484,14 @@ static struct module_table ipv4_tables[] = ip_unicast_enumerate_all, ip_unicast_get_all_parameters, }, + { + NSI_IP_FORWARD_TABLE, + { + sizeof(struct nsi_ipv4_forward_key), sizeof(struct nsi_ip_forward_rw), + sizeof(struct nsi_ipv4_forward_dynamic), sizeof(struct nsi_ip_forward_static) + }, + ipv4_forward_enumerate_all, + }, { ~0u } @@ -254,6 +514,14 @@ static struct module_table ipv6_tables[] = ip_unicast_enumerate_all, ip_unicast_get_all_parameters, }, + { + NSI_IP_FORWARD_TABLE, + { + sizeof(struct nsi_ipv6_forward_key), sizeof(struct nsi_ip_forward_rw), + sizeof(struct nsi_ipv6_forward_dynamic), sizeof(struct nsi_ip_forward_static) + }, + ipv6_forward_enumerate_all, + }, { ~0u } diff --git a/dlls/nsiproxy.sys/nsiproxy_private.h b/dlls/nsiproxy.sys/nsiproxy_private.h index 0f6e7b05c59..44409ae159e 100644 --- a/dlls/nsiproxy.sys/nsiproxy_private.h +++ b/dlls/nsiproxy.sys/nsiproxy_private.h @@ -25,6 +25,44 @@ NTSTATUS nsi_get_parameter_ex( struct nsi_get_parameter_ex *params ) DECLSPEC_HI BOOL convert_luid_to_unix_name( const NET_LUID *luid, const char **unix_name ) DECLSPEC_HIDDEN; BOOL convert_unix_name_to_luid( const char *unix_name, NET_LUID *luid ) DECLSPEC_HIDDEN; +static inline BOOL convert_luid_to_index( const NET_LUID *luid, DWORD *index ) +{ + struct nsi_get_parameter_ex params; + params.unknown[0] = 0; + params.unknown[1] = 0; + params.first_arg = 1; + params.unknown2 = 0; + params.module = &NPI_MS_NDIS_MODULEID; + params.table = NSI_NDIS_IFINFO_TABLE; + params.key = luid; + params.key_size = sizeof(*luid); + params.param_type = NSI_PARAM_TYPE_STATIC; + params.data = index; + params.data_size = sizeof(*index); + params.data_offset = FIELD_OFFSET(struct nsi_ndis_ifinfo_static, if_index); + + return !nsi_get_parameter_ex( &params ); +} + +static inline BOOL convert_index_to_luid( DWORD index, NET_LUID *luid ) +{ + struct nsi_get_parameter_ex params; + params.unknown[0] = 0; + params.unknown[1] = 0; + params.first_arg = 1; + params.unknown2 = 0; + params.module = &NPI_MS_NDIS_MODULEID; + params.table = NSI_NDIS_INDEX_LUID_TABLE; + params.key = &index; + params.key_size = sizeof(index); + params.param_type = NSI_PARAM_TYPE_STATIC; + params.data = luid; + params.data_size = sizeof(*luid); + params.data_offset = 0; + + return !nsi_get_parameter_ex( &params ); +} + struct module_table { DWORD table; diff --git a/include/netioapi.h b/include/netioapi.h index 4735620dedb..44d877ae3c3 100644 --- a/include/netioapi.h +++ b/include/netioapi.h @@ -254,6 +254,8 @@ DWORD WINAPI GetIfEntry2(MIB_IF_ROW2*); DWORD WINAPI GetIfEntry2Ex(MIB_IF_TABLE_LEVEL,MIB_IF_ROW2*); DWORD WINAPI GetIfTable2(MIB_IF_TABLE2**); DWORD WINAPI GetIfTable2Ex(MIB_IF_TABLE_LEVEL,MIB_IF_TABLE2**); +DWORD WINAPI GetIpForwardEntry2(MIB_IPFORWARD_ROW2*); +DWORD WINAPI GetIpForwardTable2(ADDRESS_FAMILY,MIB_IPFORWARD_TABLE2**); DWORD WINAPI GetIpInterfaceTable(ADDRESS_FAMILY,MIB_IPINTERFACE_TABLE**); DWORD WINAPI GetUnicastIpAddressEntry(MIB_UNICASTIPADDRESS_ROW*); DWORD WINAPI GetUnicastIpAddressTable(ADDRESS_FAMILY,MIB_UNICASTIPADDRESS_TABLE**); diff --git a/include/wine/nsi.h b/include/wine/nsi.h index bba5be11e50..dd18c7c7511 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -98,6 +98,7 @@ struct nsi_ndis_ifinfo_static /* Undocumented NSI IP tables */ #define NSI_IP_UNICAST_TABLE 10 +#define NSI_IP_FORWARD_TABLE 16 struct nsi_ipv4_unicast_key { @@ -133,6 +134,67 @@ struct nsi_ip_unicast_static ULONG64 creation_time; }; +struct nsi_ipv4_forward_key +{ + DWORD unk; + IN_ADDR prefix; + BYTE prefix_len; + BYTE unk2[3]; + DWORD unk3[3]; + NET_LUID luid; + NET_LUID luid2; + IN_ADDR next_hop; + DWORD pad; +}; + +struct nsi_ipv6_forward_key +{ + DWORD unk; + IN6_ADDR prefix; + BYTE prefix_len; + BYTE unk2[3]; + DWORD unk3[3]; + DWORD pad; + NET_LUID luid; + NET_LUID luid2; + IN6_ADDR next_hop; +}; + +struct nsi_ip_forward_rw +{ + DWORD site_prefix_len; + DWORD valid_lifetime; + DWORD preferred_lifetime; + DWORD metric; + DWORD protocol; + BYTE loopback; + BYTE autoconf; + BYTE publish; + BYTE immortal; + BYTE unk[4]; + DWORD unk2; +}; + +struct nsi_ipv4_forward_dynamic +{ + DWORD age; + DWORD unk[3]; + IN_ADDR addr2; /* often a repeat of prefix */ +}; + +struct nsi_ipv6_forward_dynamic +{ + DWORD age; + DWORD unk[3]; + IN6_ADDR addr2; /* often a repeat of prefix */ +}; + +struct nsi_ip_forward_static +{ + DWORD origin; + DWORD if_index; +}; + /* Wine specific ioctl interface */ #define IOCTL_NSIPROXY_WINE_ENUMERATE_ALL CTL_CODE(FILE_DEVICE_NETWORK, 0x400, METHOD_BUFFERED, 0) -- 2.23.0

1 0

[PATCH] mfplat: Add some more attributes for tracing.
by Nikolay Sivov 01 Aug '21

01 Aug '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/main.c | 3 +++ include/mftransform.idl | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index bcad90c29da..7fd713261fc 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -1687,6 +1687,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_BYTESTREAM_DLNA_PROFILE_ID), X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_AUDCAP_ROLE), X(MF_MT_MAJOR_TYPE), + X(MF_SA_REQUIRED_SAMPLE_COUNT_PROGRESSIVE), X(MF_MT_IN_BAND_PARAMETER_SET), X(MF_EVENT_SOURCE_CHARACTERISTICS), X(MF_EVENT_SOURCE_CHARACTERISTICS_OLD), @@ -1717,6 +1718,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_EVENT_STREAM_METADATA_KEYDATA), X(MF_READER_WRITER_D3D_MANAGER), X(MFSampleExtension_3DVideo), + X(MF_SA_MINIMUM_OUTPUT_SAMPLE_COUNT_PROGRESSIVE), X(MF_MT_H264_USAGE), X(MF_MEDIA_ENGINE_EME_CALLBACK), X(MF_EVENT_SOURCE_FAKE_START), @@ -1775,6 +1777,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_EVENT_START_PRESENTATION_TIME_AT_OUTPUT), X(MFSampleExtension_DecodeTimestamp), X(MF_MEDIA_ENGINE_COMPATIBILITY_MODE), + X(MF_SA_MINIMUM_OUTPUT_SAMPLE_COUNT), X(MF_MT_VIDEO_H264_NO_FMOASO), X(MF_MT_AVG_BIT_ERROR_RATE), X(MF_MT_VIDEO_PRIMARIES), diff --git a/include/mftransform.idl b/include/mftransform.idl index e49c7200185..0dd83a70f7d 100644 --- a/include/mftransform.idl +++ b/include/mftransform.idl @@ -208,6 +208,9 @@ cpp_quote("EXTERN_GUID(MF_SA_D3D11_SHARED, 0x7b8f32c3, 0x6d96, 0x4 cpp_quote("EXTERN_GUID(MF_SA_D3D11_SHARED_WITHOUT_MUTEX, 0x39dbd44d, 0x2e44, 0x4931, 0xa4, 0xc8, 0x35, 0x2d, 0x3d, 0xc4, 0x21, 0x15);") cpp_quote("EXTERN_GUID(MF_SA_D3D11_USAGE, 0xe85fe442, 0x2ca3, 0x486e, 0xa9, 0xc7, 0x10, 0x9d, 0xda, 0x60, 0x98, 0x80);") cpp_quote("EXTERN_GUID(MF_SA_REQUIRED_SAMPLE_COUNT, 0x18802c61, 0x324b, 0x4952, 0xab, 0xd0, 0x17, 0x6f, 0xf5, 0xc6, 0x96, 0xff);") +cpp_quote("EXTERN_GUID(MF_SA_REQUIRED_SAMPLE_COUNT_PROGRESSIVE, 0xb172d58e, 0xfa77, 0x4e48, 0x8d, 0x2a, 0x1d, 0xf2, 0xd8, 0x50, 0xea, 0xc2);") +cpp_quote("EXTERN_GUID(MF_SA_MINIMUM_OUTPUT_SAMPLE_COUNT, 0x851745d5, 0xc3d6, 0x476d, 0x95, 0x27, 0x49, 0x8e, 0xf2, 0xd1, 0x0d, 0x18);") +cpp_quote("EXTERN_GUID(MF_SA_MINIMUM_OUTPUT_SAMPLE_COUNT_PROGRESSIVE, 0x0f5523a5, 0x1cb2, 0x47c5, 0xa5, 0x50, 0x2e, 0xeb, 0x84, 0xb4, 0xd1, 0x4a);") cpp_quote("EXTERN_GUID(MF_TRANSFORM_ASYNC, 0xf81a699a, 0x649a, 0x497d, 0x8c, 0x73, 0x29, 0xf8, 0xfe, 0xd6, 0xad, 0x7a);") cpp_quote("EXTERN_GUID(MF_TRANSFORM_ASYNC_UNLOCK, 0xe5666d6b, 0x3422, 0x4eb6, 0xa4, 0x21, 0xda, 0x7d, 0xb1, 0xf8, 0xe2, 0x07);") cpp_quote("EXTERN_GUID(MF_TRANSFORM_CATEGORY_Attribute, 0xceabba49, 0x506d, 0x4757, 0xa6, 0xff, 0x66, 0xc1, 0x84, 0x98, 0x7e, 0x4e);") -- 2.30.2

2 1

Wine staging 6.14 release
by Alistair Leslie-Hughes 31 Jul '21

31 Jul '21

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 6.14 (608 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * None Added: * None Updated: * mfplat-streaming-support * nvcuda-CUDA_Support * ntdll-Junction_Points Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH 1/5] ws2_32: Move the getsockopt(IPX_PTYPE) implementation to ntdll.
by Zebediah Figura 30 Jul '21

30 Jul '21

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntdll/unix/socket.c | 22 ++++++++++++++++++++++ dlls/ws2_32/socket.c | 27 ++++----------------------- include/wine/afd.h | 1 + 3 files changed, 27 insertions(+), 23 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 24090c1a17b..c2cbaff24e1 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1922,6 +1922,28 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc return ret ? sock_errno_to_status( errno ) : STATUS_SUCCESS; } +#ifdef SOL_IPX + case IOCTL_AFD_WINE_GET_IPX_PTYPE: + return do_getsockopt( handle, io, SOL_IPX, IPX_TYPE, out_buffer, out_size ); +#elif defined(SO_DEFAULT_HEADERS) + case IOCTL_AFD_WINE_GET_IPX_PTYPE: + { + int fd, needs_close = FALSE; + struct ipx value; + socklen_t len = sizeof(value); + int ret; + + if ((status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL ))) + return status; + + ret = getsockopt( fd, 0, SO_DEFAULT_HEADERS, &value, &len ); + if (needs_close) close( fd ); + if (ret) return sock_errno_to_status( errno ); + *(DWORD *)out_buffer = value.ipx_pt; + return STATUS_SUCCESS; + } +#endif + default: { if ((code >> 16) == FILE_DEVICE_NETWORK) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index a28c25ec697..71b5e9a8658 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2158,7 +2158,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, return SOCKET_ERROR; } /* end switch(optname) */ }/* end case WS_SOL_SOCKET */ -#ifdef HAS_IPX + case WS_NSPROTO_IPX: { struct WS_sockaddr_ipx addr; @@ -2166,27 +2166,6 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, int namelen; switch(optname) { - case WS_IPX_PTYPE: - if ((fd = get_sock_fd( s, 0, NULL )) == -1) return SOCKET_ERROR; -#ifdef SOL_IPX - if(getsockopt(fd, SOL_IPX, IPX_TYPE, optval, (socklen_t *)optlen) == -1) - { - ret = SOCKET_ERROR; - } -#else - { - struct ipx val; - socklen_t len=sizeof(struct ipx); - if(getsockopt(fd, 0, SO_DEFAULT_HEADERS, &val, &len) == -1 ) - ret = SOCKET_ERROR; - else - *optval = (int)val.ipx_pt; - } -#endif - TRACE("ptype: %d (fd: %d)\n", *(int*)optval, fd); - release_sock_fd( s, fd ); - return ret; - case WS_IPX_ADDRESS: /* * On a Win2000 system with one network card there are usually @@ -2217,12 +2196,14 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, *(int*)optval = 1; /* As noted under IPX_ADDRESS we have just one card. */ return 0; + case WS_IPX_PTYPE: + return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPX_PTYPE, optval, optlen ); + default: FIXME("IPX optname:%x\n", optname); return SOCKET_ERROR; }/* end switch(optname) */ } /* end case WS_NSPROTO_IPX */ -#endif #ifdef HAS_IRDA #define MAX_IRDA_DEVICES 10 diff --git a/include/wine/afd.h b/include/wine/afd.h index 9a1edb1fda6..6630a6402fc 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -223,6 +223,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_SET_IPV6_UNICAST_IF WINE_AFD_IOC(278) #define IOCTL_AFD_WINE_GET_IPV6_V6ONLY WINE_AFD_IOC(279) #define IOCTL_AFD_WINE_SET_IPV6_V6ONLY WINE_AFD_IOC(280) +#define IOCTL_AFD_WINE_GET_IPX_PTYPE WINE_AFD_IOC(281) struct afd_create_params { -- 2.30.2

1 4

[PATCH] maintainers: Changing my name
by André Zwing 30 Jul '21

30 Jul '21

Signed-off-by: André Zwing <nerv(a)dawncrow.de> --- MAINTAINERS | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index e85151e9bd2..c36a70958ed 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -29,7 +29,7 @@ Maintainers List ----------------------------------- ARM, ARM64 -M: André Hentschel <nerv(a)dawncrow.de> +M: André Zwing <nerv(a)dawncrow.de> F: dlls/dbghelp/cpu_arm* F: dlls/msvcrt/except_arm.c F: dlls/ntdll/signal_arm* @@ -175,7 +175,7 @@ P: Zebediah Figura <z.figura12(a)gmail.com> F: dlls/msi/ Netstat -M: André Hentschel <nerv(a)dawncrow.de> +M: André Zwing <nerv(a)dawncrow.de> F: programs/netstat/ Network @@ -302,7 +302,7 @@ P: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> F: server/ Winemaker -M: André Hentschel <nerv(a)dawncrow.de> +M: André Zwing <nerv(a)dawncrow.de> F: tools/winemaker/ WinHTTP @@ -314,7 +314,7 @@ P: Jacek Caban <jacek(a)codeweavers.com> F: dlls/wininet/ WPcap -M: André Hentschel <nerv(a)dawncrow.de> +M: André Zwing <nerv(a)dawncrow.de> F: dlls/wpcap/ X11 Driver -- 2.25.1

1 0

[PATCH] jscript: Store the head of statement list instead of the list structure.
by Paul Gofman 30 Jul '21

30 Jul '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Supersedes 210523. dlls/jscript/compile.c | 6 +++--- dlls/jscript/parser.h | 9 ++------- dlls/jscript/parser.y | 14 +++++++------- 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 4672a8c31f1..482805cc52d 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -2510,7 +2510,7 @@ static HRESULT init_code(compiler_ctx_t *compiler, const WCHAR *source, UINT64 s return S_OK; } -static HRESULT compile_function(compiler_ctx_t *ctx, statement_list_t *source, function_expression_t *func_expr, +static HRESULT compile_function(compiler_ctx_t *ctx, statement_t *source, function_expression_t *func_expr, BOOL from_eval, function_code_t *func) { function_expression_t *iter; @@ -2568,7 +2568,7 @@ static HRESULT compile_function(compiler_ctx_t *ctx, statement_list_t *source, f return E_OUTOFMEMORY; } - hres = visit_block_statement(ctx, NULL, source ? source->head : NULL); + hres = visit_block_statement(ctx, NULL, source); if(FAILED(hres)) return hres; @@ -2609,7 +2609,7 @@ static HRESULT compile_function(compiler_ctx_t *ctx, statement_list_t *source, f ctx->current_function_expr = ctx->func_head; off = ctx->code_off; - hres = compile_block_statement(ctx, NULL, source ? source->head : NULL); + hres = compile_block_statement(ctx, NULL, source); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/parser.h b/dlls/jscript/parser.h index fde0b540d63..9e212138480 100644 --- a/dlls/jscript/parser.h +++ b/dlls/jscript/parser.h @@ -19,11 +19,6 @@ typedef struct _expression_t expression_t; typedef struct _statement_t statement_t; -typedef struct _statement_list_t { - statement_t *head; - statement_t *tail; -} statement_list_t; - struct _bytecode_t; typedef struct { @@ -41,7 +36,7 @@ typedef struct _parser_ctx_t { script_ctx_t *script; struct _compiler_ctx_t *compiler; - statement_list_t *source; + statement_t *source; BOOL nl; BOOL implicit_nl_semicolon; BOOL is_html; @@ -301,7 +296,7 @@ typedef struct _function_expression_t { const WCHAR *identifier; const WCHAR *event_target; parameter_t *parameter_list; - statement_list_t *statement_list; + statement_t *statement_list; const WCHAR *src_str; DWORD src_len; unsigned func_id; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 9fc7ea61dc3..0ebdc2b932b 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -65,6 +65,11 @@ typedef struct _case_list_t { case_clausule_t *tail; } case_list_t; +typedef struct _statement_list_t { + statement_t *head; + statement_t *tail; +} statement_list_t; + static catch_block_t *new_catch_block(parser_ctx_t*,const WCHAR*,statement_t*); static case_clausule_t *new_case_clausule(parser_ctx_t*,unsigned,expression_t*,statement_list_t*); static case_list_t *new_case_list(parser_ctx_t*,case_clausule_t*); @@ -98,11 +103,6 @@ static statement_t *new_switch_statement(parser_ctx_t*,unsigned,expression_t*,ca static statement_t *new_throw_statement(parser_ctx_t*,unsigned,expression_t*); static statement_t *new_try_statement(parser_ctx_t*,statement_t*,catch_block_t*,statement_t*,unsigned); -struct statement_list_t { - statement_t *head; - statement_t *tail; -}; - static statement_list_t *new_statement_list(parser_ctx_t*,statement_t*); static statement_list_t *statement_list_add(statement_list_t*,statement_t*); @@ -249,7 +249,7 @@ static expression_t *new_prop_and_value_expression(parser_ctx_t*,property_list_t /* ECMA-262 10th Edition 15.1 */ Script - : ScriptBody HtmlComment { ctx->source = $1; } + : ScriptBody HtmlComment { ctx->source = $1 ? $1->head : NULL; } /* ECMA-262 10th Edition 15.1 */ ScriptBody @@ -1440,7 +1440,7 @@ static expression_t *new_function_expression(parser_ctx_t *ctx, const WCHAR *ide ret->identifier = identifier; ret->parameter_list = parameter_list ? parameter_list->head : NULL; - ret->statement_list = statement_list; + ret->statement_list = statement_list ? statement_list->head : NULL; ret->event_target = event_target; ret->src_str = src_str; ret->src_len = src_len; -- 2.31.1

2 1

[PATCH] jscript: Allocate non-temporary storage for statement lists which persist after parsing.
by Paul Gofman 30 Jul '21

30 Jul '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- new_statement_list() uses parser_alloc_tmp() and the memory for statement list may get freed in script_parse() thus making compile_function() use the freed memory. dlls/jscript/parser.y | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 9fc7ea61dc3..4bad7e326db 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -249,7 +249,17 @@ static expression_t *new_prop_and_value_expression(parser_ctx_t*,property_list_t /* ECMA-262 10th Edition 15.1 */ Script - : ScriptBody HtmlComment { ctx->source = $1; } + : ScriptBody HtmlComment { + if ($1) + { + ctx->source = parser_alloc(ctx, sizeof(*ctx->source)); + *ctx->source = *$1; + } + else + { + ctx->source = NULL; + } + } /* ECMA-262 10th Edition 15.1 */ ScriptBody @@ -1440,7 +1450,15 @@ static expression_t *new_function_expression(parser_ctx_t *ctx, const WCHAR *ide ret->identifier = identifier; ret->parameter_list = parameter_list ? parameter_list->head : NULL; - ret->statement_list = statement_list; + if (statement_list) + { + ret->statement_list = parser_alloc(ctx, sizeof(*ret->statement_list)); + *ret->statement_list = *statement_list; + } + else + { + ret->statement_list = NULL; + } ret->event_target = event_target; ret->src_str = src_str; ret->src_len = src_len; @@ -1657,7 +1675,6 @@ HRESULT script_parse(script_ctx_t *ctx, struct _compiler_ctx_t *compiler, byteco jsstr_release(line_str); return DISP_E_EXCEPTION; } - *ret = parser_ctx; return S_OK; } -- 2.31.1

2 2

[PATCH 9/9] gdi32: Use NtGdiGetDeviceCaps for GetDeviceCaps implementation.
by Jacek Caban 30 Jul '21

30 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dc.c | 4 ++-- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 10 ++++++++++ dlls/gdi32/mfdrv/init.c | 8 +++++--- dlls/gdi32/tests/dc.c | 5 +++++ 5 files changed, 23 insertions(+), 5 deletions(-)

2 1

[PATCH 8/9] gdi32: Use ntgdi name for CreateCompatibleDC.
by Jacek Caban 30 Jul '21

30 Jul '21

2 1

[PATCH 7/9] gdi32: Don't use driver entry point for NtGdiSaveDC implementation.
by Jacek Caban 30 Jul '21

30 Jul '21

2 1

[PATCH 6/9] gdi32: Use NtGdiSaveDC for SaveDC implementation.
by Jacek Caban 30 Jul '21

30 Jul '21

2 1

[PATCH 5/9] gdi32: Move more functions from dc.c.
by Jacek Caban 30 Jul '21

30 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dc.c | 132 -------------------------------------------- dlls/gdi32/gdidc.c | 133 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 133 insertions(+), 132 deletions(-)

2 1

[PATCH 4/9] gdi32: Use get_dc_attr in SetMiterLimit.
by Jacek Caban 30 Jul '21

30 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dc.c | 24 ------------------------ dlls/gdi32/gdidc.c | 13 +++++++++++++ 2 files changed, 13 insertions(+), 24 deletions(-)

2 1

[PATCH 3/9] gdi32: Store miter limit in DC_ATTR.
by Jacek Caban 30 Jul '21

30 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dc.c | 30 +++--------------------------- dlls/gdi32/dibdrv/objects.c | 2 +- dlls/gdi32/gdidc.c | 11 +++++++++++ dlls/gdi32/ntgdi_private.h | 1 - dlls/gdi32/path.c | 2 +- include/ntgdi.h | 1 + 6 files changed, 17 insertions(+), 30 deletions(-)

2 1

[PATCH 2/9] gdi32: Store DC pen color in DC_ATTR.
by Jacek Caban 30 Jul '21

30 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dc.c | 29 ++++------------------------- dlls/gdi32/dibdrv/objects.c | 2 +- dlls/gdi32/gdidc.c | 9 +++++++++ dlls/gdi32/ntgdi_private.h | 1 - include/ntgdi.h | 1 + 5 files changed, 15 insertions(+), 27 deletions(-)

2 1

[PATCH 1/9] gdi32: Store DC brush color in DC_ATTR.
by Jacek Caban 30 Jul '21

30 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dc.c | 29 ++++------------------------- dlls/gdi32/dibdrv/objects.c | 2 +- dlls/gdi32/gdidc.c | 9 +++++++++ dlls/gdi32/ntgdi_private.h | 1 - include/ntgdi.h | 1 + 5 files changed, 15 insertions(+), 27 deletions(-)

2 1

[PATCH v2] user32: Fix the logical problem that the client window is a Unicode window and still goes A->W.
by Haidong Yu 30 Jul '21

30 Jul '21

2 1

[PATCH] wined3d: Negiotiate less specific memory types on allocation failure.
by Jan Sikorski 30 Jul '21

30 Jul '21

Drop HOST_CACHED and/or DEVICE_LOCAL properties in case the device does not support a particular combination or there is no more space in a heap. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- Superseeds 210471 --- dlls/wined3d/buffer.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 4c5e2054fe0..6b0d84ce7a0 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1387,8 +1387,8 @@ static BOOL wined3d_buffer_vk_create_buffer_object(struct wined3d_buffer_vk *buf struct wined3d_context_vk *context_vk) { struct wined3d_resource *resource = &buffer_vk->b.resource; + VkMemoryPropertyFlags memory_type, want_memory_type; uint32_t bind_flags = resource->bind_flags; - VkMemoryPropertyFlags memory_type; VkBufferUsageFlags usage; usage = VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT; @@ -1409,16 +1409,28 @@ static BOOL wined3d_buffer_vk_create_buffer_object(struct wined3d_buffer_vk *buf if (bind_flags & (WINED3D_BIND_RENDER_TARGET | WINED3D_BIND_DEPTH_STENCIL)) FIXME("Ignoring some bind flags %#x.\n", bind_flags); - memory_type = 0; + want_memory_type = 0; if (!(resource->usage & WINED3DUSAGE_DYNAMIC)) - memory_type |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; + want_memory_type |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; if (resource->access & WINED3D_RESOURCE_ACCESS_MAP_R) - memory_type |= VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_CACHED_BIT; + want_memory_type |= VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_CACHED_BIT; else if (resource->access & WINED3D_RESOURCE_ACCESS_MAP_W) - memory_type |= VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT; + want_memory_type |= VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT; - if (!(wined3d_context_vk_create_bo(context_vk, resource->size, usage, memory_type, &buffer_vk->bo))) + memory_type = want_memory_type; + + while (!wined3d_context_vk_create_bo(context_vk, resource->size, usage, memory_type, &buffer_vk->bo)) { + if (memory_type & VK_MEMORY_PROPERTY_HOST_CACHED_BIT) + { + memory_type = want_memory_type & ~VK_MEMORY_PROPERTY_HOST_CACHED_BIT; + continue; + } + if (memory_type & VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT) + { + memory_type = (want_memory_type &= ~VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT); + continue; + } WARN("Failed to create Vulkan buffer.\n"); return FALSE; } -- 2.30.2

2 2

[PATCH] mfplat/allocator: Handle D3D11 resource sharing mode configuration attributes.
by Nikolay Sivov 30 Jul '21

30 Jul '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/sample.c | 11 ++++++- dlls/mfplat/tests/mfplat.c | 67 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/sample.c b/dlls/mfplat/sample.c index 09c65b5fcf1..d99e2b046a6 100644 --- a/dlls/mfplat/sample.c +++ b/dlls/mfplat/sample.c @@ -74,6 +74,7 @@ struct sample_allocator DXGI_FORMAT dxgi_format; unsigned int usage; unsigned int bindflags; + unsigned int miscflags; unsigned int buffer_count; } frame_desc; @@ -1352,6 +1353,7 @@ static HRESULT sample_allocator_allocate_sample(struct sample_allocator *allocat desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE; else if (desc.Usage == D3D11_USAGE_STAGING) desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE | D3D11_CPU_ACCESS_READ; + desc.MiscFlags = allocator->frame_desc.miscflags; if (SUCCEEDED(hr = ID3D11Device_CreateTexture2D(service->d3d11_device, &desc, NULL, &texture))) { @@ -1380,7 +1382,7 @@ static HRESULT sample_allocator_initialize(struct sample_allocator *allocator, u { struct surface_service service; DXGI_FORMAT dxgi_format; - unsigned int i; + unsigned int i, value; GUID major, subtype; UINT64 frame_size; IMFSample *sample; @@ -1415,6 +1417,7 @@ static HRESULT sample_allocator_initialize(struct sample_allocator *allocator, u dxgi_format = MFMapDX9FormatToDXGIFormat(subtype.Data1); allocator->frame_desc.bindflags = 0; + allocator->frame_desc.miscflags = 0; allocator->frame_desc.usage = D3D11_USAGE_DEFAULT; if (dxgi_format == DXGI_FORMAT_B8G8R8A8_UNORM || @@ -1428,7 +1431,13 @@ static HRESULT sample_allocator_initialize(struct sample_allocator *allocator, u } if (attributes) + { IMFAttributes_GetUINT32(attributes, &MF_SA_D3D11_BINDFLAGS, &allocator->frame_desc.bindflags); + if (SUCCEEDED(IMFAttributes_GetUINT32(attributes, &MF_SA_D3D11_SHARED, &value)) && value) + allocator->frame_desc.miscflags |= D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX; + if (SUCCEEDED(IMFAttributes_GetUINT32(attributes, &MF_SA_D3D11_SHARED_WITHOUT_MUTEX, &value)) && value) + allocator->frame_desc.miscflags |= D3D11_RESOURCE_MISC_SHARED; + } sample_allocator_set_media_type(allocator, media_type); sample_allocator_set_attributes(allocator, attributes); diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index f1c041b7eb4..3e0907e41ad 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -6798,6 +6798,12 @@ static void test_sample_allocator(void) D3D11_USAGE_STAGING, D3D11_USAGE_STAGING + 1, }; + static const unsigned int sharing[] = + { + D3D11_RESOURCE_MISC_SHARED | D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX, + D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX, + D3D11_RESOURCE_MISC_SHARED, + }; if (!pMFCreateVideoSampleAllocatorEx) { @@ -7155,6 +7161,67 @@ todo_wine IMFVideoSampleAllocatorEx_Release(allocatorex); } + /* MF_SA_D3D11_SHARED, MF_SA_D3D11_SHARED_WITHOUT_MUTEX */ + for (i = 0; i < ARRAY_SIZE(sharing); ++i) + { + hr = pMFCreateVideoSampleAllocatorEx(&IID_IMFVideoSampleAllocatorEx, (void **)&allocatorex); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocatorEx_SetDirectXManager(allocatorex, (IUnknown *)manager); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFAttributes_DeleteAllItems(attributes); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFAttributes_SetUINT32(attributes, &MF_SA_D3D11_USAGE, D3D11_USAGE_DEFAULT); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + if (sharing[i] & D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX) + { + hr = IMFAttributes_SetUINT32(attributes, &MF_SA_D3D11_SHARED, TRUE); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + } + + if (sharing[i] & D3D11_RESOURCE_MISC_SHARED) + { + hr = IMFAttributes_SetUINT32(attributes, &MF_SA_D3D11_SHARED_WITHOUT_MUTEX, TRUE); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + } + + hr = IMFVideoSampleAllocatorEx_InitializeSampleAllocatorEx(allocatorex, 0, 0, attributes, video_type); + if (sharing[i] == (D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX | D3D11_RESOURCE_MISC_SHARED)) + { + todo_wine + ok(hr == E_INVALIDARG, "%u: Unexpected hr %#x.\n", i, hr); + IMFVideoSampleAllocatorEx_Release(allocatorex); + continue; + } + ok(hr == S_OK, "%u: Unexpected hr %#x.\n", i, hr); + + hr = IMFVideoSampleAllocatorEx_AllocateSample(allocatorex, &sample); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFSample_GetBufferByIndex(sample, 0, &buffer); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMFDXGIBuffer, (void **)&dxgi_buffer); + ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); + + hr = IMFDXGIBuffer_GetResource(dxgi_buffer, &IID_ID3D11Texture2D, (void **)&texture); + ok(hr == S_OK, "Failed to get resource, hr %#x.\n", hr); + + ID3D11Texture2D_GetDesc(texture, &desc); + ok(desc.MiscFlags == sharing[i], "%u: unexpected misc flags %#x.\n", i, desc.MiscFlags); + + ID3D11Texture2D_Release(texture); + IMFDXGIBuffer_Release(dxgi_buffer); + IMFMediaBuffer_Release(buffer); + + IMFSample_Release(sample); + + IMFVideoSampleAllocatorEx_Release(allocatorex); + } + IMFAttributes_Release(attributes); IMFDXGIDeviceManager_Release(manager); -- 2.30.2

2 1

[PATCH 1/2] wined3d: Track queries started inside/outside of a render pass separately.
by Jan Sikorski 30 Jul '21

30 Jul '21

Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/wined3d/context_vk.c | 28 +++++++++++++-- dlls/wined3d/query.c | 64 ++++++++++++++++++++++++++-------- dlls/wined3d/wined3d_private.h | 7 +++- 3 files changed, 81 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 4b1bea38370..c718f3facd5 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1285,13 +1285,26 @@ void wined3d_context_vk_end_current_render_pass(struct wined3d_context_vk *conte VkCommandBuffer vk_command_buffer = context_vk->current_command_buffer.vk_command_buffer; const struct wined3d_vk_info *vk_info = context_vk->vk_info; struct wined3d_query_pool_vk *pool_vk, *pool_vk_next; + struct wined3d_query_vk *query_vk; if (context_vk->vk_render_pass) { + LIST_FOR_EACH_ENTRY(query_vk, &context_vk->render_pass_queries, struct wined3d_query_vk, entry) + wined3d_query_vk_suspend(query_vk, context_vk); + VK_CALL(vkCmdEndRenderPass(vk_command_buffer)); context_vk->vk_render_pass = VK_NULL_HANDLE; VK_CALL(vkCmdPipelineBarrier(vk_command_buffer, VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT, VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT, 0, 0, NULL, 0, NULL, 0, NULL)); + + LIST_FOR_EACH_ENTRY(query_vk, &context_vk->render_pass_queries, struct wined3d_query_vk, entry) + { + if (!wined3d_context_vk_allocate_query(context_vk, query_vk->q.type, &query_vk->pool_idx)) + { + ERR("Failed to allocate new query.\n"); + break; + } + } } if (context_vk->vk_framebuffer) @@ -1561,6 +1574,12 @@ VkCommandBuffer wined3d_context_vk_get_command_buffer(struct wined3d_context_vk wined3d_context_vk_accumulate_pending_queries(context_vk); LIST_FOR_EACH_ENTRY(query_vk, &context_vk->active_queries, struct wined3d_query_vk, entry) { + if (!wined3d_context_vk_allocate_query(context_vk, query_vk->q.type, &query_vk->pool_idx)) + { + ERR("Failed to allocate new query.\n"); + break; + } + wined3d_query_vk_resume(query_vk, context_vk); } @@ -1594,12 +1613,11 @@ void wined3d_context_vk_submit_command_buffer(struct wined3d_context_vk *context TRACE("Submitting command buffer %p with id 0x%s.\n", buffer->vk_command_buffer, wine_dbgstr_longlong(buffer->id)); + wined3d_context_vk_end_current_render_pass(context_vk); + LIST_FOR_EACH_ENTRY(query_vk, &context_vk->active_queries, struct wined3d_query_vk, entry) - { wined3d_query_vk_suspend(query_vk, context_vk); - } - wined3d_context_vk_end_current_render_pass(context_vk); context_vk->graphics.vk_pipeline = VK_NULL_HANDLE; context_vk->update_compute_pipeline = 1; context_vk->update_stream_output = 1; @@ -2323,6 +2341,7 @@ static bool wined3d_context_vk_begin_render_pass(struct wined3d_context_vk *cont struct wined3d_rendertarget_view_vk *rtv_vk; struct wined3d_rendertarget_view *view; const VkPhysicalDeviceLimits *limits; + struct wined3d_query_vk *query_vk; VkRenderPassBeginInfo begin_info; unsigned int attachment_count, i; VkFramebufferCreateInfo fb_desc; @@ -2409,6 +2428,8 @@ static bool wined3d_context_vk_begin_render_pass(struct wined3d_context_vk *cont begin_info.pClearValues = NULL; VK_CALL(vkCmdBeginRenderPass(vk_command_buffer, &begin_info, VK_SUBPASS_CONTENTS_INLINE)); + LIST_FOR_EACH_ENTRY(query_vk, &context_vk->render_pass_queries, struct wined3d_query_vk, entry) + wined3d_query_vk_resume(query_vk, context_vk); return true; } @@ -3460,6 +3481,7 @@ HRESULT wined3d_context_vk_init(struct wined3d_context_vk *context_vk, struct wi wined3d_context_vk_init_graphics_pipeline_key(context_vk); + list_init(&context_vk->render_pass_queries); list_init(&context_vk->active_queries); list_init(&context_vk->completed_query_pools); list_init(&context_vk->free_occlusion_query_pools); diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 1e082f8ffae..4628cb98cdc 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -1548,11 +1548,6 @@ static void wined3d_query_vk_begin(struct wined3d_query_vk *query_vk, struct wined3d_query_pool_vk *pool_vk; size_t idx; - if (!wined3d_context_vk_allocate_query(context_vk, query_vk->q.type, &query_vk->pool_idx)) - { - ERR("Failed to allocate new query.\n"); - return; - } pool_vk = query_vk->pool_idx.pool_vk; idx = query_vk->pool_idx.idx; @@ -1588,6 +1583,7 @@ void wined3d_query_vk_resume(struct wined3d_query_vk *query_vk, struct wined3d_c VkCommandBuffer vk_command_buffer = context_vk->current_command_buffer.vk_command_buffer; wined3d_query_vk_begin(query_vk, context_vk, vk_command_buffer); + query_vk->flags |= WINED3D_QUERY_VK_FLAG_ACTIVE; } void wined3d_query_vk_suspend(struct wined3d_query_vk *query_vk, struct wined3d_context_vk *context_vk) @@ -1597,6 +1593,7 @@ void wined3d_query_vk_suspend(struct wined3d_query_vk *query_vk, struct wined3d_ wined3d_query_vk_end(query_vk, context_vk, vk_command_buffer); wined3d_context_vk_add_pending_query(context_vk, query_vk); query_vk->pool_idx.pool_vk = NULL; + query_vk->flags &= ~WINED3D_QUERY_VK_FLAG_ACTIVE; } static BOOL wined3d_query_vk_poll(struct wined3d_query *query, uint32_t flags) @@ -1655,30 +1652,69 @@ static BOOL wined3d_query_vk_issue(struct wined3d_query *query, uint32_t flags) wined3d_context_vk_remove_pending_queries(context_vk, query_vk); memset((void *)query->data, 0, query->data_size); vk_command_buffer = wined3d_context_vk_get_command_buffer(context_vk); - if (query_vk->started) + if (query_vk->flags & WINED3D_QUERY_VK_FLAG_STARTED) { - wined3d_query_vk_end(query_vk, context_vk, vk_command_buffer); + if (query_vk->flags & WINED3D_QUERY_VK_FLAG_ACTIVE) + wined3d_query_vk_end(query_vk, context_vk, vk_command_buffer); list_remove(&query_vk->entry); } if (query_vk->pool_idx.pool_vk) wined3d_query_pool_vk_mark_complete(query_vk->pool_idx.pool_vk, query_vk->pool_idx.idx, context_vk); - wined3d_query_vk_begin(query_vk, context_vk, vk_command_buffer); - list_add_head(&context_vk->active_queries, &query_vk->entry); - query_vk->started = true; + if (!wined3d_context_vk_allocate_query(context_vk, query_vk->q.type, &query_vk->pool_idx)) + { + ERR("Failed to allocate new query.\n"); + return false; + } + + /* A query need to either begin and end inside a single render pass, + * or begin and end ouside of a render pass. Occlusion queries, if issued + * ouside of a render pass, are queued up and only begun when a render + * pass is started, to avoid interrupting it when the query ends. */ + if (context_vk->vk_render_pass) + { + wined3d_query_vk_begin(query_vk, context_vk, vk_command_buffer); + list_add_head(&context_vk->render_pass_queries, &query_vk->entry); + query_vk->flags |= WINED3D_QUERY_VK_FLAG_ACTIVE | WINED3D_QUERY_VK_FLAG_RENDER_PASS; + } + else if (query->type == WINED3D_QUERY_TYPE_OCCLUSION) + { + list_add_head(&context_vk->render_pass_queries, &query_vk->entry); + query_vk->flags |= WINED3D_QUERY_VK_FLAG_RENDER_PASS; + } + else + { + wined3d_query_vk_begin(query_vk, context_vk, vk_command_buffer); + list_add_head(&context_vk->active_queries, &query_vk->entry); + query_vk->flags |= WINED3D_QUERY_VK_FLAG_ACTIVE; + } + + query_vk->flags |= WINED3D_QUERY_VK_FLAG_STARTED; context_release(&context_vk->c); } - if (flags & WINED3DISSUE_END && query_vk->started) + if (flags & WINED3DISSUE_END && query_vk->flags & WINED3D_QUERY_VK_FLAG_STARTED) { context_vk = wined3d_context_vk(context_acquire(&device_vk->d, NULL, 0)); /* If the query was already ended because the command buffer was - * flushed, we don't need to end it here. */ - if ((vk_command_buffer = context_vk->current_command_buffer.vk_command_buffer)) + * flushed or the render pass ended, we don't need to end it here. */ + if (query_vk->flags & WINED3D_QUERY_VK_FLAG_ACTIVE) + { + vk_command_buffer = wined3d_context_vk_get_command_buffer(context_vk); + if (!(query_vk->flags & WINED3D_QUERY_VK_FLAG_RENDER_PASS)) + wined3d_context_vk_end_current_render_pass(context_vk); wined3d_query_vk_end(query_vk, context_vk, vk_command_buffer); + } + else if (query_vk->pool_idx.pool_vk) + { + /* It was queued, but never activated. */ + wined3d_query_pool_vk_mark_complete(query_vk->pool_idx.pool_vk, + query_vk->pool_idx.idx, context_vk); + query_vk->pool_idx.pool_vk = NULL; + } list_remove(&query_vk->entry); - query_vk->started = false; + query_vk->flags = 0; poll = true; context_release(&context_vk->c); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a2048fc6ea6..86eae149306 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2050,13 +2050,17 @@ struct wined3d_query_pool_idx_vk size_t idx; }; +#define WINED3D_QUERY_VK_FLAG_ACTIVE 0x00000001 +#define WINED3D_QUERY_VK_FLAG_STARTED 0x00000002 +#define WINED3D_QUERY_VK_FLAG_RENDER_PASS 0x00000004 + struct wined3d_query_vk { struct wined3d_query q; struct list entry; struct wined3d_query_pool_idx_vk pool_idx; - bool started; + uint8_t flags; uint64_t command_buffer_id; uint32_t control_flags; size_t pending_count; @@ -2580,6 +2584,7 @@ struct wined3d_context_vk VkDeviceSize vk_so_offsets[WINED3D_MAX_STREAM_OUTPUT_BUFFERS]; struct wined3d_bo_vk vk_so_counter_bo; + struct list render_pass_queries; struct list active_queries; struct wined3d_pending_queries_vk pending_queries; struct list completed_query_pools; -- 2.30.2

3 4

[PATCH] kernel32: add GetCurrentPackagePath stub (resend)
by Austin English 30 Jul '21

30 Jul '21

Signed-off-by: Austin English <austinenglish(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51374 --- .../api-ms-win-appmodel-runtime-l1-1-1.spec | 2 +- dlls/kernel32/kernel32.spec | 1 + dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/version.c | 10 ++++++++++ 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec b/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec index 99d1d9f3835..9d5546ed315 100644 --- a/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec +++ b/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec @@ -7,7 +7,7 @@ @ stdcall GetCurrentPackageFullName(ptr ptr) kernel32.GetCurrentPackageFullName @ stdcall GetCurrentPackageId(ptr ptr) kernel32.GetCurrentPackageId @ stub GetCurrentPackageInfo -@ stub GetCurrentPackagePath +@ stdcall GetCurrentPackagePath(ptr ptr) kernel32.GetCurrentPackagePath @ stub GetPackageApplicationIds @ stdcall GetPackageFamilyName(long ptr ptr) kernel32.GetPackageFamilyName @ stdcall GetPackageFullName(long ptr ptr) kernel32.GetPackageFullName diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 0f474504bfe..6c02b17c7cf 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -630,6 +630,7 @@ @ stdcall GetCurrentPackageFamilyName(ptr ptr) kernelbase.GetCurrentPackageFamilyName @ stdcall GetCurrentPackageFullName(ptr ptr) kernelbase.GetCurrentPackageFullName @ stdcall GetCurrentPackageId(ptr ptr) kernelbase.GetCurrentPackageId +@ stdcall GetCurrentPackagePath(ptr ptr) kernelbase.GetCurrentPackagePath @ stdcall -norelay GetCurrentProcess() KERNEL32_GetCurrentProcess @ stdcall -norelay GetCurrentProcessId() KERNEL32_GetCurrentProcessId @ stdcall GetCurrentProcessorNumber() ntdll.NtGetCurrentProcessorNumber diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 94a648f65aa..e1fb19eceb0 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -463,7 +463,7 @@ @ stdcall GetCurrentPackageFullName(ptr ptr) @ stdcall GetCurrentPackageId(ptr ptr) # @ stub GetCurrentPackageInfo -# @ stub GetCurrentPackagePath +@ stdcall GetCurrentPackagePath(ptr ptr) # @ stub GetCurrentPackageResourcesContext # @ stub GetCurrentPackageSecurityContext @ stdcall -norelay GetCurrentProcess() kernelbase_GetCurrentProcess diff --git a/dlls/kernelbase/version.c b/dlls/kernelbase/version.c index 96349708989..a5a1f67087f 100644 --- a/dlls/kernelbase/version.c +++ b/dlls/kernelbase/version.c @@ -1551,6 +1551,16 @@ LONG WINAPI /* DECLSPEC_HOTPATCH */ GetCurrentPackageId( UINT32 *len, BYTE *buff } +/*********************************************************************** + * GetCurrentPackagePath (kernelbase.@) + */ +LONG WINAPI /* DECLSPEC_HOTPATCH */ GetCurrentPackagePath( UINT32 *length, WCHAR *path ) +{ + FIXME( "(%p %p): stub\n", length, path ); + return APPMODEL_ERROR_NO_PACKAGE; +} + + /*********************************************************************** * GetPackageFullName (kernelbase.@) */ -- 2.30.2

2 1

[PATCH] user32: Fix the logical problem that the client window is a Unicode window and still goes A->W.
by Haidong Yu 30 Jul '21

30 Jul '21

2 1

[PATCH 1/6] ws2_32: Move the getsockopt(IPV6_UNICAST_HOPS) implementation to ntdll.
by Zebediah Figura 30 Jul '21

30 Jul '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntdll/unix/socket.c | 3 +++ dlls/ws2_32/socket.c | 2 ++ include/wine/afd.h | 1 + 3 files changed, 6 insertions(+) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index e9239bd7bb9..0a0ba7e2a98 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1882,6 +1882,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc case IOCTL_AFD_WINE_SET_IPV6_MULTICAST_LOOP: return do_setsockopt( handle, io, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, in_buffer, in_size ); + case IOCTL_AFD_WINE_GET_IPV6_UNICAST_HOPS: + return do_getsockopt( handle, io, IPPROTO_IPV6, IPV6_UNICAST_HOPS, out_buffer, out_size ); + default: { if ((code >> 16) == FILE_DEVICE_NETWORK) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 1f8020b5c3e..87f864d3c2b 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2422,6 +2422,8 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_MULTICAST_LOOP, optval, optlen ); case WS_IPV6_UNICAST_HOPS: + return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_UNICAST_HOPS, optval, optlen ); + case WS_IPV6_V6ONLY: #ifdef IPV6_UNICAST_IF case WS_IPV6_UNICAST_IF: diff --git a/include/wine/afd.h b/include/wine/afd.h index 6c84b72c028..9427ce46535 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -217,6 +217,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_SET_IPV6_MULTICAST_IF WINE_AFD_IOC(272) #define IOCTL_AFD_WINE_GET_IPV6_MULTICAST_LOOP WINE_AFD_IOC(273) #define IOCTL_AFD_WINE_SET_IPV6_MULTICAST_LOOP WINE_AFD_IOC(274) +#define IOCTL_AFD_WINE_GET_IPV6_UNICAST_HOPS WINE_AFD_IOC(275) struct afd_create_params { -- 2.30.2

1 5

[PATCH 1/3] d2d1/tests: Add failure tests for ID2D1Effect_GetValue().
by Ziqing Hui 30 Jul '21

30 Jul '21

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- This patch is identical to patch 210309. dlls/d2d1/tests/d2d1.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 72487692abf..629bbd65523 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9680,13 +9680,14 @@ static void test_mt_factory(BOOL d3d11) static void test_effect(BOOL d3d11) { - unsigned int i, min_inputs, max_inputs; + unsigned int i, min_inputs, max_inputs, str_size; D2D1_BUFFER_PRECISION precision; ID2D1Image *image_a, *image_b; struct d2d1_test_context ctx; ID2D1DeviceContext *context; ID2D1Factory1 *factory; ID2D1Effect *effect; + BYTE buffer[64]; BOOL cached; CLSID clsid; HRESULT hr; @@ -9735,6 +9736,33 @@ static void test_effect(BOOL d3d11) todo_wine { + hr = ID2D1Effect_GetValue(effect, 0xdeadbeef, D2D1_PROPERTY_TYPE_CLSID, (BYTE *)&clsid, sizeof(clsid)); + ok(hr == D2DERR_INVALID_PROPERTY, "Got unexpected hr %#x.\n", hr); + + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CLSID, D2D1_PROPERTY_TYPE_CLSID, buffer, sizeof(clsid) + 1); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CLSID, D2D1_PROPERTY_TYPE_CLSID, buffer, sizeof(clsid) - 1); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CLSID, D2D1_PROPERTY_TYPE_CLSID, buffer, sizeof(clsid)); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_DISPLAYNAME, D2D1_PROPERTY_TYPE_STRING, buffer, sizeof(buffer)); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + str_size = (wcslen((WCHAR *)buffer) + 1) * sizeof(WCHAR); + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_DISPLAYNAME, D2D1_PROPERTY_TYPE_STRING, buffer, str_size); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_DISPLAYNAME, D2D1_PROPERTY_TYPE_STRING, buffer, str_size - 1); + ok(hr == D2DERR_INSUFFICIENT_BUFFER, "Got unexpected hr %#x.\n", hr); + + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CLSID, 0xdeadbeef, (BYTE *)&clsid, sizeof(clsid)); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CLSID, D2D1_PROPERTY_TYPE_UNKNOWN, (BYTE *)&clsid, sizeof(clsid)); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CLSID, D2D1_PROPERTY_TYPE_VECTOR4, (BYTE *)&clsid, sizeof(clsid)); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CLSID, D2D1_PROPERTY_TYPE_VECTOR4, buffer, sizeof(buffer)); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CLSID, D2D1_PROPERTY_TYPE_CLSID, (BYTE *)&clsid, sizeof(clsid)); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); -- 2.25.1

2 5

[PATCH 0/4] Implement reflink support
by Alex Xu (Hello71) 29 Jul '21

29 Jul '21

Over the years, Wine prefixes have gotten bigger and bigger, for a number of reasons. Creating a new Wine prefix for each application is still the current recommendation, as despite the best efforts of Wine developers, some applications still require system-wide workarounds. This leads to significant bloat for each application installed. With a MinGW build of Wine without Mono or Gecko, new 32-bit prefixes are over 150 MB, and new 64-bit prefixes are over 300 MB. The vast majority of these files are byte-for-byte identical to Wine's central DLL copies. This patch set implements reflink support in Wine via the copy_file_range syscall. The reasons for selecting copy_file_range over FICLONE are outlined in patch 2. A previous unpublished version of this patch set used FICLONERANGE, but it was less convenient to use from setupapi and has inferior system support. When reflink is supported by the underlying filesystem, new Wine prefix sizes with Mono and Gecko disabled are reduced to less than 1 MB. The resulting Wine prefix is byte-for-byte identical to one created without reflink, but occupies less space on disk. If hard links or symlinks were used, if an application such as winetricks writes to a system file, it would overwrite the central copy. With reflink, the file blocks will be transparently copied by the Linux kernel so that each Wine prefix can be independent. Some files cannot be deduplicated in the current Wine system, as they are dynamically generated during the Wine prefix installation process. These include 16-bit fake DLLs and manifest files. In theory, it should be possible to pre-generate these files, but considering the Wine prefix size is already reduced to less than 1 MB, I decided that the extra space savings was not worth the effort. Alex Xu (Hello71) (4): Handle FSCTL in NtDeviceIoControlFile. Add support for IOCTL_COPYCHUNK. kernelbase: use IOCTL_COPYCHUNK in CopyFile* setupapi: Use IOCTL_COPYCHUNK, avoid buffering whole file configure | 1 + configure.ac | 1 + dlls/kernel32/file.c | 25 ++--- dlls/kernelbase/file.c | 51 ++++------ dlls/ntdll/unix/file.c | 97 +++++++++++++++++++ dlls/setupapi/fakedll.c | 200 ++++++++++++++++++++++------------------ include/config.h.in | 3 + include/winioctl.h | 34 +++++++ 8 files changed, 270 insertions(+), 142 deletions(-) -- 2.32.0

4 10

[PATCH] wined3d: Do not request device local memory if we also want it to be host visible.
by Jan Sikorski 29 Jul '21

29 Jul '21

Some implementations do not support this combination. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/wined3d/buffer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 4c5e2054fe0..4420885b15f 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1410,12 +1410,12 @@ static BOOL wined3d_buffer_vk_create_buffer_object(struct wined3d_buffer_vk *buf FIXME("Ignoring some bind flags %#x.\n", bind_flags); memory_type = 0; - if (!(resource->usage & WINED3DUSAGE_DYNAMIC)) - memory_type |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; if (resource->access & WINED3D_RESOURCE_ACCESS_MAP_R) memory_type |= VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_CACHED_BIT; else if (resource->access & WINED3D_RESOURCE_ACCESS_MAP_W) memory_type |= VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT; + else if (!(resource->usage & WINED3DUSAGE_DYNAMIC)) + memory_type |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; if (!(wined3d_context_vk_create_bo(context_vk, resource->size, usage, memory_type, &buffer_vk->bo))) { -- 2.30.2

4 6

[PATCH v3 1/3] kernelbase/tests: Fix the Sleep() test for non-default timer resolutions.
by Francois Gouget 29 Jul '21

29 Jul '21

Also defend against timer resolution changes during the test. Reduce the test duration a bit. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51533 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- v2: The timer resolution change and test duration. v3: No change. This should fix the failures on cw-rx460 when the Radeon driver sets the timer resolution to 2 ms. --- dlls/kernelbase/tests/sync.c | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/kernelbase/tests/sync.c b/dlls/kernelbase/tests/sync.c index 50ce62602b0..8127b4238b9 100644 --- a/dlls/kernelbase/tests/sync.c +++ b/dlls/kernelbase/tests/sync.c @@ -19,10 +19,14 @@ */ #include <stdarg.h> +#include <stdlib.h> + +#include <ntstatus.h> +#define WIN32_NO_STATUS #include <windef.h> #include <winbase.h> -#include <stdlib.h> #include <winerror.h> +#include <winternl.h> #include "wine/test.h" @@ -176,7 +180,9 @@ static void test_Sleep(void) { LARGE_INTEGER frequency; LARGE_INTEGER t1, t2; - double elapsed_time; + double elapsed_time, min, max; + ULONG dummy, r1, r2; + NTSTATUS status; BOOL ret; int i; @@ -186,15 +192,30 @@ static void test_Sleep(void) ret = QueryPerformanceCounter(&t1); ok(ret, "QueryPerformanceCounter failed\n"); - for (i = 0; i < 100; i++) { + /* Get the timer resolution before... */ + r1 = 156250; + status = NtQueryTimerResolution(&dummy, &dummy, &r1); + todo_wine ok(status == STATUS_SUCCESS, "NtQueryTimerResolution() failed (%x)\n", status); + + for (i = 0; i < 50; i++) { Sleep(1); } ret = QueryPerformanceCounter(&t2); ok(ret, "QueryPerformanceCounter failed\n"); + /* ...and after in case some other process changes it during this test */ + r2 = 156250; + status = NtQueryTimerResolution(&dummy, &dummy, &r2); + todo_wine ok(status == STATUS_SUCCESS, "NtQueryTimerResolution() failed (%x)\n", status); + elapsed_time = (t2.QuadPart - t1.QuadPart) / (double)frequency.QuadPart; - todo_wine ok(elapsed_time >= 1.5 && elapsed_time <= 4.0, "got %f\n", elapsed_time); + min = 50.0 * (r1 < r2 ? r1 : r2) / 10000000.0; + max = 50.0 * (r1 < r2 ? r2 : r1) / 10000000.0; + + /* Add an extra 1s to account for potential scheduling delays */ + todo_wine ok(0.9 * min <= elapsed_time && elapsed_time <= 1.0 + max, + "got %f, expected between %f and %f\n", elapsed_time, min, max); } START_TEST(sync) -- 2.20.1

1 2

[PATCH v2 1/3] kernelbase/tests: Fix the Sleep() test for non-default timer resolutions.
by Francois Gouget 29 Jul '21

29 Jul '21

Also defend against timer resolution changes during the test. Reduce the test duration a bit. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51533 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This should fix the failures on cw-rx460 when the Radeon driver sets the timer resolution to 2 ms. --- dlls/kernelbase/tests/sync.c | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/kernelbase/tests/sync.c b/dlls/kernelbase/tests/sync.c index 50ce62602b0..8127b4238b9 100644 --- a/dlls/kernelbase/tests/sync.c +++ b/dlls/kernelbase/tests/sync.c @@ -19,10 +19,14 @@ */ #include <stdarg.h> +#include <stdlib.h> + +#include <ntstatus.h> +#define WIN32_NO_STATUS #include <windef.h> #include <winbase.h> -#include <stdlib.h> #include <winerror.h> +#include <winternl.h> #include "wine/test.h" @@ -176,7 +180,9 @@ static void test_Sleep(void) { LARGE_INTEGER frequency; LARGE_INTEGER t1, t2; - double elapsed_time; + double elapsed_time, min, max; + ULONG dummy, r1, r2; + NTSTATUS status; BOOL ret; int i; @@ -186,15 +192,30 @@ static void test_Sleep(void) ret = QueryPerformanceCounter(&t1); ok(ret, "QueryPerformanceCounter failed\n"); - for (i = 0; i < 100; i++) { + /* Get the timer resolution before... */ + r1 = 156250; + status = NtQueryTimerResolution(&dummy, &dummy, &r1); + todo_wine ok(status == STATUS_SUCCESS, "NtQueryTimerResolution() failed (%x)\n", status); + + for (i = 0; i < 50; i++) { Sleep(1); } ret = QueryPerformanceCounter(&t2); ok(ret, "QueryPerformanceCounter failed\n"); + /* ...and after in case some other process changes it during this test */ + r2 = 156250; + status = NtQueryTimerResolution(&dummy, &dummy, &r2); + todo_wine ok(status == STATUS_SUCCESS, "NtQueryTimerResolution() failed (%x)\n", status); + elapsed_time = (t2.QuadPart - t1.QuadPart) / (double)frequency.QuadPart; - todo_wine ok(elapsed_time >= 1.5 && elapsed_time <= 4.0, "got %f\n", elapsed_time); + min = 50.0 * (r1 < r2 ? r1 : r2) / 10000000.0; + max = 50.0 * (r1 < r2 ? r2 : r1) / 10000000.0; + + /* Add an extra 1s to account for potential scheduling delays */ + todo_wine ok(0.9 * min <= elapsed_time && elapsed_time <= 1.0 + max, + "got %f, expected between %f and %f\n", elapsed_time, min, max); } START_TEST(sync) -- 2.20.1

2 4

[PATCH v2 1/2] kernel32/tests: Test whether console color attributes are copied to the new screen buffer
by Hugh McMaster 29 Jul '21

29 Jul '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- v2: Remove errant trace() and call CloseHandle() sooner. dlls/kernel32/tests/console.c | 78 +++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 918ecac8ac4..6b723c3d6c8 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -973,6 +973,83 @@ static void testScreenBuffer(HANDLE hConOut) SetConsoleOutputCP(oldcp); } +static void test_new_screen_buffer_color_attributes(HANDLE hConOut) +{ + CONSOLE_SCREEN_BUFFER_INFOEX csbi, csbi2; + BOOL ret; + HANDLE hConOut2; + WORD orig_attr, orig_popup, attr; + + csbi.cbSize = csbi2.cbSize = sizeof(CONSOLE_SCREEN_BUFFER_INFOEX); + + ret = GetConsoleScreenBufferInfoEx(hConOut, &csbi); + ok(ret, "GetConsoleScreenBufferInfoEx failed: error %u\n", GetLastError()); + orig_attr = csbi.wAttributes; + orig_popup = csbi.wPopupAttributes; + + hConOut2 = CreateConsoleScreenBuffer(GENERIC_READ|GENERIC_WRITE, 0, NULL, + CONSOLE_TEXTMODE_BUFFER, NULL); + ok(hConOut2 != INVALID_HANDLE_VALUE, "CreateConsoleScreenBuffer failed: error %u\n", GetLastError()); + + ret = GetConsoleScreenBufferInfoEx(hConOut2, &csbi2); + ok(ret, "GetConsoleScreenBufferInfoEx failed: error %u\n", GetLastError()); + CloseHandle(hConOut2); + + todo_wine ok(csbi2.wAttributes == orig_attr, "Character Attributes should have been copied: " + "got %#x, expected %#x\n", csbi2.wAttributes, orig_attr); + todo_wine ok(csbi2.wPopupAttributes != orig_popup, "Popup Attributes should not match original value\n"); + todo_wine ok(csbi2.wPopupAttributes == orig_attr, "Popup Attributes should match Character Attributes\n"); + + /* Test different Character Attributes */ + attr = FOREGROUND_BLUE|BACKGROUND_GREEN; + ret = SetConsoleTextAttribute(hConOut, attr); + ok(ret, "SetConsoleTextAttribute failed: error %u\n", GetLastError()); + + hConOut2 = CreateConsoleScreenBuffer(GENERIC_READ|GENERIC_WRITE, 0, NULL, + CONSOLE_TEXTMODE_BUFFER, NULL); + ok(hConOut2 != INVALID_HANDLE_VALUE, "CreateConsoleScreenBuffer failed: error %u\n", GetLastError()); + + memset(&csbi2, 0, sizeof(CONSOLE_SCREEN_BUFFER_INFOEX)); + csbi2.cbSize = sizeof(CONSOLE_SCREEN_BUFFER_INFOEX); + + ret = GetConsoleScreenBufferInfoEx(hConOut2, &csbi2); + ok(ret, "GetConsoleScreenBufferInfoEx failed: error %u\n", GetLastError()); + CloseHandle(hConOut2); + + todo_wine ok(csbi2.wAttributes == attr, "Character Attributes should have been copied: " + "got %#x, expected %#x\n", csbi2.wAttributes, attr); + todo_wine ok(csbi2.wPopupAttributes != orig_popup, "Popup Attributes should not match original value\n"); + todo_wine ok(csbi2.wPopupAttributes == attr, "Popup Attributes should match Character Attributes\n"); + + ret = SetConsoleTextAttribute(hConOut, orig_attr); + ok(ret, "SetConsoleTextAttribute failed: error %u\n", GetLastError()); + + /* Test inheritance of different Popup Attributes */ + csbi.wPopupAttributes = attr; + ret = SetConsoleScreenBufferInfoEx(hConOut, &csbi); + ok(ret, "SetConsoleScreenBufferInfoEx failed: error %u\n", GetLastError()); + + hConOut2 = CreateConsoleScreenBuffer(GENERIC_READ|GENERIC_WRITE, 0, NULL, + CONSOLE_TEXTMODE_BUFFER, NULL); + ok(hConOut2 != INVALID_HANDLE_VALUE, "CreateConsoleScreenBuffer failed: error %u\n", GetLastError()); + + memset(&csbi2, 0, sizeof(CONSOLE_SCREEN_BUFFER_INFOEX)); + csbi2.cbSize = sizeof(CONSOLE_SCREEN_BUFFER_INFOEX); + + ret = GetConsoleScreenBufferInfoEx(hConOut2, &csbi2); + ok(ret, "GetConsoleScreenBufferInfoEx failed: error %u\n", GetLastError()); + CloseHandle(hConOut2); + + todo_wine ok(csbi2.wAttributes == orig_attr, "Character Attributes should have been copied: " + "got %#x, expected %#x\n", csbi2.wAttributes, orig_attr); + todo_wine ok(csbi2.wPopupAttributes != orig_popup, "Popup Attributes should not match original value\n"); + todo_wine ok(csbi2.wPopupAttributes == orig_attr, "Popup Attributes should match Character Attributes\n"); + + csbi.wPopupAttributes = orig_popup; + ret = SetConsoleScreenBufferInfoEx(hConOut, &csbi); + ok(ret, "SetConsoleScreenBufferInfoEx failed: error %u\n", GetLastError()); +} + static void CALLBACK signaled_function(void *p, BOOLEAN timeout) { HANDLE event = p; @@ -4506,6 +4583,7 @@ START_TEST(console) testScroll(hConOut, sbi.dwSize); /* will test sb creation / modification / codepage handling */ if (!test_current) testScreenBuffer(hConOut); + test_new_screen_buffer_color_attributes(hConOut); /* Test waiting for a console handle */ testWaitForConsoleInput(hConIn); test_wait(hConIn, hConOut); -- 2.32.0

4 13

[PATCH] wined3d: Add support for AYUV surfaces.
by Nikolay Sivov 29 Jul '21

29 Jul '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- I was unable to StretchRect() to work with AYUV source on Windows as a proper test, however it's possible to create such surfaces there. DXVA2 accepts this format as valid source surface too, I suspect dxva might have some way to make such format combination work. It's a relatively small change comparing to other YUV formats, and helps for the cases when video source is using AYUV output. dlls/wined3d/glsl_shader.c | 9 +++++++++ dlls/wined3d/utils.c | 11 +++++++++++ dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.h | 1 + 4 files changed, 22 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 5ae90148dc8..0ac081ceb6d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -12753,6 +12753,14 @@ static void glsl_blitter_generate_yuv_shader(struct wined3d_string_buffer *buffe shader_addline(buffer, " chroma = yuv.xz;\n"); break; + case COMPLEX_FIXUP_AYUV: + shader_addline(buffer, " vec4 ayuv = texture%s(sampler, out_texcoord.xy);\n", + needs_legacy_glsl_syntax(gl_info) ? tex_type : ""); + shader_addline(buffer, " chroma = ayuv.wz;\n"); + shader_addline(buffer, " luminance = ayuv.y;\n"); + shader_addline(buffer, " %s.w = ayuv.x;\n", output); + break; + default: FIXME("Unsupported fixup %#x.\n", complex_fixup); string_buffer_free(buffer); @@ -12877,6 +12885,7 @@ static GLuint glsl_blitter_generate_program(struct wined3d_glsl_blitter *blitter case COMPLEX_FIXUP_YV12: case COMPLEX_FIXUP_NV12: case COMPLEX_FIXUP_YUV: + case COMPLEX_FIXUP_AYUV: glsl_blitter_generate_yuv_shader(buffer, gl_info, args, output->buffer, tex_type, swizzle); break; case COMPLEX_FIXUP_NONE: diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 4019dd4d812..4d30816a8d9 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -66,6 +66,7 @@ format_index_remap[] = {WINED3DFMT_AL16, WINED3D_FORMAT_FOURCC_BASE + 21}, {WINED3DFMT_NV12, WINED3D_FORMAT_FOURCC_BASE + 22}, {WINED3DFMT_ATOC, WINED3D_FORMAT_FOURCC_BASE + 23}, + {WINED3DFMT_AYUV, WINED3D_FORMAT_FOURCC_BASE + 24}, }; #define WINED3D_FORMAT_COUNT (WINED3D_FORMAT_FOURCC_BASE + ARRAY_SIZE(format_index_remap)) @@ -85,6 +86,7 @@ static const struct wined3d_format_channels formats[] = * format id r g b a r g b a bpp depth stencil */ {WINED3DFMT_UNKNOWN, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, /* FourCC formats */ + {WINED3DFMT_AYUV, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0}, {WINED3DFMT_UYVY, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0}, {WINED3DFMT_YUY2, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0}, {WINED3DFMT_YV12, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, @@ -1412,6 +1414,10 @@ static const struct wined3d_format_texture_info format_texture_info[] = GL_ALPHA, GL_UNSIGNED_BYTE, 0, WINED3DFMT_FLAG_FILTERING, WINED3D_GL_LEGACY_CONTEXT, NULL}, + {WINED3DFMT_AYUV, GL_RGBA8, GL_RGBA8, 0, + GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV, 0, + WINED3DFMT_FLAG_FILTERING, + WINED3D_GL_EXT_NONE, NULL}, {WINED3DFMT_DXT1, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING @@ -3662,6 +3668,9 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ format->internal = 0; } + format = get_format_gl_internal(adapter, WINED3DFMT_AYUV); + format->f.color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_AYUV); + if (gl_info->supported[ARB_FRAGMENT_PROGRAM] || gl_info->supported[ARB_FRAGMENT_SHADER]) { format = get_format_gl_internal(adapter, WINED3DFMT_P8_UINT); @@ -4683,6 +4692,7 @@ const char *debug_d3dformat(enum wined3d_format_id format_id) FMT_TO_STR(WINED3DFMT_AL16); FMT_TO_STR(WINED3DFMT_NV12); FMT_TO_STR(WINED3DFMT_ATOC); + FMT_TO_STR(WINED3DFMT_AYUV); #undef FMT_TO_STR default: { @@ -5464,6 +5474,7 @@ static const char *debug_complex_fixup(enum complex_fixup fixup) WINED3D_TO_STR(COMPLEX_FIXUP_NV12); WINED3D_TO_STR(COMPLEX_FIXUP_P8); WINED3D_TO_STR(COMPLEX_FIXUP_YUV); + WINED3D_TO_STR(COMPLEX_FIXUP_AYUV); #undef WINED3D_TO_STR default: FIXME("Unrecognized complex fixup %#x\n", fixup); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a2048fc6ea6..0c302770694 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -166,6 +166,7 @@ enum complex_fixup COMPLEX_FIXUP_P8 = 4, COMPLEX_FIXUP_NV12 = 5, COMPLEX_FIXUP_YUV = 6, + COMPLEX_FIXUP_AYUV = 7, }; #include <pshpack2.h> diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 7be893b8f21..b99932059b2 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -271,6 +271,7 @@ enum wined3d_format_id WINED3DFMT_DF16 = WINEMAKEFOURCC('D','F','1','6'), WINED3DFMT_DF24 = WINEMAKEFOURCC('D','F','2','4'), WINED3DFMT_ATOC = WINEMAKEFOURCC('A','T','O','C'), + WINED3DFMT_AYUV = WINEMAKEFOURCC('A','Y','U','V'), WINED3DFMT_FORCE_DWORD = 0xffffffff }; -- 2.30.2

1 0

[PATCH 1/3] kernelbase/tests: Fix the Sleep() test for non-default timer resolutions.
by Francois Gouget 29 Jul '21

29 Jul '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51533 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This should fix the failures on cw-rx460 when the Radeon driver sets the timer resolution to 2 ms. --- dlls/kernelbase/tests/sync.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/kernelbase/tests/sync.c b/dlls/kernelbase/tests/sync.c index 50ce62602b0..54c2dfe99f5 100644 --- a/dlls/kernelbase/tests/sync.c +++ b/dlls/kernelbase/tests/sync.c @@ -19,10 +19,14 @@ */ #include <stdarg.h> +#include <stdlib.h> + +#include <ntstatus.h> +#define WIN32_NO_STATUS #include <windef.h> #include <winbase.h> -#include <stdlib.h> #include <winerror.h> +#include <winternl.h> #include "wine/test.h" @@ -176,7 +180,9 @@ static void test_Sleep(void) { LARGE_INTEGER frequency; LARGE_INTEGER t1, t2; - double elapsed_time; + double elapsed_time, expected_time; + ULONG dummy, cur; + NTSTATUS status; BOOL ret; int i; @@ -193,8 +199,15 @@ static void test_Sleep(void) ret = QueryPerformanceCounter(&t2); ok(ret, "QueryPerformanceCounter failed\n"); + cur = 156250; + status = NtQueryTimerResolution(&dummy, &dummy, &cur); + todo_wine ok(status == STATUS_SUCCESS, "NtQueryTimerResolution() failed (%x)\n", status); + expected_time = 100.0 * cur / 10000000.0; + elapsed_time = (t2.QuadPart - t1.QuadPart) / (double)frequency.QuadPart; - todo_wine ok(elapsed_time >= 1.5 && elapsed_time <= 4.0, "got %f\n", elapsed_time); + todo_wine ok(0.9 * expected_time <= elapsed_time && + elapsed_time <= 1.5 * expected_time, + "got %f, expected about %f\n", elapsed_time, expected_time); } START_TEST(sync) -- 2.20.1

2 5

[PATCH] wined3d: Mark the dcl_stream shader instruction as implemented.
by Zebediah Figura 29 Jul '21

29 Jul '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 5ae90148dc8..3032cf70bc0 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -11284,7 +11284,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DCL_RESOURCE_RAW */ shader_glsl_nop, /* WINED3DSIH_DCL_RESOURCE_STRUCTURED */ shader_glsl_nop, /* WINED3DSIH_DCL_SAMPLER */ shader_glsl_nop, - /* WINED3DSIH_DCL_STREAM */ NULL, + /* WINED3DSIH_DCL_STREAM */ shader_glsl_nop, /* WINED3DSIH_DCL_TEMPS */ shader_glsl_nop, /* WINED3DSIH_DCL_TESSELLATOR_DOMAIN */ shader_glsl_nop, /* WINED3DSIH_DCL_TESSELLATOR_OUTPUT_PRIMITIVE */ shader_glsl_nop, -- 2.30.2

2 1

[PATCH] wined3d: Use a designated initializer to initialize wined3d_settings.
by Zebediah Figura 29 Jul '21

29 Jul '21

And replace ~0u with the more meaningful UINT_MAX. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/wined3d_main.c | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 293359714c3..6e93b8dc683 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -110,25 +110,21 @@ CRITICAL_SECTION wined3d_command_cs = {&wined3d_command_cs_debug, -1, 0, 0, 0, 0 * where appropriate. */ struct wined3d_settings wined3d_settings = { - WINED3D_CSMT_ENABLE, /* Multithreaded CS by default. */ - MAKEDWORD_VERSION(4, 4), /* Default to OpenGL 4.4 */ - ORM_FBO, /* Use FBOs to do offscreen rendering */ - PCI_VENDOR_NONE,/* PCI Vendor ID */ - PCI_DEVICE_NONE,/* PCI Device ID */ - 0, /* The default of memory is set in init_driver_info */ - NULL, /* No wine logo by default */ - TRUE, /* Prefer multisample textures to multisample renderbuffers. */ - ~0u, /* Don't force a specific sample count by default. */ - FALSE, /* Don't range check relative addressing indices in float constants. */ - FALSE, /* No strict shader math by default. */ - ~0U, /* No VS shader model limit by default. */ - ~0U, /* No HS shader model limit by default. */ - ~0U, /* No DS shader model limit by default. */ - ~0U, /* No GS shader model limit by default. */ - ~0U, /* No PS shader model limit by default. */ - ~0u, /* No CS shader model limit by default. */ - WINED3D_RENDERER_AUTO, - WINED3D_SHADER_BACKEND_AUTO, + .cs_multithreaded = WINED3D_CSMT_ENABLE, + .max_gl_version = MAKEDWORD_VERSION(4, 4), + .offscreen_rendering_mode = ORM_FBO, + .pci_vendor_id = PCI_VENDOR_NONE, + .pci_device_id = PCI_DEVICE_NONE, + .multisample_textures = TRUE, + .sample_count = ~0u, + .max_sm_vs = UINT_MAX, + .max_sm_ps = UINT_MAX, + .max_sm_ds = UINT_MAX, + .max_sm_hs = UINT_MAX, + .max_sm_gs = UINT_MAX, + .max_sm_cs = UINT_MAX, + .renderer = WINED3D_RENDERER_AUTO, + .shader_backend = WINED3D_SHADER_BACKEND_AUTO, }; struct wined3d * CDECL wined3d_create(DWORD flags) -- 2.32.0

2 1

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel