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

Akihiro Sagawa : user32: Fix wsprintfA's buffer usage when using %S.
by Alexandre Julliard 03 Aug '20

03 Aug '20

Module: wine Branch: master Commit: 8baf70a2d04d227de28452c819c48f3bfd5171a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8baf70a2d04d227de28452c8… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Aug 2 19:39:58 2020 +0900 user32: Fix wsprintfA's buffer usage when using %S. This fixes a regression introduced by 08bf605acb4d319e016a7eafe0c675509445bd4a. It could lead to stack corruption because ret can be negative when the output position, p, doesn't point the beginning of the buffer before the inner loop. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/wsprintf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/wsprintf.c b/dlls/user32/wsprintf.c index db02f06634..ac57603b76 100644 --- a/dlls/user32/wsprintf.c +++ b/dlls/user32/wsprintf.c @@ -413,8 +413,8 @@ static INT wvsnprintfA( LPSTR buffer, UINT maxlen, LPCSTR spec, __ms_va_list arg { CHAR mb[5]; /* 5 is MB_LEN_MAX */ int ret = WideCharToMultiByte( CP_ACP, 0, ptr, 1, mb, sizeof(mb), NULL, NULL ); + if (ret > len - i) ret = len - i; i += ret; - if (i > len) ret = len - (p - buffer); memcpy( p, mb, ret ); p += ret; }

1 0

Sven Baars : sechost: Free the right variable (Coverity).
by Alexandre Julliard 03 Aug '20

03 Aug '20

Module: wine Branch: master Commit: 3dbb87a3d003398a28a5febd613612ba1ad3b606 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3dbb87a3d003398a28a5febd… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Sun Aug 2 19:20:24 2020 +0200 sechost: Free the right variable (Coverity). Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sechost/service.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/sechost/service.c b/dlls/sechost/service.c index 68d2b9e78e..5beff41a16 100644 --- a/dlls/sechost/service.c +++ b/dlls/sechost/service.c @@ -1031,7 +1031,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH StartServiceA( SC_HANDLE service, DWORD argc, cons for (i = 0; i < argc; i++) heap_free( argvW[i] ); - heap_free( argv ); + heap_free( argvW ); return r; }

1 0

Sven Baars : ntoskrnl.exe/tests: Add a missing argument to an ok call (Coverity).
by Alexandre Julliard 03 Aug '20

03 Aug '20

Module: wine Branch: master Commit: 333a867f75cc0bc380714a0369a1e896f4a2941a URL: https://source.winehq.org/git/wine.git/?a=commit;h=333a867f75cc0bc380714a03… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Sun Aug 2 19:20:22 2020 +0200 ntoskrnl.exe/tests: Add a missing argument to an ok call (Coverity). Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index d3f62879a4..7a325753d4 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -1614,7 +1614,7 @@ static void test_completion(void) IoSetCompletionRoutine(irp, completion_cb, NULL, TRUE, TRUE, TRUE); ret = IoCallDriver(upper_device, irp); ok(ret == STATUS_SUCCESS, "IoCallDriver returned %#x\n", ret); - ok(got_completion == 2, "got %u calls to completion routine\n"); + ok(got_completion == 2, "got %u calls to completion routine\n", got_completion); } static void test_IoAttachDeviceToDeviceStack(void)

1 0

Alexandre Julliard : Wine release 5.14
by Alexandre Julliard 01 Aug '20

01 Aug '20

Module: website Branch: master Commit: cbcbf9372f0718f9ae79cffa31d5f908b6eb9ee8 URL: https://source.winehq.org/git/website.git/?a=commit;h=cbcbf9372f0718f9ae79c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Aug 1 12:46:09 2020 +0200 Wine release 5.14 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2020080101.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/en/2020080101.xml b/news/en/2020080101.xml new file mode 100644 index 00000000..b84ce7b6 --- /dev/null +++ b/news/en/2020080101.xml @@ -0,0 +1,15 @@ +<news> +<date>August 1, 2020</date> +<title>Wine 5.14 Released</title> +<body> + The Wine development release 5.14 is now available. + <a href="{$root}/announce/5.14">What's new</a> in this release: +<ul> + <li>More restructuration of the console support.</li> + <li>Initial version of the Webdings font.</li> + <li>Beginnings of PE conversion of the MSVCRT libraries.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/5.x/wine-5.14.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Zebediah Figura : ntoskrnl.exe/tests: Add some tests for file names.
by Alexandre Julliard 01 Aug '20

01 Aug '20

Module: wine Branch: master Commit: f53c2df6dbfdeaf22bd4cc7a1471e0127431dea2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f53c2df6dbfdeaf22bd4cc7a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 30 18:04:20 2020 -0500 ntoskrnl.exe/tests: Add some tests for file names. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.c | 120 ++++++++++++++++++++++++++++++++++--- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 114 +++++++++++++++++++++++++++++++++++ 2 files changed, 226 insertions(+), 8 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f53c2df6dbfdeaf22bd4…

1 0

Zebediah Figura : ntdll/tests: Add more tests for object names.
by Alexandre Julliard 01 Aug '20

01 Aug '20

Module: wine Branch: master Commit: f4e55565470938d31e21f4a35aa14e5a950f81c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4e55565470938d31e21f4a3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 30 18:04:21 2020 -0500 ntdll/tests: Add more tests for object names. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 66 +++++++++++++++++++++++++++ dlls/ntdll/tests/om.c | 117 ++++++++++++++++++++++++++++++------------------ dlls/ntdll/tests/pipe.c | 23 +++++++--- 3 files changed, 156 insertions(+), 50 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f4e55565470938d31e21…

1 0

Zebediah Figura : dbghelp: Replace another usage of GetEnvironmentVariable() with the target process's environment.
by Alexandre Julliard 01 Aug '20

01 Aug '20

Module: wine Branch: master Commit: 70b2d181b1547dbe3c2a62e57c6afb0ee903f358 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70b2d181b1547dbe3c2a62e5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 30 17:36:36 2020 -0500 dbghelp: Replace another usage of GetEnvironmentVariable() with the target process's environment. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/path.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/dbghelp/path.c b/dlls/dbghelp/path.c index 82ba032145..a2057947a4 100644 --- a/dlls/dbghelp/path.c +++ b/dlls/dbghelp/path.c @@ -755,12 +755,9 @@ BOOL search_dll_path(const struct process *process, const WCHAR *name, BOOL (*ma WCHAR env_name[64]; swprintf(env_name, ARRAY_SIZE(env_name), L"WINEDLLDIR%u", i); if (!(env = process_getenv(process, env_name))) return FALSE; - len = lstrlenW(env); - if (!(buf = heap_alloc((len + lstrlenW(name) + 2) * sizeof(WCHAR)))) return FALSE; - - len = GetEnvironmentVariableW(env_name, buf, len); - buf[len++] = '\\'; - lstrcpyW(buf + len, name); + len = wcslen(env) + wcslen(name) + 2; + if (!(buf = heap_alloc(len * sizeof(WCHAR)))) return FALSE; + swprintf(buf, len, L"%s\\%s", env, name); file = CreateFileW(buf, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (file != INVALID_HANDLE_VALUE) {

1 0

Georg Lehmann : winevulkan: Avoid returning 0 for swapchain maxImageCount.
by Alexandre Julliard 01 Aug '20

01 Aug '20

Module: wine Branch: master Commit: 1e074c39f635c585595e9f3ece99aa290a7f9cf8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e074c39f635c585595e9f3e… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Fri Jul 31 11:13:11 2020 +0200 winevulkan: Avoid returning 0 for swapchain maxImageCount. Many Windows games do not expect that maxImageCount can be set to 0. A value of 0 means that there is no limit on the number of images. Nvidia reports 8 on Windows, AMD 16. Based on a patch by Józef Kucia. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Joshua Ashton <joshua(a)froggi.es> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 4 ++-- dlls/winevulkan/vulkan.c | 47 ++++++++++++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan_private.h | 1 + dlls/winevulkan/vulkan_thunks.c | 8 ++----- dlls/winevulkan/vulkan_thunks.h | 4 ++++ 5 files changed, 56 insertions(+), 8 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index fc0e2182dd..6a039bd268 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -183,12 +183,12 @@ FUNCTION_OVERRIDES = { # VK_KHR_surface "vkDestroySurfaceKHR" : {"dispatch" : True, "driver" : True, "thunk" : True}, "vkGetPhysicalDeviceSurfaceSupportKHR" : {"dispatch" : True, "driver" : True, "thunk" : True}, - "vkGetPhysicalDeviceSurfaceCapabilitiesKHR" : {"dispatch" : True, "driver" : True, "thunk" : True}, + "vkGetPhysicalDeviceSurfaceCapabilitiesKHR" : {"dispatch" : True, "driver" : True, "thunk" : False, "private_thunk" : True}, "vkGetPhysicalDeviceSurfaceFormatsKHR" : {"dispatch" : True, "driver" : True, "thunk" : True}, "vkGetPhysicalDeviceSurfacePresentModesKHR" : {"dispatch" : True, "driver" : True, "thunk" : True}, # VK_KHR_get_surface_capabilities2 - "vkGetPhysicalDeviceSurfaceCapabilities2KHR" : {"dispatch" : True, "driver" : True, "thunk" : True}, + "vkGetPhysicalDeviceSurfaceCapabilities2KHR" : {"dispatch" : True, "driver" : True, "thunk" : False, "private_thunk" : True}, "vkGetPhysicalDeviceSurfaceFormats2KHR" : {"dispatch" : True, "driver" : True, "thunk" : True}, # VK_KHR_win32_surface diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index be614f1cef..5f8046f1ba 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -723,6 +723,8 @@ VkResult WINAPI wine_vkCreateInstance(const VkInstanceCreateInfo *create_info, object->quirks |= WINEVULKAN_QUIRK_GET_DEVICE_PROC_ADDR; } + object->quirks |= WINEVULKAN_QUIRK_ADJUST_MAX_IMAGE_COUNT; + *instance = object; TRACE("Created instance %p (native instance %p).\n", object, object->instance); return VK_SUCCESS; @@ -1555,6 +1557,51 @@ void WINAPI wine_vkGetPrivateDataEXT(VkDevice device, VkObjectType object_type, device->funcs.p_vkGetPrivateDataEXT(device->device, object_type, object_handle, private_data_slot, data); } +static inline void adjust_max_image_count(VkPhysicalDevice phys_dev, VkSurfaceCapabilitiesKHR* capabilities) +{ + /* Many Windows games, for example Strange Brigade, No Man's Sky, Path of Exile + * and World War Z, do not expect that maxImageCount can be set to 0. + * A value of 0 means that there is no limit on the number of images. + * Nvidia reports 8 on Windows, AMD 16. + * https://vulkan.gpuinfo.org/displayreport.php?id=9122#surface + * https://vulkan.gpuinfo.org/displayreport.php?id=9121#surface + */ + if ((phys_dev->instance->quirks & WINEVULKAN_QUIRK_ADJUST_MAX_IMAGE_COUNT) && !capabilities->maxImageCount) + { + capabilities->maxImageCount = max(capabilities->minImageCount, 16); + } +} + +VkResult WINAPI wine_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevice phys_dev, + VkSurfaceKHR surface, VkSurfaceCapabilitiesKHR *capabilities) +{ + VkResult res; + + TRACE("%p, 0x%s, %p\n", phys_dev, wine_dbgstr_longlong(surface), capabilities); + + res = thunk_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(phys_dev, surface, capabilities); + + if (res == VK_SUCCESS) + adjust_max_image_count(phys_dev, capabilities); + + return res; +} + +VkResult WINAPI wine_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDevice phys_dev, + const VkPhysicalDeviceSurfaceInfo2KHR *surface_info, VkSurfaceCapabilities2KHR *capabilities) +{ + VkResult res; + + TRACE("%p, %p, %p\n", phys_dev, surface_info, capabilities); + + res = thunk_vkGetPhysicalDeviceSurfaceCapabilities2KHR(phys_dev, surface_info, capabilities); + + if (res == VK_SUCCESS) + adjust_max_image_count(phys_dev, &capabilities->surfaceCapabilities); + + return res; +} + BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved) { TRACE("%p, %u, %p\n", hinst, reason, reserved); diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index 17072d2341..b048108f7a 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -38,6 +38,7 @@ #define VULKAN_ICD_MAGIC_VALUE 0x01CDC0DE #define WINEVULKAN_QUIRK_GET_DEVICE_PROC_ADDR 0x00000001 +#define WINEVULKAN_QUIRK_ADJUST_MAX_IMAGE_COUNT 0x00000002 struct vulkan_func { diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index fcefa6a767..4f75a4ec7c 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -4998,26 +4998,22 @@ static VkResult WINAPI wine_vkGetPhysicalDeviceSupportedFramebufferMixedSamplesC return physicalDevice->instance->funcs.p_vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV(physicalDevice->phys_dev, pCombinationCount, pCombinations); } -VkResult WINAPI wine_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *pSurfaceInfo, VkSurfaceCapabilities2KHR *pSurfaceCapabilities) +VkResult thunk_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *pSurfaceInfo, VkSurfaceCapabilities2KHR *pSurfaceCapabilities) { #if defined(USE_STRUCT_CONVERSION) VkResult result; VkPhysicalDeviceSurfaceInfo2KHR_host pSurfaceInfo_host; - TRACE("%p, %p, %p\n", physicalDevice, pSurfaceInfo, pSurfaceCapabilities); - convert_VkPhysicalDeviceSurfaceInfo2KHR_win_to_host(pSurfaceInfo, &pSurfaceInfo_host); result = physicalDevice->instance->funcs.p_vkGetPhysicalDeviceSurfaceCapabilities2KHR(physicalDevice->phys_dev, &pSurfaceInfo_host, pSurfaceCapabilities); return result; #else - TRACE("%p, %p, %p\n", physicalDevice, pSurfaceInfo, pSurfaceCapabilities); return physicalDevice->instance->funcs.p_vkGetPhysicalDeviceSurfaceCapabilities2KHR(physicalDevice->phys_dev, pSurfaceInfo, pSurfaceCapabilities); #endif } -VkResult WINAPI wine_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, VkSurfaceCapabilitiesKHR *pSurfaceCapabilities) +VkResult thunk_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, VkSurfaceCapabilitiesKHR *pSurfaceCapabilities) { - TRACE("%p, 0x%s, %p\n", physicalDevice, wine_dbgstr_longlong(surface), pSurfaceCapabilities); return physicalDevice->instance->funcs.p_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(physicalDevice->phys_dev, surface, pSurfaceCapabilities); } diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index f2d650decf..d35e8c4269 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -42,6 +42,8 @@ VkResult WINAPI wine_vkGetPhysicalDeviceImageFormatProperties2(VkPhysicalDevice VkResult WINAPI wine_vkGetPhysicalDeviceImageFormatProperties2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceImageFormatInfo2 *pImageFormatInfo, VkImageFormatProperties2 *pImageFormatProperties) DECLSPEC_HIDDEN; void WINAPI wine_vkGetPhysicalDeviceProperties2(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2 *pProperties); void WINAPI wine_vkGetPhysicalDeviceProperties2KHR(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2 *pProperties) DECLSPEC_HIDDEN; +VkResult WINAPI wine_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *pSurfaceInfo, VkSurfaceCapabilities2KHR *pSurfaceCapabilities); +VkResult WINAPI wine_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, VkSurfaceCapabilitiesKHR *pSurfaceCapabilities); void WINAPI wine_vkGetPrivateDataEXT(VkDevice device, VkObjectType objectType, uint64_t objectHandle, VkPrivateDataSlotEXT privateDataSlot, uint64_t *pData) DECLSPEC_HIDDEN; VkResult WINAPI wine_vkQueueSubmit(VkQueue queue, uint32_t submitCount, const VkSubmitInfo *pSubmits, VkFence fence); VkResult WINAPI wine_vkSetPrivateDataEXT(VkDevice device, VkObjectType objectType, uint64_t objectHandle, VkPrivateDataSlotEXT privateDataSlot, uint64_t data) DECLSPEC_HIDDEN; @@ -51,6 +53,8 @@ VkResult thunk_vkGetPhysicalDeviceImageFormatProperties2(VkPhysicalDevice physic VkResult thunk_vkGetPhysicalDeviceImageFormatProperties2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceImageFormatInfo2 *pImageFormatInfo, VkImageFormatProperties2 *pImageFormatProperties) DECLSPEC_HIDDEN; void thunk_vkGetPhysicalDeviceProperties2(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2 *pProperties) DECLSPEC_HIDDEN; void thunk_vkGetPhysicalDeviceProperties2KHR(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2 *pProperties) DECLSPEC_HIDDEN; +VkResult thunk_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *pSurfaceInfo, VkSurfaceCapabilities2KHR *pSurfaceCapabilities) DECLSPEC_HIDDEN; +VkResult thunk_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, VkSurfaceCapabilitiesKHR *pSurfaceCapabilities) DECLSPEC_HIDDEN; typedef struct VkAcquireNextImageInfoKHR_host {

1 0

Jacek Caban : configure: Use *-windows instead of *-windows-gnu as fallback cross compiler target.
by Alexandre Julliard 01 Aug '20

01 Aug '20

Module: wine Branch: master Commit: 0b801a4215bb566603aa0f2ac7a590644b355bb6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b801a4215bb566603aa0f2a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 31 16:45:28 2020 +0200 configure: Use *-windows instead of *-windows-gnu as fallback cross compiler target. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 4 ++-- configure.ac | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 443e986ed5..f2a18e7682 100755 --- a/configure +++ b/configure @@ -9885,8 +9885,8 @@ $as_echo "$wine_cv_crosscc" >&6; } if test -z "$llvm_target" then case $host_cpu in - *i[3456789]86*) llvm_target=i686-windows-gnu ;; - *) llvm_target=$host_cpu-windows-gnu ;; + *i[3456789]86*) llvm_target=i686-windows ;; + *) llvm_target=$host_cpu-windows ;; esac fi case $llvm_target in diff --git a/configure.ac b/configure.ac index dea25b0c3f..65a7c5d625 100644 --- a/configure.ac +++ b/configure.ac @@ -1060,8 +1060,8 @@ then if test -z "$llvm_target" then case $host_cpu in - *i[[3456789]]86*) llvm_target=i686-windows-gnu ;; - *) llvm_target=$host_cpu-windows-gnu ;; + *i[[3456789]]86*) llvm_target=i686-windows ;; + *) llvm_target=$host_cpu-windows ;; esac fi case $llvm_target in

1 0

Alexandre Julliard : Release 5.14.
by Alexandre Julliard 01 Aug '20

01 Aug '20

Module: wine Branch: master Commit: 70b735760e2e89db11aa76ab3956ea0d1f6e40d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70b735760e2e89db11aa76ab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Aug 1 12:44:24 2020 +0200 Release 5.14. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 896 ++++++++++++++++++++++++++++---------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 413 insertions(+), 504 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=70b735760e2e89db11aa…

1 0