wine-commits April 2020

wine-commits@winehq.org

2 participants
1016 discussions

Michael Müller : ddraw: Make ddraw1_vtbl and ddraw_surface1_vtbl writable.
by Alexandre Julliard 27 Apr '20

27 Apr '20

Module: wine Branch: master Commit: 100ca518055c0e9edb68aa370f15a2768cf2c74f URL: https://source.winehq.org/git/wine.git/?a=commit;h=100ca518055c0e9edb68aa37… Author: Michael Müller <michael(a)fds-team.de> Date: Sun Apr 26 22:58:27 2020 -0500 ddraw: Make ddraw1_vtbl and ddraw_surface1_vtbl writable. Wine-Bug: <https://bugs.winehq.org/show_bug.cgi?id=39534> Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 3 ++- dlls/ddraw/surface.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 7cfb56f45c..b7e7e6514a 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4661,7 +4661,8 @@ static const struct IDirectDraw2Vtbl ddraw2_vtbl = ddraw2_GetAvailableVidMem, }; -static const struct IDirectDrawVtbl ddraw1_vtbl = +/* Bad Mojo Redux expects this vtbl to be writable. */ +static struct IDirectDrawVtbl ddraw1_vtbl = { /* IUnknown */ ddraw1_QueryInterface, diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index c418bb7b2b..4423083835 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5613,7 +5613,8 @@ static const struct IDirectDrawSurface2Vtbl ddraw_surface2_vtbl = ddraw_surface2_PageUnlock, }; -static const struct IDirectDrawSurfaceVtbl ddraw_surface1_vtbl = +/* Bad Mojo Redux expects this vtbl to be writable. */ +static struct IDirectDrawSurfaceVtbl ddraw_surface1_vtbl = { /* IUnknown */ ddraw_surface1_QueryInterface,

1 0

Gabriel Ivăncescu : qedit: Check for S_OK when enumerating the splitter pin.
by Alexandre Julliard 27 Apr '20

27 Apr '20

Module: wine Branch: master Commit: 317d5c96886886f7193df06caf80246ec9a3b719 URL: https://source.winehq.org/git/wine.git/?a=commit;h=317d5c96886886f7193df06c… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Apr 27 16:07:41 2020 +0300 qedit: Check for S_OK when enumerating the splitter pin. The splitter may return S_FALSE (no pins) and this caused a crash when it somehow matched with the File Source (Async). Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/mediadet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index eb7a51928b..c3891c5cd3 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -197,7 +197,7 @@ static HRESULT find_splitter(MediaDetImpl *detector) hr = IEnumPins_Next(enum_pins, 1, &splitter_pin, NULL); IEnumPins_Release(enum_pins); - if (FAILED(hr)) + if (hr != S_OK) goto next; hr = IPin_Connect(source_pin, splitter_pin, NULL);

1 0

Gabriel Ivăncescu : qedit: Check for S_OK when enumerating the source pin.
by Alexandre Julliard 27 Apr '20

27 Apr '20

Module: wine Branch: master Commit: ba5afd8c307c37ac054a4f8928cd3d565342218c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba5afd8c307c37ac054a4f89… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Apr 27 16:07:42 2020 +0300 qedit: Check for S_OK when enumerating the source pin. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/mediadet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index c3891c5cd3..392320560b 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -145,7 +145,7 @@ static HRESULT find_splitter(MediaDetImpl *detector) } hr = IEnumPins_Next(enum_pins, 1, &source_pin, NULL); IEnumPins_Release(enum_pins); - if (FAILED(hr)) + if (hr != S_OK) { ERR("Failed to get source pin, hr %#x.\n", hr); return hr;

1 0

Liam Middlebrook : winevulkan: Update to VK spec version spec 1.2.139.
by Alexandre Julliard 27 Apr '20

27 Apr '20

Module: wine Branch: master Commit: c4e35b9bce04c1cef0cc1ba2df52168a610da984 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4e35b9bce04c1cef0cc1ba2… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Mon Apr 27 08:05:20 2020 -0700 winevulkan: Update to VK spec version spec 1.2.139. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Daniel Koch <dkoch(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 20 ++++++++++++++++++++ dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 27 ++++++++++++++++++++++++++- 4 files changed, 48 insertions(+), 3 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 9cc5335c5d..5d9889620e 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -64,7 +64,7 @@ from enum import Enum LOGGER = logging.Logger("vulkan") LOGGER.addHandler(logging.StreamHandler()) -VK_XML_VERSION = "1.2.138" +VK_XML_VERSION = "1.2.139" WINE_VK_VERSION = (1, 2) # Filenames to create. diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index c5645f7db8..b36740a28e 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -2674,6 +2674,24 @@ VkResult convert_VkDeviceCreateInfo_struct_chain(const void *pNext, VkDeviceCrea break; } + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_FEATURES_EXT: + { + const VkPhysicalDeviceRobustness2FeaturesEXT *in = (const VkPhysicalDeviceRobustness2FeaturesEXT *)in_header; + VkPhysicalDeviceRobustness2FeaturesEXT *out; + + if (!(out = heap_alloc(sizeof(*out)))) goto out_of_memory; + + out->sType = in->sType; + out->pNext = NULL; + out->robustBufferAccess2 = in->robustBufferAccess2; + out->robustImageAccess2 = in->robustImageAccess2; + out->nullDescriptor = in->nullDescriptor; + + out_header->pNext = (VkBaseOutStructure *)out; + out_header = out_header->pNext; + break; + } + default: FIXME("Application requested a linked structure of type %u.\n", in_header->sType); } @@ -5614,6 +5632,7 @@ static const char * const vk_device_extensions[] = "VK_EXT_pipeline_creation_cache_control", "VK_EXT_post_depth_coverage", "VK_EXT_queue_family_foreign", + "VK_EXT_robustness2", "VK_EXT_sample_locations", "VK_EXT_sampler_filter_minmax", "VK_EXT_scalar_block_layout", @@ -5709,6 +5728,7 @@ static const char * const vk_device_extensions[] = "VK_NV_shading_rate_image", "VK_NV_viewport_array2", "VK_NV_viewport_swizzle", + "VK_QCOM_render_pass_shader_resolve", "VK_QCOM_render_pass_store_ops", "VK_QCOM_render_pass_transform", }; diff --git a/dlls/winevulkan/winevulkan.json b/dlls/winevulkan/winevulkan.json index 5137b2e13c..f6a320d917 100644 --- a/dlls/winevulkan/winevulkan.json +++ b/dlls/winevulkan/winevulkan.json @@ -2,6 +2,6 @@ "file_format_version": "1.0.0", "ICD": { "library_path": ".\\winevulkan.dll", - "api_version": "1.2.138" + "api_version": "1.2.139" } } diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index 40dbc16839..913acf9c80 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -265,6 +265,8 @@ #define VK_KHR_DRAW_INDIRECT_COUNT_EXTENSION_NAME "VK_KHR_draw_indirect_count" #define VK_EXT_FILTER_CUBIC_SPEC_VERSION 3 #define VK_EXT_FILTER_CUBIC_EXTENSION_NAME "VK_EXT_filter_cubic" +#define VK_QCOM_RENDER_PASS_SHADER_RESOLVE_SPEC_VERSION 4 +#define VK_QCOM_RENDER_PASS_SHADER_RESOLVE_EXTENSION_NAME "VK_QCOM_render_pass_shader_resolve" #define VK_EXT_GLOBAL_PRIORITY_SPEC_VERSION 2 #define VK_EXT_GLOBAL_PRIORITY_EXTENSION_NAME "VK_EXT_global_priority" #define VK_KHR_SHADER_SUBGROUP_EXTENDED_TYPES_SPEC_VERSION 1 @@ -379,6 +381,8 @@ #define VK_EXT_TEXEL_BUFFER_ALIGNMENT_EXTENSION_NAME "VK_EXT_texel_buffer_alignment" #define VK_QCOM_RENDER_PASS_TRANSFORM_SPEC_VERSION 1 #define VK_QCOM_RENDER_PASS_TRANSFORM_EXTENSION_NAME "VK_QCOM_render_pass_transform" +#define VK_EXT_ROBUSTNESS_2_SPEC_VERSION 1 +#define VK_EXT_ROBUSTNESS_2_EXTENSION_NAME "VK_EXT_robustness2" #define VK_GOOGLE_USER_TYPE_SPEC_VERSION 1 #define VK_GOOGLE_USER_TYPE_EXTENSION_NAME "VK_GOOGLE_user_type" #define VK_KHR_SHADER_NON_SEMANTIC_INFO_SPEC_VERSION 1 @@ -398,7 +402,7 @@ #define VK_API_VERSION_1_0 VK_MAKE_VERSION(1, 0, 0) #define VK_API_VERSION_1_1 VK_MAKE_VERSION(1, 1, 0) #define VK_API_VERSION_1_2 VK_MAKE_VERSION(1, 2, 0) -#define VK_HEADER_VERSION 138 +#define VK_HEADER_VERSION 139 #define VK_HEADER_VERSION_COMPLETE VK_MAKE_VERSION(1, 2, VK_HEADER_VERSION) #define VK_DEFINE_HANDLE(object) typedef struct object##_T* object; #define VK_DEFINE_NON_DISPATCHABLE_HANDLE(object) typedef uint64_t object; @@ -2844,6 +2848,8 @@ typedef enum VkStructureType VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_PROPERTIES_EXT = 1000281001, VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_RENDER_PASS_TRANSFORM_INFO_QCOM = 1000282000, VK_STRUCTURE_TYPE_RENDER_PASS_TRANSFORM_BEGIN_INFO_QCOM = 1000282001, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_FEATURES_EXT = 1000286000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_PROPERTIES_EXT = 1000286001, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_CREATION_CACHE_CONTROL_FEATURES_EXT = 1000297000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DIAGNOSTICS_CONFIG_FEATURES_NV = 1000300000, VK_STRUCTURE_TYPE_DEVICE_DIAGNOSTICS_CONFIG_CREATE_INFO_NV = 1000300001, @@ -2987,6 +2993,8 @@ typedef enum VkSubpassContents typedef enum VkSubpassDescriptionFlagBits { + VK_SUBPASS_DESCRIPTION_FRAGMENT_REGION_BIT_QCOM = 0x00000004, + VK_SUBPASS_DESCRIPTION_SHADER_RESOLVE_BIT_QCOM = 0x00000008, VK_SUBPASS_DESCRIPTION_FLAG_BITS_MAX_ENUM = 0x7fffffff, } VkSubpassDescriptionFlagBits; @@ -4107,6 +4115,15 @@ typedef struct VkPhysicalDeviceRayTracingPropertiesNV uint32_t maxDescriptorSetAccelerationStructures; } VkPhysicalDeviceRayTracingPropertiesNV; +typedef struct VkPhysicalDeviceRobustness2FeaturesEXT +{ + VkStructureType sType; + void *pNext; + VkBool32 robustBufferAccess2; + VkBool32 robustImageAccess2; + VkBool32 nullDescriptor; +} VkPhysicalDeviceRobustness2FeaturesEXT; + typedef struct VkPhysicalDeviceSamplerFilterMinmaxProperties { VkStructureType sType; @@ -5356,6 +5373,14 @@ typedef struct VkPhysicalDeviceProtectedMemoryFeatures VkBool32 protectedMemory; } VkPhysicalDeviceProtectedMemoryFeatures; +typedef struct VkPhysicalDeviceRobustness2PropertiesEXT +{ + VkStructureType sType; + void *pNext; + VkDeviceSize WINE_VK_ALIGN(8) robustStorageBufferAccessSizeAlignment; + VkDeviceSize WINE_VK_ALIGN(8) robustUniformBufferAccessSizeAlignment; +} VkPhysicalDeviceRobustness2PropertiesEXT; + typedef struct VkPhysicalDeviceShaderDemoteToHelperInvocationFeaturesEXT { VkStructureType sType;

1 0

Henri Verbeet : wined3d: Implement clears in the Vulkan blitter.
by Alexandre Julliard 27 Apr '20

27 Apr '20

Module: wine Branch: master Commit: f5d4d3ebbd3216105e1fccdf814046b53ec04a7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5d4d3ebbd3216105e1fccdf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 27 20:36:47 2020 +0430 wined3d: Implement clears in the Vulkan blitter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 202 +++++++++++++++++++++++++++- dlls/wined3d/texture.c | 294 ++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/view.c | 2 +- dlls/wined3d/wined3d_private.h | 49 ++++++- 4 files changed, 535 insertions(+), 12 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f5d4d3ebbd3216105e1f…

1 0

Henri Verbeet : wined3d: Create Vulkan image views for rendertarget views.
by Alexandre Julliard 27 Apr '20

27 Apr '20

Module: wine Branch: master Commit: a8e34f385167ff784016df65b38dd9f596af74c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8e34f385167ff784016df65… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 27 20:36:46 2020 +0430 wined3d: Create Vulkan image views for rendertarget views. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 59 ++++++++++++++++++- dlls/wined3d/context_vk.c | 30 ++++++++++ dlls/wined3d/texture.c | 4 +- dlls/wined3d/view.c | 128 ++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 9 +++ 5 files changed, 226 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a8e34f385167ff784016…

1 0

Henri Verbeet : wined3d: Use the view instead of the texture in is_full_clear().
by Alexandre Julliard 27 Apr '20

27 Apr '20

Module: wine Branch: master Commit: dad42f3c8061bf9c7f938d44778783cebbe55ea4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dad42f3c8061bf9c7f938d44… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 27 20:36:45 2020 +0430 wined3d: Use the view instead of the texture in is_full_clear(). Using the texture is a left-over from when rendertargets were surfaces. Using the view is in fact more straightforward. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 5b0b070998..70acc5b182 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -5176,14 +5176,10 @@ static bool ffp_blit_supported(enum wined3d_blit_op blit_op, const struct wined3 } } -static bool is_full_clear(const struct wined3d_texture *texture, unsigned int sub_resource_idx, - const RECT *draw_rect, const RECT *clear_rect) +static bool is_full_clear(const struct wined3d_rendertarget_view *rtv, const RECT *draw_rect, const RECT *clear_rect) { - unsigned int width, height, level; - - level = sub_resource_idx % texture->level_count; - width = wined3d_texture_get_level_width(texture, level); - height = wined3d_texture_get_level_height(texture, level); + unsigned int height = rtv->height; + unsigned int width = rtv->width; /* partial draw rect */ if (draw_rect->left || draw_rect->top || draw_rect->right < width || draw_rect->bottom < height) @@ -5256,8 +5252,7 @@ static void ffp_blitter_clear_rendertargets(struct wined3d_device *device, unsig { struct wined3d_texture *rt = wined3d_texture_from_resource(rtv->resource); - if (flags & WINED3DCLEAR_TARGET && !is_full_clear(rt, rtv->sub_resource_idx, - draw_rect, rect_count ? clear_rect : NULL)) + if (flags & WINED3DCLEAR_TARGET && !is_full_clear(rtv, draw_rect, rect_count ? clear_rect : NULL)) wined3d_texture_load_location(rt, rtv->sub_resource_idx, context, rtv->resource->draw_binding); else wined3d_texture_prepare_location(rt, rtv->sub_resource_idx, context, rtv->resource->draw_binding); @@ -5284,7 +5279,7 @@ static void ffp_blitter_clear_rendertargets(struct wined3d_device *device, unsig struct wined3d_texture *ds = wined3d_texture_from_resource(dsv->resource); if (flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL) - && !is_full_clear(ds, dsv->sub_resource_idx, draw_rect, rect_count ? clear_rect : NULL)) + && !is_full_clear(dsv, draw_rect, rect_count ? clear_rect : NULL)) wined3d_texture_load_location(ds, dsv->sub_resource_idx, context, ds_location); else wined3d_texture_prepare_location(ds, dsv->sub_resource_idx, context, ds_location);

1 0

Henri Verbeet : wined3d: Move device_clear_render_targets() to texture.c.
by Alexandre Julliard 27 Apr '20

27 Apr '20

Module: wine Branch: master Commit: ee8e4d2010d4990cd04a7c428aefad3690a3c4bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee8e4d2010d4990cd04a7c42… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 27 20:36:44 2020 +0430 wined3d: Move device_clear_render_targets() to texture.c. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 245 --------------------------------------- dlls/wined3d/texture.c | 254 ++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 3 - 3 files changed, 251 insertions(+), 251 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ee8e4d2010d4990cd04a…

1 0

Henri Verbeet : wined3d: Do not flush read-only mappings in wined3d_texture_vk_download_data().
by Alexandre Julliard 27 Apr '20

27 Apr '20

Module: wine Branch: master Commit: cd94aa8fa883d9702e3a5dfbed790b15a678c7eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd94aa8fa883d9702e3a5dfb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 27 20:36:43 2020 +0430 wined3d: Do not flush read-only mappings in wined3d_texture_vk_download_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 1e6452a09d..7ede5dea9d 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -4645,7 +4645,6 @@ static void wined3d_texture_vk_download_data(struct wined3d_context *context, VkCommandBuffer vk_command_buffer; struct wined3d_bo_vk staging_bo; VkImageAspectFlags aspect_mask; - struct wined3d_range range; VkBufferImageCopy region; void *map_ptr; @@ -4776,9 +4775,7 @@ static void wined3d_texture_vk_download_data(struct wined3d_context *context, dst_bo_addr->addr, dst_row_pitch, dst_slice_pitch, src_box->right - src_box->left, src_box->bottom - src_box->top, src_box->back - src_box->front); - range.offset = 0; - range.size = sub_resource->size; - wined3d_context_unmap_bo_address(context, &staging_bo_addr, 1, &range); + wined3d_context_unmap_bo_address(context, &staging_bo_addr, 0, NULL); wined3d_context_vk_destroy_bo(context_vk, &staging_bo); }

1 0

Alexandre Julliard : configure: Check for deprecation warnings from sys/sysctl.h.
by Alexandre Julliard 27 Apr '20

27 Apr '20

Module: wine Branch: master Commit: 9a37560060227c42258d81367b2c344fc79b93aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a37560060227c42258d8136… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 27 14:53:02 2020 +0200 configure: Check for deprecation warnings from sys/sysctl.h. The warning was added in glibc 2.30. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 22 +++++++++++++++++++++- configure.ac | 12 +++++++++++- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 1f4080fc54..0b368610fa 100755 --- a/configure +++ b/configure @@ -7559,7 +7559,7 @@ fi -for ac_header in sys/mount.h sys/statfs.h sys/sysctl.h sys/user.h sys/vfs.h +for ac_header in sys/mount.h sys/statfs.h sys/user.h sys/vfs.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#include <sys/types.h> @@ -7577,6 +7577,26 @@ fi done +saved_sysctl_h_CFLAGS=$CFLAGS +test "x${GCC}" != xyes || CFLAGS="$CFLAGS -Werror" +for ac_header in sys/sysctl.h +do : + ac_fn_c_check_header_compile "$LINENO" "sys/sysctl.h" "ac_cv_header_sys_sysctl_h" "#include <sys/types.h> + #ifdef HAVE_SYS_PARAM_H + # include <sys/param.h> + #endif +" +if test "x$ac_cv_header_sys_sysctl_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SYS_SYSCTL_H 1 +_ACEOF + +fi + +done + +CFLAGS=$saved_sysctl_h_CFLAGS + for ac_header in \ netinet/ip.h \ net/if.h \ diff --git a/configure.ac b/configure.ac index ce2c94eca2..be3bc65175 100644 --- a/configure.ac +++ b/configure.ac @@ -547,12 +547,22 @@ AC_HEADER_STAT() dnl **** Checks for headers that depend on other ones **** -AC_CHECK_HEADERS([sys/mount.h sys/statfs.h sys/sysctl.h sys/user.h sys/vfs.h],,, +AC_CHECK_HEADERS([sys/mount.h sys/statfs.h sys/user.h sys/vfs.h],,, [#include <sys/types.h> #ifdef HAVE_SYS_PARAM_H # include <sys/param.h> #endif]) +dnl check for broken Linux sysctl.h that causes deprecation warnings +saved_sysctl_h_CFLAGS=$CFLAGS +test "x${GCC}" != xyes || CFLAGS="$CFLAGS -Werror" +AC_CHECK_HEADERS([sys/sysctl.h],,, + [#include <sys/types.h> + #ifdef HAVE_SYS_PARAM_H + # include <sys/param.h> + #endif]) +CFLAGS=$saved_sysctl_h_CFLAGS + AC_CHECK_HEADERS(\ netinet/ip.h \ net/if.h \

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
102
Older →

Jump to page:

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-commits April 2020