April 2019 - Wine-devel - list.winehq.org

[PATCH v7 2/2] user32: Implement EC_USEFONTINFO margins in the CJK case.
by Akihiro Sagawa 10 Apr '19

10 Apr '19

In v7, fix the following compiler warning: ../../../wine/dlls/user32/edit.c:2897:43: warning: implicit declaration of function ‘GetCharWidthInfo’ [-Wimplicit-function-declaration] if (is_cjk_charset(dc) && GetCharWidthInfo(dc, &width_info)) ^~~~~~~~~~~~~~~~ Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/edit.c | 41 ++++++++++++++++++++++++++++++++++++++--- dlls/user32/tests/edit.c | 4 ++-- 2 files changed, 40 insertions(+), 5 deletions(-)

1 0

[PATCH v7 1/2] user32/tests: Use calculated EC_USEFONTINFO margins in the CJK case.
by Akihiro Sagawa 10 Apr '19

10 Apr '19

In v7, rename structure name for consistency. In v6, use Gdi32.GetCharWidthInfo. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/tests/edit.c | 46 +++++++++++++++++++++++++++++++--------------- 1 file changed, 31 insertions(+), 15 deletions(-)

1 0

[PATCH v2 1/5] configure: Check for libv4l2.
by Zebediah Figura 10 Apr '19

10 Apr '19

v4l1 has been deprecated and removed from the kernel for almost a decade. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- This patch, notably, does not port the support for mmap(). Devices that do not support read(), and only support mmap(), can be emulated with libv4l2. Accordingly this patch requires libv4l2 to read from those devices. configure.ac | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/configure.ac b/configure.ac index ef0a2612ff..31dd472533 100644 --- a/configure.ac +++ b/configure.ac @@ -82,6 +82,7 @@ AC_ARG_WITH(sdl, AS_HELP_STRING([--without-sdl],[do not use SDL])) AC_ARG_WITH(tiff, AS_HELP_STRING([--without-tiff],[do not use TIFF])) AC_ARG_WITH(udev, AS_HELP_STRING([--without-udev],[do not use udev (plug and play support)])) AC_ARG_WITH(v4l, AS_HELP_STRING([--without-v4l],[do not use v4l1 (v4l support)])) +AC_ARG_WITH(v4l2, AS_HELP_STRING([--without-v4l2],[do not use v4l2 (video capture)])) AC_ARG_WITH(vkd3d, AS_HELP_STRING([--without-vkd3d],[do not use vkd3d (Direct3D 12 support)])) AC_ARG_WITH(vulkan, AS_HELP_STRING([--without-vulkan],[do not use Vulkan])) AC_ARG_WITH(xcomposite,AS_HELP_STRING([--without-xcomposite],[do not use the Xcomposite extension]), @@ -1425,6 +1426,14 @@ fi WINE_NOTICE_WITH(v4l,[test "x$ac_cv_lib_soname_v4l1" = "x"], [libv4l ${notice_platform}development files not found.]) +dnl **** Check for libv4l2 **** +if test "x$with_v4l2" != "xno" +then + WINE_CHECK_SONAME(v4l2,v4l2_open,,,) +fi +WINE_NOTICE_WITH(v4l2,[test "x$ac_cv_lib_soname_v4l2" = "x"], + [libv4l2 ${notice_platform}development files not found.]) + dnl **** Check for libgphoto2 **** if test "x$with_gphoto" != "xno" then -- 2.21.0

1 4

[PATCH 6/6] ddraw: Avoid passing invalid device type to wined3d.
by Józef Kucia 10 Apr '19

10 Apr '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/ddraw/main.c | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 0faa98234d55..ac4d3f786c79 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -256,62 +256,52 @@ HRESULT WINAPI GetSurfaceFromDC(HDC dc, IDirectDrawSurface4 **surface, HDC *devi * E_OUTOFMEMORY if some allocation failed * ***********************************************************************/ -static HRESULT -DDRAW_Create(const GUID *guid, - void **DD, - IUnknown *UnkOuter, - REFIID iid) +static HRESULT DDRAW_Create(const GUID *guid, void **out, IUnknown *outer_unknown, REFIID iid) { enum wined3d_device_type device_type; struct ddraw *ddraw; - HRESULT hr; DWORD flags = 0; + HRESULT hr; TRACE("driver_guid %s, ddraw %p, outer_unknown %p, interface_iid %s.\n", - debugstr_guid(guid), DD, UnkOuter, debugstr_guid(iid)); + debugstr_guid(guid), out, outer_unknown, debugstr_guid(iid)); - *DD = NULL; + *out = NULL; if (guid == (GUID *) DDCREATE_EMULATIONONLY) { - /* Use the reference device id. This doesn't actually change anything, - * WineD3D always uses OpenGL for D3D rendering. One could make it request - * indirect rendering - */ device_type = WINED3D_DEVICE_TYPE_REF; } - else if(guid == (GUID *) DDCREATE_HARDWAREONLY) + else if (guid == (GUID *) DDCREATE_HARDWAREONLY) { device_type = WINED3D_DEVICE_TYPE_HAL; } else { - device_type = 0; + device_type = WINED3D_DEVICE_TYPE_HAL; } /* DDraw doesn't support aggregation, according to msdn */ - if (UnkOuter != NULL) + if (outer_unknown != NULL) return CLASS_E_NOAGGREGATION; if (!IsEqualGUID(iid, &IID_IDirectDraw7)) flags = WINED3D_LEGACY_FFP_LIGHTING; - /* DirectDraw creation comes here */ if (!(ddraw = heap_alloc_zero(sizeof(*ddraw)))) { - ERR("Out of memory when creating DirectDraw\n"); + ERR("Out of memory when creating DirectDraw.\n"); return E_OUTOFMEMORY; } - hr = ddraw_init(ddraw, flags, device_type); - if (FAILED(hr)) + if (FAILED(hr = ddraw_init(ddraw, flags, device_type))) { WARN("Failed to initialize ddraw object, hr %#x.\n", hr); heap_free(ddraw); return hr; } - hr = IDirectDraw7_QueryInterface(&ddraw->IDirectDraw7_iface, iid, DD); + hr = IDirectDraw7_QueryInterface(&ddraw->IDirectDraw7_iface, iid, out); IDirectDraw7_Release(&ddraw->IDirectDraw7_iface); if (SUCCEEDED(hr)) list_add_head(&global_ddraw_list, &ddraw->ddraw_list_entry); -- 2.19.2

5 4

[PATCH] winebuild: Print the nm command in verbose mode
by Martin Storsjo 10 Apr '19

10 Apr '19

Signed-off-by: Martin Storsjo <martin(a)martin.st> --- tools/winebuild/import.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 8838769b59..b82ff91400 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -548,6 +548,8 @@ void read_undef_symbols( DLLSPEC *spec, char **argv ) name = ldcombine_files( spec, argv ); cmd = strmake( "%s -u %s", prog, name ); + if (verbose) + fprintf( stderr, "%s\n", cmd ); if (!(f = popen( cmd, "r" ))) fatal_error( "Cannot execute '%s'\n", cmd ); -- 2.17.1

1 0

[PATCH] configure: Use -Werror=unknown-warning-option in later cross tests
by Martin Storsjo 10 Apr '19

10 Apr '19

Previously, if detected, the option was added to EXTRACROSSFLAGS, which isn't taken into use in later WINE_TRY_CROSSCFLAGS tests. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- Alternatively, should WINE_TRY_CROSSCFLAGS automatically use all of EXTRACROSSFLAGS? --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index cb5aa78662..67b360d9a9 100644 --- a/configure.ac +++ b/configure.ac @@ -1028,7 +1028,7 @@ then [AC_MSG_RESULT([no])]) WINE_TRY_CROSSCFLAGS([-fno-strict-aliasing]) dnl clang needs to be told to fail on unknown options - WINE_TRY_CROSSCFLAGS([-Werror=unknown-warning-option]) + WINE_TRY_CROSSCFLAGS([-Werror=unknown-warning-option],[CFLAGS="$CFLAGS -Werror=unknown-warning-option"]) WINE_TRY_CROSSCFLAGS([-Wdeclaration-after-statement]) WINE_TRY_CROSSCFLAGS([-Wempty-body]) WINE_TRY_CROSSCFLAGS([-Wignored-qualifiers]) -- 2.17.1

1 0

[PATCH] services/tests: Remove no longer needed workaround for .so files.
by Jacek Caban 10 Apr '19

10 Apr '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/services/tests/service.c | 6 ------ 1 file changed, 6 deletions(-)

1 1

[PATCH resend] Add support for ast locale
by Enol Puente 10 Apr '19

10 Apr '19

2 1

[PATCH] mfreadwrite/tests: Remove broken test.
by Nikolay Sivov 10 Apr '19

10 Apr '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- This test is using empty data stream and fails differently depending on library version. dlls/mfreadwrite/tests/mfplat.c | 45 +++------------------------------ 1 file changed, 3 insertions(+), 42 deletions(-) diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 16fa8223bf..074c403e49 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -79,47 +79,6 @@ static IMFByteStream *get_resource_stream(const char *name) return bytestream; } -static void test_MFCreateSourceReaderFromByteStream(void) -{ - static const WCHAR audio[] = {'A','u','d','i','o',0}; - IMFSourceReader *reader = NULL; - IMFAttributes *attributes; - IMFByteStream *bytestream = NULL; - IStream *stream = NULL; - HRESULT hr; - - if(!pMFCreateMFByteStreamOnStream) - { - win_skip("MFCreateMFByteStreamOnStream() not found\n"); - return; - } - - hr = MFCreateAttributes( &attributes, 3 ); - ok(hr == S_OK, "got 0x%08x\n", hr); - - hr = IMFAttributes_SetString(attributes, &MF_READWRITE_MMCSS_CLASS_AUDIO, audio); - ok(hr == S_OK, "Failed to set string value, hr %#x.\n", hr); - - hr = IMFAttributes_SetUINT32(attributes, &MF_READWRITE_MMCSS_PRIORITY_AUDIO, 0); - ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); - - hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); - - hr = pMFCreateMFByteStreamOnStream(stream, &bytestream); - ok(hr == S_OK, "got 0x%08x\n", hr); - - hr = MFCreateSourceReaderFromByteStream(bytestream, attributes, &reader); -todo_wine - ok(hr == S_OK || hr == MF_E_UNSUPPORTED_BYTESTREAM_TYPE, "got 0x%08x\n", hr); - - IStream_Release(stream); - IMFByteStream_Release(bytestream); - IMFAttributes_Release(attributes); - if (reader) - IMFSourceReader_Release(reader); -} - static void test_factory(void) { IMFReadWriteClassFactory *factory, *factory2; @@ -237,7 +196,10 @@ static void test_source_reader(void) HRESULT hr; if (!pMFCreateMFByteStreamOnStream) + { + win_skip("MFCreateMFByteStreamOnStream() not found\n"); return; + } stream = get_resource_stream("test.wav"); @@ -379,7 +341,6 @@ START_TEST(mfplat) init_functions(); - test_MFCreateSourceReaderFromByteStream(); test_factory(); test_source_reader(); -- 2.20.1

1 0

[PATCH 9/9] winevulkan: Enable VK_NV_dedicated_allocation_image_aliasing.
by Józef Kucia 10 Apr '19

10 Apr '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/winevulkan/make_vulkan | 1 - dlls/winevulkan/vulkan_thunks.c | 17 +++++++++++++++++ include/wine/vulkan.h | 10 ++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 9d76f8084a5c..2d872e27f5b5 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -112,7 +112,6 @@ BLACKLISTED_EXTENSIONS = [ # Relates to external_semaphore and needs type conversions in bitflags. "VK_KHR_shared_presentable_image", # Needs WSI work. "VK_KHR_win32_keyed_mutex", - "VK_NV_dedicated_allocation_image_aliasing", # Extensions for other platforms "VK_EXT_external_memory_dma_buf", diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 03842f2674f3..f48db3da6647 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -1811,6 +1811,22 @@ VkResult convert_VkDeviceCreateInfo_struct_chain(const void *pNext, VkDeviceCrea break; } + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEDICATED_ALLOCATION_IMAGE_ALIASING_FEATURES_NV: + { + const VkPhysicalDeviceDedicatedAllocationImageAliasingFeaturesNV *in = (const VkPhysicalDeviceDedicatedAllocationImageAliasingFeaturesNV *)in_header; + VkPhysicalDeviceDedicatedAllocationImageAliasingFeaturesNV *out; + + if (!(out = heap_alloc(sizeof(*out)))) goto out_of_memory; + + out->sType = in->sType; + out->pNext = NULL; + out->dedicatedAllocationImageAliasing = in->dedicatedAllocationImageAliasing; + + out_header->pNext = (VkBaseOutStructure *)out; + out_header = out_header->pNext; + break; + } + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADING_RATE_IMAGE_FEATURES_NV: { const VkPhysicalDeviceShadingRateImageFeaturesNV *in = (const VkPhysicalDeviceShadingRateImageFeaturesNV *)in_header; @@ -4407,6 +4423,7 @@ static const char * const vk_device_extensions[] = "VK_NV_cooperative_matrix", "VK_NV_corner_sampled_image", "VK_NV_dedicated_allocation", + "VK_NV_dedicated_allocation_image_aliasing", "VK_NV_device_diagnostic_checkpoints", "VK_NV_fill_rectangle", "VK_NV_fragment_coverage_to_color", diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index 50513a1a2e8c..407b7efdff56 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -306,6 +306,8 @@ #define VK_EXT_MEMORY_BUDGET_EXTENSION_NAME "VK_EXT_memory_budget" #define VK_EXT_MEMORY_PRIORITY_SPEC_VERSION 1 #define VK_EXT_MEMORY_PRIORITY_EXTENSION_NAME "VK_EXT_memory_priority" +#define VK_NV_DEDICATED_ALLOCATION_IMAGE_ALIASING_SPEC_VERSION 1 +#define VK_NV_DEDICATED_ALLOCATION_IMAGE_ALIASING_EXTENSION_NAME "VK_NV_dedicated_allocation_image_aliasing" #define VK_EXT_BUFFER_DEVICE_ADDRESS_SPEC_VERSION 2 #define VK_EXT_BUFFER_DEVICE_ADDRESS_EXTENSION_NAME "VK_EXT_buffer_device_address" #define VK_EXT_SEPARATE_STENCIL_USAGE_SPEC_VERSION 1 @@ -2144,6 +2146,7 @@ typedef enum VkStructureType VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_BUDGET_PROPERTIES_EXT = 1000237000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_PRIORITY_FEATURES_EXT = 1000238000, VK_STRUCTURE_TYPE_MEMORY_PRIORITY_ALLOCATE_INFO_EXT = 1000238001, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEDICATED_ALLOCATION_IMAGE_ALIASING_FEATURES_NV = 1000240000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BUFFER_ADDRESS_FEATURES_EXT = 1000244000, VK_STRUCTURE_TYPE_BUFFER_DEVICE_ADDRESS_INFO_EXT = 1000244001, VK_STRUCTURE_TYPE_BUFFER_DEVICE_ADDRESS_CREATE_INFO_EXT = 1000244002, @@ -2770,6 +2773,13 @@ typedef struct VkPhysicalDeviceCooperativeMatrixPropertiesNV VkShaderStageFlags cooperativeMatrixSupportedStages; } VkPhysicalDeviceCooperativeMatrixPropertiesNV; +typedef struct VkPhysicalDeviceDedicatedAllocationImageAliasingFeaturesNV +{ + VkStructureType sType; + void *pNext; + VkBool32 dedicatedAllocationImageAliasing; +} VkPhysicalDeviceDedicatedAllocationImageAliasingFeaturesNV; + typedef struct VkPhysicalDeviceDepthStencilResolvePropertiesKHR { VkStructureType sType; -- 2.21.0

1 0