wine-commits May 2021

wine-commits@winehq.org

2 participants
770 discussions

Piotr Caban : msvcrt: Import neabyint implementation from musl.
by Alexandre Julliard 14 May '21

14 May '21

Module: wine Branch: master Commit: 854a3cab4c136d3e2292bcd9c42c530e56cef7e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=854a3cab4c136d3e2292bcd9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 14 16:11:48 2021 +0200 msvcrt: Import neabyint implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - dlls/msvcrt/math.c | 13 +++++++++++-- dlls/msvcrt/unixlib.c | 13 ------------- dlls/msvcrt/unixlib.h | 1 - include/config.h.in | 3 --- 6 files changed, 11 insertions(+), 21 deletions(-) diff --git a/configure b/configure index 91f0c586c60..525d585130f 100755 --- a/configure +++ b/configure @@ -19640,7 +19640,6 @@ for ac_func in \ log1pf \ log2 \ log2f \ - nearbyint \ nexttoward \ nexttowardf \ remainder \ diff --git a/configure.ac b/configure.ac index df1025aeb98..2e8ff20aeef 100644 --- a/configure.ac +++ b/configure.ac @@ -2680,7 +2680,6 @@ AC_CHECK_FUNCS(\ log1pf \ log2 \ log2f \ - nearbyint \ nexttoward \ nexttowardf \ remainder \ diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 7fe7b9d172b..2bc51213a07 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -3418,10 +3418,19 @@ double CDECL _yn(int n, double x) /********************************************************************* * _nearbyint (MSVCR120.@) + * + * Based on musl: src/math/nearbyteint.c */ -double CDECL nearbyint(double num) +double CDECL nearbyint(double x) { - return unix_funcs->nearbyint( num ); + fenv_t env; + + fegetenv(&env); + _control87(_MCW_EM, _MCW_EM); + x = rint(x); + feclearexcept(FE_INEXACT); + feupdateenv(&env); + return x; } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index a0892e98d97..376bdb5c1c7 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -547,18 +547,6 @@ static float CDECL unix_modff( float x, float *iptr ) return modff( x, iptr ); } -/********************************************************************* - * nearbyint - */ -static double CDECL unix_nearbyint(double num) -{ -#ifdef HAVE_NEARBYINT - return nearbyint(num); -#else - return num >= 0 ? floor(num + 0.5) : ceil(num - 0.5); -#endif -} - /********************************************************************* * nextafter */ @@ -834,7 +822,6 @@ static const struct unix_funcs funcs = unix_logbf, unix_modf, unix_modff, - unix_nearbyint, unix_nextafter, unix_nextafterf, unix_nexttoward, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index d8b5e6b3f24..ecdbdf0cca1 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -72,7 +72,6 @@ struct unix_funcs float (CDECL *logbf)(float x); double (CDECL *modf)(double x, double *iptr); float (CDECL *modff)(float x, float *iptr); - double (CDECL *nearbyint)(double num); double (CDECL *nextafter)(double x, double y); float (CDECL *nextafterf)(float x, float y); double (CDECL *nexttoward)(double x, double y); diff --git a/include/config.h.in b/include/config.h.in index 896d44cd71e..a638c0382c9 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -501,9 +501,6 @@ /* Define if MTLDevice protocol has registryID property. */ #undef HAVE_MTLDEVICE_REGISTRYID -/* Define to 1 if you have the `nearbyint' function. */ -#undef HAVE_NEARBYINT - /* Define to 1 if you have the <netdb.h> header file. */ #undef HAVE_NETDB_H

1 0

Piotr Caban : msvcrt: Import neabyintf implementation from musl.
by Alexandre Julliard 14 May '21

14 May '21

Module: wine Branch: master Commit: 2caca437332b95ec807dd6195ac4bd4df616f934 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2caca437332b95ec807dd619… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 14 16:11:44 2021 +0200 msvcrt: Import neabyintf implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - dlls/msvcrt/math.c | 13 +++++++++++-- dlls/msvcrt/unixlib.c | 13 ------------- dlls/msvcrt/unixlib.h | 1 - include/config.h.in | 3 --- 6 files changed, 11 insertions(+), 21 deletions(-) diff --git a/configure b/configure index b6964befcc5..91f0c586c60 100755 --- a/configure +++ b/configure @@ -19641,7 +19641,6 @@ for ac_func in \ log2 \ log2f \ nearbyint \ - nearbyintf \ nexttoward \ nexttowardf \ remainder \ diff --git a/configure.ac b/configure.ac index 2e809c2e1f0..df1025aeb98 100644 --- a/configure.ac +++ b/configure.ac @@ -2681,7 +2681,6 @@ AC_CHECK_FUNCS(\ log2 \ log2f \ nearbyint \ - nearbyintf \ nexttoward \ nexttowardf \ remainder \ diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 2e827dd32c6..7fe7b9d172b 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -3426,10 +3426,19 @@ double CDECL nearbyint(double num) /********************************************************************* * _nearbyintf (MSVCR120.@) + * + * Based on musl: src/math/nearbyteintf.c */ -float CDECL nearbyintf(float num) +float CDECL nearbyintf(float x) { - return unix_funcs->nearbyintf( num ); + fenv_t env; + + fegetenv(&env); + _control87(_MCW_EM, _MCW_EM); + x = rintf(x); + feclearexcept(FE_INEXACT); + feupdateenv(&env); + return x; } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index 282c11166f5..a0892e98d97 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -559,18 +559,6 @@ static double CDECL unix_nearbyint(double num) #endif } -/********************************************************************* - * nearbyintf - */ -static float CDECL unix_nearbyintf(float num) -{ -#ifdef HAVE_NEARBYINTF - return nearbyintf(num); -#else - return unix_nearbyint(num); -#endif -} - /********************************************************************* * nextafter */ @@ -847,7 +835,6 @@ static const struct unix_funcs funcs = unix_modf, unix_modff, unix_nearbyint, - unix_nearbyintf, unix_nextafter, unix_nextafterf, unix_nexttoward, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index 6ce85c194ac..d8b5e6b3f24 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -73,7 +73,6 @@ struct unix_funcs double (CDECL *modf)(double x, double *iptr); float (CDECL *modff)(float x, float *iptr); double (CDECL *nearbyint)(double num); - float (CDECL *nearbyintf)(float num); double (CDECL *nextafter)(double x, double y); float (CDECL *nextafterf)(float x, float y); double (CDECL *nexttoward)(double x, double y); diff --git a/include/config.h.in b/include/config.h.in index 2fc36aa7eda..896d44cd71e 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -504,9 +504,6 @@ /* Define to 1 if you have the `nearbyint' function. */ #undef HAVE_NEARBYINT -/* Define to 1 if you have the `nearbyintf' function. */ -#undef HAVE_NEARBYINTF - /* Define to 1 if you have the <netdb.h> header file. */ #undef HAVE_NETDB_H

1 0

Derek Lesho : winevulkan: Use automatically-generated thunk for vkQueueSubmit.
by Alexandre Julliard 14 May '21

14 May '21

Module: wine Branch: master Commit: 961d611baf0bfe0dd087aebb1d7efad2e98a6f0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=961d611baf0bfe0dd087aebb… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Thu May 13 12:18:46 2021 -0400 winevulkan: Use automatically-generated thunk for vkQueueSubmit. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 1 - dlls/winevulkan/vulkan.c | 55 ----------------------------------------- dlls/winevulkan/vulkan_thunks.c | 50 +++++++++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan_thunks.h | 1 - 4 files changed, 50 insertions(+), 57 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 3f2f4a20748..cc79b0a58cd 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -192,7 +192,6 @@ FUNCTION_OVERRIDES = { "vkGetDeviceProcAddr" : {"dispatch" : False, "driver" : True, "thunk" : ThunkType.NONE, "loader_thunk" : ThunkType.NONE}, "vkGetDeviceQueue" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, "vkGetDeviceQueue2" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, - "vkQueueSubmit" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, # VK_KHR_surface "vkDestroySurfaceKHR" : {"dispatch" : True, "driver" : True, "thunk" : ThunkType.NONE}, diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 8f6c0ba9a2c..9f181d92bc5 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1067,61 +1067,6 @@ void WINAPI wine_vkGetDeviceQueue2(VkDevice device, const VkDeviceQueueInfo2 *in *queue = wine_vk_device_find_queue(device, info); } -VkResult WINAPI wine_vkQueueSubmit(VkQueue queue, uint32_t count, - const VkSubmitInfo *submits, VkFence fence) -{ - VkSubmitInfo *submits_host; - VkResult res; - VkCommandBuffer *command_buffers; - unsigned int i, j, num_command_buffers; - - TRACE("%p %u %p 0x%s\n", queue, count, submits, wine_dbgstr_longlong(fence)); - - if (count == 0) - { - return queue->device->funcs.p_vkQueueSubmit(queue->queue, 0, NULL, fence); - } - - submits_host = calloc(count, sizeof(*submits_host)); - if (!submits_host) - { - ERR("Unable to allocate memory for submit buffers!\n"); - return VK_ERROR_OUT_OF_HOST_MEMORY; - } - - for (i = 0; i < count; i++) - { - memcpy(&submits_host[i], &submits[i], sizeof(*submits_host)); - - num_command_buffers = submits[i].commandBufferCount; - command_buffers = calloc(num_command_buffers, sizeof(*command_buffers)); - if (!command_buffers) - { - ERR("Unable to allocate memory for command buffers!\n"); - res = VK_ERROR_OUT_OF_HOST_MEMORY; - goto done; - } - - for (j = 0; j < num_command_buffers; j++) - { - command_buffers[j] = submits[i].pCommandBuffers[j]->command_buffer; - } - submits_host[i].pCommandBuffers = command_buffers; - } - - res = queue->device->funcs.p_vkQueueSubmit(queue->queue, count, submits_host, fence); - -done: - for (i = 0; i < count; i++) - { - free((void *)submits_host[i].pCommandBuffers); - } - free(submits_host); - - TRACE("Returning %d\n", res); - return res; -} - VkResult WINAPI wine_vkCreateCommandPool(VkDevice device, const VkCommandPoolCreateInfo *info, const VkAllocationCallbacks *allocator, VkCommandPool *command_pool) { diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index e2a8764538e..c0dbbe2b8b8 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -2317,6 +2317,43 @@ static inline void free_VkBindSparseInfo_array(VkBindSparseInfo_host *in, uint32 } #endif /* USE_STRUCT_CONVERSION */ +static inline VkSubmitInfo *convert_VkSubmitInfo_array_win_to_host(const VkSubmitInfo *in, uint32_t count) +{ + VkSubmitInfo *out; + unsigned int i; + + if (!in) return NULL; + + out = malloc(count * sizeof(*out)); + for (i = 0; i < count; i++) + { + out[i].sType = in[i].sType; + out[i].pNext = in[i].pNext; + out[i].waitSemaphoreCount = in[i].waitSemaphoreCount; + out[i].pWaitSemaphores = in[i].pWaitSemaphores; + out[i].pWaitDstStageMask = in[i].pWaitDstStageMask; + out[i].commandBufferCount = in[i].commandBufferCount; + out[i].pCommandBuffers = convert_VkCommandBuffer_array_win_to_host(in[i].pCommandBuffers, in[i].commandBufferCount); + out[i].signalSemaphoreCount = in[i].signalSemaphoreCount; + out[i].pSignalSemaphores = in[i].pSignalSemaphores; + } + + return out; +} + +static inline void free_VkSubmitInfo_array(VkSubmitInfo *in, uint32_t count) +{ + unsigned int i; + + if (!in) return; + + for (i = 0; i < count; i++) + { + free_VkCommandBuffer_array((VkCommandBuffer *)in[i].pCommandBuffers, in[i].commandBufferCount); + } + free(in); +} + #if defined(USE_STRUCT_CONVERSION) static inline VkSemaphoreSubmitInfoKHR_host *convert_VkSemaphoreSubmitInfoKHR_array_win_to_host(const VkSemaphoreSubmitInfoKHR *in, uint32_t count) { @@ -7462,6 +7499,19 @@ static VkResult WINAPI wine_vkQueueSetPerformanceConfigurationINTEL(VkQueue queu return queue->device->funcs.p_vkQueueSetPerformanceConfigurationINTEL(queue->queue, configuration); } +VkResult WINAPI wine_vkQueueSubmit(VkQueue queue, uint32_t submitCount, const VkSubmitInfo *pSubmits, VkFence fence) +{ + VkResult result; + VkSubmitInfo *pSubmits_host; + TRACE("%p, %u, %p, 0x%s\n", queue, submitCount, pSubmits, wine_dbgstr_longlong(fence)); + + pSubmits_host = convert_VkSubmitInfo_array_win_to_host(pSubmits, submitCount); + result = queue->device->funcs.p_vkQueueSubmit(queue->queue, submitCount, pSubmits_host, fence); + + free_VkSubmitInfo_array(pSubmits_host, submitCount); + return result; +} + static VkResult WINAPI wine_vkQueueSubmit2KHR(VkQueue queue, uint32_t submitCount, const VkSubmitInfo2KHR *pSubmits, VkFence fence) { #if defined(USE_STRUCT_CONVERSION) diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index bfa392021df..34442762859 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -57,7 +57,6 @@ VkResult WINAPI wine_vkGetPhysicalDeviceImageFormatProperties2KHR(VkPhysicalDevi 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_vkSetDebugUtilsObjectNameEXT(VkDevice device, const VkDebugUtilsObjectNameInfoEXT *pNameInfo) DECLSPEC_HIDDEN; VkResult WINAPI wine_vkSetDebugUtilsObjectTagEXT(VkDevice device, const VkDebugUtilsObjectTagInfoEXT *pTagInfo) DECLSPEC_HIDDEN; VkResult WINAPI wine_vkSetPrivateDataEXT(VkDevice device, VkObjectType objectType, uint64_t objectHandle, VkPrivateDataSlotEXT privateDataSlot, uint64_t data) DECLSPEC_HIDDEN;

1 0

Derek Lesho : winevulkan: Use automatically-generated thunk for vkCmdExecuteCommands.
by Alexandre Julliard 14 May '21

14 May '21

Module: wine Branch: master Commit: 8f2f1f83c38c5792aac4105624ff60a313e95ef2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f2f1f83c38c5792aac41056… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Thu May 13 12:18:45 2021 -0400 winevulkan: Use automatically-generated thunk for vkCmdExecuteCommands. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 1 - dlls/winevulkan/vulkan.c | 30 ------------------------------ dlls/winevulkan/vulkan_thunks.c | 34 ++++++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan_thunks.h | 1 - 4 files changed, 34 insertions(+), 32 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 7abe2740a6d..3f2f4a20748 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -185,7 +185,6 @@ FUNCTION_OVERRIDES = { # Device functions "vkAllocateCommandBuffers" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.NONE}, - "vkCmdExecuteCommands" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.NONE}, "vkCreateCommandPool" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, "vkDestroyCommandPool" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, "vkDestroyDevice" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.NONE}, diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 69440c7a374..8f6c0ba9a2c 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -684,36 +684,6 @@ VkResult WINAPI wine_vkAllocateCommandBuffers(VkDevice device, return res; } -void WINAPI wine_vkCmdExecuteCommands(VkCommandBuffer buffer, uint32_t count, - const VkCommandBuffer *buffers) -{ - VkCommandBuffer *tmp_buffers; - unsigned int i; - - TRACE("%p %u %p\n", buffer, count, buffers); - - if (!buffers || !count) - return; - - /* Unfortunately we need a temporary buffer as our command buffers are wrapped. - * This call is called often and if a performance concern, we may want to use - * alloca as we shouldn't need much memory and it needs to be cleaned up after - * the call anyway. - */ - if (!(tmp_buffers = malloc(count * sizeof(*tmp_buffers)))) - { - ERR("Failed to allocate memory for temporary command buffers\n"); - return; - } - - for (i = 0; i < count; i++) - tmp_buffers[i] = buffers[i]->command_buffer; - - buffer->device->funcs.p_vkCmdExecuteCommands(buffer->command_buffer, count, tmp_buffers); - - free(tmp_buffers); -} - VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice phys_dev, const VkDeviceCreateInfo *create_info, const VkAllocationCallbacks *allocator, VkDevice *device) diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index e92fffe9cf3..e2a8764538e 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -668,6 +668,29 @@ static inline void convert_VkCuLaunchInfoNVX_win_to_host(const VkCuLaunchInfoNVX } #endif /* USE_STRUCT_CONVERSION */ +static inline VkCommandBuffer *convert_VkCommandBuffer_array_win_to_host(const VkCommandBuffer *in, uint32_t count) +{ + VkCommandBuffer *out; + unsigned int i; + + if (!in) return NULL; + + out = malloc(count * sizeof(*out)); + for (i = 0; i < count; i++) + { + out[i] = in[i]->command_buffer; + } + + return out; +} + +static inline void free_VkCommandBuffer_array(VkCommandBuffer *in, uint32_t count) +{ + if (!in) return; + + free(in); +} + #if defined(USE_STRUCT_CONVERSION) static inline VkIndirectCommandsStreamNV_host *convert_VkIndirectCommandsStreamNV_array_win_to_host(const VkIndirectCommandsStreamNV *in, uint32_t count) { @@ -5114,6 +5137,17 @@ static void WINAPI wine_vkCmdEndTransformFeedbackEXT(VkCommandBuffer commandBuff commandBuffer->device->funcs.p_vkCmdEndTransformFeedbackEXT(commandBuffer->command_buffer, firstCounterBuffer, counterBufferCount, pCounterBuffers, pCounterBufferOffsets); } +void WINAPI wine_vkCmdExecuteCommands(VkCommandBuffer commandBuffer, uint32_t commandBufferCount, const VkCommandBuffer *pCommandBuffers) +{ + VkCommandBuffer *pCommandBuffers_host; + TRACE("%p, %u, %p\n", commandBuffer, commandBufferCount, pCommandBuffers); + + pCommandBuffers_host = convert_VkCommandBuffer_array_win_to_host(pCommandBuffers, commandBufferCount); + commandBuffer->device->funcs.p_vkCmdExecuteCommands(commandBuffer->command_buffer, commandBufferCount, pCommandBuffers_host); + + free_VkCommandBuffer_array(pCommandBuffers_host, commandBufferCount); +} + static void WINAPI wine_vkCmdExecuteGeneratedCommandsNV(VkCommandBuffer commandBuffer, VkBool32 isPreprocessed, const VkGeneratedCommandsInfoNV *pGeneratedCommandsInfo) { #if defined(USE_STRUCT_CONVERSION) diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index 488f559797e..bfa392021df 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -16,7 +16,6 @@ /* Functions for which we have custom implementations outside of the thunks. */ VkResult WINAPI wine_vkAllocateCommandBuffers(VkDevice device, const VkCommandBufferAllocateInfo *pAllocateInfo, VkCommandBuffer *pCommandBuffers); -void WINAPI wine_vkCmdExecuteCommands(VkCommandBuffer commandBuffer, uint32_t commandBufferCount, const VkCommandBuffer *pCommandBuffers); VkResult WINAPI wine_vkCreateCommandPool(VkDevice device, const VkCommandPoolCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkCommandPool *pCommandPool); VkResult WINAPI wine_vkCreateDebugReportCallbackEXT(VkInstance instance, const VkDebugReportCallbackCreateInfoEXT *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkDebugReportCallbackEXT *pCallback) DECLSPEC_HIDDEN; VkResult WINAPI wine_vkCreateDebugUtilsMessengerEXT(VkInstance instance, const VkDebugUtilsMessengerCreateInfoEXT *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkDebugUtilsMessengerEXT *pMessenger) DECLSPEC_HIDDEN;

1 0

Derek Lesho : winevulkan: Add support for unwrapping handles in thunks.
by Alexandre Julliard 14 May '21

14 May '21

Module: wine Branch: master Commit: fb8ab5e9d079474e07d753341393c0c1bfe32ddd URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb8ab5e9d079474e07d75334… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Thu May 13 12:18:44 2021 -0400 winevulkan: Add support for unwrapping handles in thunks. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 633 +++++++++++++++++++++++++++++++--------- dlls/winevulkan/vulkan.c | 57 +--- dlls/winevulkan/vulkan_thunks.c | 453 +++++++++++++++++++++++++++- dlls/winevulkan/vulkan_thunks.h | 38 ++- 4 files changed, 973 insertions(+), 208 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fb8ab5e9d079474e07d7…

1 0

Paul Gofman : kernel32/tests: Use sizeof(STARTUPINFOEX) for STARTUPINFOEX.STARTUPINFO.cb in process tests.
by Alexandre Julliard 14 May '21

14 May '21

Module: wine Branch: master Commit: 45a48b5a84a138028c9fa709676e2258f0a01dbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=45a48b5a84a138028c9fa709… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu May 13 23:08:00 2021 +0300 kernel32/tests: Use sizeof(STARTUPINFOEX) for STARTUPINFOEX.STARTUPINFO.cb in process tests. Fixes some test failures on a few Testbot machines when the process attributes are just ignored. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index f960efb05a8..7d5d2ead75b 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -4073,7 +4073,7 @@ static void test_parent_process_attribute(unsigned int level, HANDLE read_pipe) } memset(&si, 0, sizeof(si)); - si.StartupInfo.cb = sizeof(si.StartupInfo); + si.StartupInfo.cb = sizeof(si); if (level) { @@ -4221,7 +4221,7 @@ static void test_handle_list_attribute(BOOL child, HANDLE handle1, HANDLE handle "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); memset(&si, 0, sizeof(si)); - si.StartupInfo.cb = sizeof(si.StartupInfo); + si.StartupInfo.cb = sizeof(si); si.lpAttributeList = heap_alloc(size); ret = pInitializeProcThreadAttributeList(si.lpAttributeList, 1, 0, &size); ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError());

1 0

Piotr Caban : include: Fix denormals handling in _fpclassf inline implementation.
by Alexandre Julliard 14 May '21

14 May '21

Module: wine Branch: master Commit: 522e13e6825f9dd50ddb7ddc079f0abf5dfd1034 URL: https://source.winehq.org/git/wine.git/?a=commit;h=522e13e6825f9dd50ddb7ddc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 13 21:15:20 2021 +0200 include: Fix denormals handling in _fpclassf inline implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/math.h | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/include/msvcrt/math.h b/include/msvcrt/math.h index 43e82fc3bea..d2977b67c34 100644 --- a/include/msvcrt/math.h +++ b/include/msvcrt/math.h @@ -166,7 +166,20 @@ static inline float fmodf(float x, float y) { return fmod(x, y); } static inline int _finitef(float x) { return _finite(x); } static inline int _isnanf(float x) { return _isnan(x); } -static inline int _fpclassf(float x) { return _fpclass(x); } + +static inline int _fpclassf(float x) +{ + unsigned int ix = *(int*)&x; + double d = x; + + /* construct denormal double */ + if (!(ix >> 23 & 0xff) && (ix << 1)) + { + unsigned __int64 id = (((unsigned __int64)ix >> 31) << 63) | 1; + d = *(double*)&id; + } + return _fpclass(d); +} #endif

1 0

Francois Gouget : urlmon/tests: Fix the spelling of a comment.
by Alexandre Julliard 14 May '21

14 May '21

Module: wine Branch: master Commit: 04cf91ed1dbda1212bd078d192ab7116078b051a URL: https://source.winehq.org/git/wine.git/?a=commit;h=04cf91ed1dbda1212bd078d1… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri May 14 17:12:27 2021 +0200 urlmon/tests: Fix the spelling of a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 2142e4a79e7..eb58bb54550 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -1569,7 +1569,7 @@ static void test_user_agent(void) todo_wine #endif /* This assumes that either p points at some property before - * '; .NET', or that there is more than one such occurence. + * '; .NET', or that there is more than one such occurrence. */ ok(strstr(p, "; .NET") != NULL, "no '; .NET' in %s\n", wine_dbgstr_a(p)); p = strchr(p, ')');

1 0

Francois Gouget : kernel32/tests: Fix the spelling of a comment.
by Alexandre Julliard 14 May '21

14 May '21

Module: wine Branch: master Commit: e1821ddcaec29f36afde5f888b79ab4b9e678b4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1821ddcaec29f36afde5f88… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri May 14 17:12:22 2021 +0200 kernel32/tests: Fix the spelling of a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/debugger.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index d7760d67414..fc541e0c69f 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -1864,7 +1864,7 @@ static void test_debugger(const char *argv0) next_event(&ctx, POLL_EVENT_TIMEOUT); - /* try single step while debugee is in a syscall */ + /* try single step while debuggee is in a syscall */ fetch_thread_context(ctx.main_thread); orig_context = ctx.main_thread->ctx; ip = get_ip(&ctx.main_thread->ctx);

1 0

Jacek Caban : winegcc: Use msvcrt by default for PE targets.
by Alexandre Julliard 14 May '21

14 May '21

Module: wine Branch: master Commit: 87e1e435069b640c6f3e4355c9cbbe8f3b62a8fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=87e1e435069b640c6f3e4355… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 14 16:53:40 2021 +0200 winegcc: Use msvcrt by default for PE targets. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 969daa0f96b..404c7b773ae 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -324,6 +324,19 @@ static char* get_temp_file(const char* prefix, const char* suffix) return tmp; } +static int is_pe_target( const struct options *opts ) +{ + switch(opts->target_platform) + { + case PLATFORM_MINGW: + case PLATFORM_CYGWIN: + case PLATFORM_WINDOWS: + return 1; + default: + return 0; + } +} + enum tool { TOOL_CC, @@ -1103,7 +1116,7 @@ static void build(struct options* opts) int generate_app_loader = 1; const char *crt_lib = NULL, *entry_point = NULL; int fake_module = 0; - int is_pe = (opts->target_platform == PLATFORM_WINDOWS || opts->target_platform == PLATFORM_CYGWIN || opts->target_platform == PLATFORM_MINGW); + int is_pe = is_pe_target( opts ); unsigned int j; /* NOTE: for the files array we'll use the following convention: @@ -2090,6 +2103,8 @@ int main(int argc, char **argv) if (opts.processor == proc_cpp) linking = 0; if (linking == -1) error("Static linking is not supported\n"); + if (!opts.wine_objdir && is_pe_target( &opts )) opts.use_msvcrt = 1; + if (opts.files->size == 0) forward(&opts); else if (linking) build(&opts); else compile(&opts, lang);

1 0

← Newer
1
...
41
42
43
44
45
46
47
...
77
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 May 2021