July 2018 - Wine-Commits - list.winehq.org

Francois Gouget : testbot/WineSendLog: Also show the TestBot job URL in the developer email.
by Alexandre Julliard July 17, 2018

July 17, 2018

Module: tools Branch: master Commit: fc4a17e795f37aa8670fbb6893d777a41a93aa92 URL: https://source.winehq.org/git/tools.git/?a=commit;h=fc4a17e795f37aa8670fbb6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 17 16:41:52 2018 +0200 testbot/WineSendLog: Also show the TestBot job URL in the developer email. Also compute the job url once instead of duplicating that code. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineSendLog.pl | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index bcd62f3..cda724d 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -216,6 +216,10 @@ sub SendLog($) my $StepsTasks = CreateStepsTasks(undef, $Job); my @SortedKeys = sort @{$StepsTasks->GetKeys()}; + my $JobURL = ($UseSSL ? "https://" : "http://") . + "$WebHostName/JobDetails.pl?Key=". $Job->GetKey(); + + # # Send a job summary and all the logs as attachments to the developer # @@ -268,6 +272,8 @@ EOF $TestFailures; } + print $Sendmail "\nYou can also see the results at:\n$JobURL\n\n"; + # Print the job summary my @FailureKeys; foreach my $Key (@SortedKeys) @@ -501,8 +507,6 @@ EOF Debug("\n-------------------- Mailing list email --------------------\n"); - my $WebSite = ($UseSSL ? "https://" : "http://") . $WebHostName; - if ($Messages) { if ($Debug) @@ -529,11 +533,13 @@ Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? -Full results can be found at + +Full results can be found at: +$JobURL + +Your paranoid android. + EOF - print $Sendmail "$WebSite/JobDetails.pl?Key=", - $Job->GetKey(), "\n\n"; - print $Sendmail "Your paranoid android.\n\n"; print $Sendmail $Messages; close($Sendmail); @@ -558,7 +564,7 @@ EOF # successful or not. DebugTee($Result, "Status: ". ($Messages ? "Failed" : "OK") ."\n"); DebugTee($Result, "Job-ID: ". $Job->Id ."\n"); - DebugTee($Result, "URL: $WebSite/JobDetails.pl?Key=". $Job->GetKey() ."\n"); + DebugTee($Result, "URL: $JobURL\n"); foreach my $Key (@SortedKeys) {

1 0

Francois Gouget : testbot: A minor LogUtils.pm indentation fix.
by Alexandre Julliard July 17, 2018

July 17, 2018

Module: tools Branch: master Commit: f4668bdf3dce386a9777787557cf1c2caacc75f2 URL: https://source.winehq.org/git/tools.git/?a=commit;h=f4668bdf3dce386a9777787… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 17 16:42:09 2018 +0200 testbot: A minor LogUtils.pm indentation fix. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 5e6407b..cabd183 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -361,7 +361,7 @@ sub ParseWineTestReport($$$$) } elsif ($Parser->{IsWineTest} and !$Cur->{IsBroken}) { - _AddError($Parser, "$Dll:$Unit has no test summary line (early exit of the main process?)"); + _AddError($Parser, "$Dll:$Unit has no test summary line (early exit of the main process?)"); } } elsif ($Rc & 0xc0000000)

1 0

Józef Kucia : winemac: Add missing entries to vulkan_funcs.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: 0cbbab9dac9cf725287b6ad1a9ba919db46e0e7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=0cbbab9dac9cf725287b6ad1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jul 16 15:18:22 2018 +0200 winemac: Add missing entries to vulkan_funcs. MoltenVK doesn't implement VK_KHR_device_group. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/vulkan.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winemac.drv/vulkan.c b/dlls/winemac.drv/vulkan.c index 4d1e496..3f70454 100644 --- a/dlls/winemac.drv/vulkan.c +++ b/dlls/winemac.drv/vulkan.c @@ -475,8 +475,10 @@ static const struct vulkan_funcs vulkan_funcs = macdrv_vkDestroySurfaceKHR, macdrv_vkDestroySwapchainKHR, macdrv_vkEnumerateInstanceExtensionProperties, + NULL, macdrv_vkGetDeviceProcAddr, macdrv_vkGetInstanceProcAddr, + NULL, macdrv_vkGetPhysicalDeviceSurfaceCapabilitiesKHR, macdrv_vkGetPhysicalDeviceSurfaceFormatsKHR, macdrv_vkGetPhysicalDeviceSurfacePresentModesKHR,

1 0

Józef Kucia : winevulkan: Generate get_vulkan_driver_*_proc_addr() helper functions.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: adb926d5a5032130d55e4d39316efdb11cc1fe1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=adb926d5a5032130d55e4d39… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jul 16 15:18:23 2018 +0200 winevulkan: Generate get_vulkan_driver_*_proc_addr() helper functions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/vulkan.c | 62 ----------------------------------------- dlls/winevulkan/make_vulkan | 32 ++++++++++++++++++++- dlls/winex11.drv/vulkan.c | 66 -------------------------------------------- include/wine/vulkan_driver.h | 63 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 94 insertions(+), 129 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=adb926d5a5032130d55e…

1 0

Józef Kucia : winevulkan: Remove vkAcquireNextImageKHR() from Vulkan driver functions.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: f59925416a12a9190691205711cdf3258eb1650e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f59925416a12a91906912057… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jul 16 15:18:21 2018 +0200 winevulkan: Remove vkAcquireNextImageKHR() from Vulkan driver functions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 6 +++--- dlls/winemac.drv/vulkan.c | 15 --------------- dlls/winevulkan/make_vulkan | 3 +-- dlls/winex11.drv/vulkan.c | 15 --------------- include/wine/vulkan_driver.h | 3 +-- 5 files changed, 5 insertions(+), 37 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index ae7bde7..90f72d0 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1526,7 +1526,6 @@ static BOOL init_vk_funcs(struct dxgi_vk_funcs *dxgi, VkDevice vk_device) return FALSE; } - dxgi->p_vkAcquireNextImageKHR = vk->p_vkAcquireNextImageKHR; dxgi->p_vkCreateSwapchainKHR = vk->p_vkCreateSwapchainKHR; dxgi->p_vkCreateWin32SurfaceKHR = vk->p_vkCreateWin32SurfaceKHR; dxgi->p_vkDestroySurfaceKHR = vk->p_vkDestroySurfaceKHR; @@ -1547,10 +1546,11 @@ static BOOL init_vk_funcs(struct dxgi_vk_funcs *dxgi, VkDevice vk_device) ERR("Failed to get device proc "#name".\n"); \ return FALSE; \ } + LOAD_DEVICE_PFN(vkAcquireNextImageKHR) LOAD_DEVICE_PFN(vkCreateFence) - LOAD_DEVICE_PFN(vkWaitForFences) - LOAD_DEVICE_PFN(vkResetFences) LOAD_DEVICE_PFN(vkDestroyFence) + LOAD_DEVICE_PFN(vkResetFences) + LOAD_DEVICE_PFN(vkWaitForFences) #undef LOAD_DEVICE_PFN return TRUE; diff --git a/dlls/winemac.drv/vulkan.c b/dlls/winemac.drv/vulkan.c index d590903..4d1e496 100644 --- a/dlls/winemac.drv/vulkan.c +++ b/dlls/winemac.drv/vulkan.c @@ -63,7 +63,6 @@ typedef struct VkMacOSSurfaceCreateInfoMVK const void *pView; /* NSView */ } VkMacOSSurfaceCreateInfoMVK; -static VkResult (*pvkAcquireNextImageKHR)(VkDevice, VkSwapchainKHR, uint64_t, VkSemaphore, VkFence, uint32_t *); static VkResult (*pvkCreateInstance)(const VkInstanceCreateInfo *, const VkAllocationCallbacks *, VkInstance *); static VkResult (*pvkCreateSwapchainKHR)(VkDevice, const VkSwapchainCreateInfoKHR *, const VkAllocationCallbacks *, VkSwapchainKHR *); static VkResult (*pvkCreateMacOSSurfaceMVK)(VkInstance, const VkMacOSSurfaceCreateInfoMVK*, const VkAllocationCallbacks *, VkSurfaceKHR *); @@ -99,7 +98,6 @@ static BOOL WINAPI wine_vk_init(INIT_ONCE *once, void *param, void **context) } #define LOAD_FUNCPTR(f) if ((p##f = wine_dlsym(vulkan_handle, #f, NULL, 0)) == NULL) goto fail; - LOAD_FUNCPTR(vkAcquireNextImageKHR) LOAD_FUNCPTR(vkCreateInstance) LOAD_FUNCPTR(vkCreateSwapchainKHR) LOAD_FUNCPTR(vkCreateMacOSSurfaceMVK) @@ -190,16 +188,6 @@ static void wine_vk_surface_destroy(VkInstance instance, struct wine_vk_surface heap_free(surface); } -static VkResult macdrv_vkAcquireNextImageKHR(VkDevice device, VkSwapchainKHR swapchain, - uint64_t timeout, VkSemaphore semaphore, VkFence fence, uint32_t *index) -{ - TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %p\n", device, - wine_dbgstr_longlong(swapchain), wine_dbgstr_longlong(timeout), - wine_dbgstr_longlong(semaphore), wine_dbgstr_longlong(fence), index); - - return pvkAcquireNextImageKHR(device, swapchain, timeout, semaphore, fence, index); -} - static VkResult macdrv_vkCreateInstance(const VkInstanceCreateInfo *create_info, const VkAllocationCallbacks *allocator, VkInstance *instance) { @@ -480,7 +468,6 @@ static VkResult macdrv_vkQueuePresentKHR(VkQueue queue, const VkPresentInfoKHR * static const struct vulkan_funcs vulkan_funcs = { - macdrv_vkAcquireNextImageKHR, macdrv_vkCreateInstance, macdrv_vkCreateSwapchainKHR, macdrv_vkCreateWin32SurfaceKHR, @@ -507,8 +494,6 @@ static void *get_vulkan_driver_device_proc_addr(const struct vulkan_funcs *vulka name += 2; - if (!strcmp(name, "AcquireNextImageKHR")) - return vulkan_funcs->p_vkAcquireNextImageKHR; if (!strcmp(name, "CreateSwapchainKHR")) return vulkan_funcs->p_vkCreateSwapchainKHR; if (!strcmp(name, "DestroySwapchainKHR")) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 3432e4f..7ab92dc 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -130,7 +130,7 @@ CORE_EXTENSIONS = [ # Functions part of our winevulkan graphics driver interface. # DRIVER_VERSION should be bumped on any change to driver interface # in FUNCTION_OVERRIDES -DRIVER_VERSION = 6 +DRIVER_VERSION = 7 # Table of functions for which we have a special implementation. # These are regular device / instance functions for which we need @@ -176,7 +176,6 @@ FUNCTION_OVERRIDES = { "vkGetPhysicalDeviceWin32PresentationSupportKHR" : {"dispatch" : True, "driver" : True, "thunk" : True}, # VK_KHR_swapchain - "vkAcquireNextImageKHR": {"dispatch" : True, "driver" : True, "thunk" : True}, "vkCreateSwapchainKHR" : {"dispatch" : True, "driver" : True, "thunk" : True}, "vkDestroySwapchainKHR" : {"dispatch" : True, "driver" : True, "thunk" : True}, "vkGetSwapchainImagesKHR": {"dispatch" : True, "driver" : True, "thunk" : True}, diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index 93c3065..e0d576b 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -74,7 +74,6 @@ typedef struct VkXlibSurfaceCreateInfoKHR Window window; } VkXlibSurfaceCreateInfoKHR; -static VkResult (*pvkAcquireNextImageKHR)(VkDevice, VkSwapchainKHR, uint64_t, VkSemaphore, VkFence, uint32_t *); static VkResult (*pvkCreateInstance)(const VkInstanceCreateInfo *, const VkAllocationCallbacks *, VkInstance *); static VkResult (*pvkCreateSwapchainKHR)(VkDevice, const VkSwapchainCreateInfoKHR *, const VkAllocationCallbacks *, VkSwapchainKHR *); static VkResult (*pvkCreateXlibSurfaceKHR)(VkInstance, const VkXlibSurfaceCreateInfoKHR *, const VkAllocationCallbacks *, VkSurfaceKHR *); @@ -114,7 +113,6 @@ static BOOL WINAPI wine_vk_init(INIT_ONCE *once, void *param, void **context) #define LOAD_FUNCPTR(f) if (!(p##f = wine_dlsym(vulkan_handle, #f, NULL, 0))) goto fail; #define LOAD_OPTIONAL_FUNCPTR(f) p##f = wine_dlsym(vulkan_handle, #f, NULL, 0); - LOAD_FUNCPTR(vkAcquireNextImageKHR) LOAD_FUNCPTR(vkCreateInstance) LOAD_FUNCPTR(vkCreateSwapchainKHR) LOAD_FUNCPTR(vkCreateXlibSurfaceKHR) @@ -223,16 +221,6 @@ void wine_vk_surface_destroy(HWND hwnd) LeaveCriticalSection(&context_section); } -static VkResult X11DRV_vkAcquireNextImageKHR(VkDevice device, VkSwapchainKHR swapchain, - uint64_t timeout, VkSemaphore semaphore, VkFence fence, uint32_t *index) -{ - TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %p\n", device, - wine_dbgstr_longlong(swapchain), wine_dbgstr_longlong(timeout), - wine_dbgstr_longlong(semaphore), wine_dbgstr_longlong(fence), index); - - return pvkAcquireNextImageKHR(device, swapchain, timeout, semaphore, fence, index); -} - static VkResult X11DRV_vkCreateInstance(const VkInstanceCreateInfo *create_info, const VkAllocationCallbacks *allocator, VkInstance *instance) { @@ -532,7 +520,6 @@ static VkResult X11DRV_vkQueuePresentKHR(VkQueue queue, const VkPresentInfoKHR * static const struct vulkan_funcs vulkan_funcs = { - X11DRV_vkAcquireNextImageKHR, X11DRV_vkCreateInstance, X11DRV_vkCreateSwapchainKHR, X11DRV_vkCreateWin32SurfaceKHR, @@ -561,8 +548,6 @@ static void *get_vulkan_driver_device_proc_addr(const struct vulkan_funcs *vulka name += 2; - if (!strcmp(name, "AcquireNextImageKHR")) - return vulkan_funcs->p_vkAcquireNextImageKHR; if (!strcmp(name, "CreateSwapchainKHR")) return vulkan_funcs->p_vkCreateSwapchainKHR; if (!strcmp(name, "DestroySwapchainKHR")) diff --git a/include/wine/vulkan_driver.h b/include/wine/vulkan_driver.h index 790d630..d009f12 100644 --- a/include/wine/vulkan_driver.h +++ b/include/wine/vulkan_driver.h @@ -39,7 +39,7 @@ #define __WINE_VULKAN_DRIVER_H /* Wine internal vulkan driver version, needs to be bumped upon vulkan_funcs changes. */ -#define WINE_VULKAN_DRIVER_VERSION 6 +#define WINE_VULKAN_DRIVER_VERSION 7 struct vulkan_funcs { @@ -47,7 +47,6 @@ struct vulkan_funcs * needs to provide. Other function calls will be provided indirectly by dispatch * tables part of dispatchable Vulkan objects such as VkInstance or vkDevice. */ - VkResult (*p_vkAcquireNextImageKHR)(VkDevice, VkSwapchainKHR, uint64_t, VkSemaphore, VkFence, uint32_t *); VkResult (*p_vkCreateInstance)(const VkInstanceCreateInfo *, const VkAllocationCallbacks *, VkInstance *); VkResult (*p_vkCreateSwapchainKHR)(VkDevice, const VkSwapchainCreateInfoKHR *, const VkAllocationCallbacks *, VkSwapchainKHR *); VkResult (*p_vkCreateWin32SurfaceKHR)(VkInstance, const VkWin32SurfaceCreateInfoKHR *, const VkAllocationCallbacks *, VkSurfaceKHR *);

1 0

Józef Kucia : winevulkan: Remove vkEnumerateInstanceVersion() from Vulkan driver functions.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: 5be428f5604065d993d71f743c21718e524345a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5be428f5604065d993d71f74… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jul 16 15:18:20 2018 +0200 winevulkan: Remove vkEnumerateInstanceVersion() from Vulkan driver functions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 4 ++-- dlls/winevulkan/vulkan.c | 16 +++++++++++++++- dlls/winex11.drv/vulkan.c | 18 ------------------ include/wine/vulkan_driver.h | 3 +-- 4 files changed, 18 insertions(+), 23 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index e922203..3432e4f 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -130,7 +130,7 @@ CORE_EXTENSIONS = [ # Functions part of our winevulkan graphics driver interface. # DRIVER_VERSION should be bumped on any change to driver interface # in FUNCTION_OVERRIDES -DRIVER_VERSION = 5 +DRIVER_VERSION = 6 # Table of functions for which we have a special implementation. # These are regular device / instance functions for which we need @@ -144,7 +144,7 @@ FUNCTION_OVERRIDES = { # Global functions "vkCreateInstance" : {"dispatch" : False, "driver" : True, "thunk" : False}, "vkEnumerateInstanceExtensionProperties" : {"dispatch" : False, "driver" : True, "thunk" : False}, - "vkEnumerateInstanceVersion": {"dispatch" : False, "driver" : True, "thunk" : False}, + "vkEnumerateInstanceVersion": {"dispatch" : False, "driver" : False, "thunk" : False}, "vkGetInstanceProcAddr": {"dispatch" : False, "driver" : True, "thunk" : False}, # Instance functions diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index b07025a..5c156c1 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -58,6 +58,7 @@ static void *wine_vk_find_struct_(void *s, VkStructureType t) static void *wine_vk_get_global_proc_addr(const char *name); static const struct vulkan_funcs *vk_funcs; +static VkResult (*p_vkEnumerateInstanceVersion)(uint32_t *version); static void wine_vk_physical_device_free(struct VkPhysicalDevice_T *phys_dev) { @@ -322,6 +323,8 @@ static BOOL wine_vk_init(void) return FALSE; } + p_vkEnumerateInstanceVersion = vk_funcs->p_vkGetInstanceProcAddr(NULL, "vkEnumerateInstanceVersion"); + return TRUE; } @@ -849,7 +852,16 @@ VkResult WINAPI wine_vkEnumerateInstanceVersion(uint32_t *version) TRACE("%p\n", version); - res = vk_funcs->p_vkEnumerateInstanceVersion(version); + if (p_vkEnumerateInstanceVersion) + { + res = p_vkEnumerateInstanceVersion(version); + } + else + { + *version = VK_API_VERSION_1_0; + res = VK_SUCCESS; + } + TRACE("API version %u.%u.%u.\n", VK_VERSION_MAJOR(*version), VK_VERSION_MINOR(*version), VK_VERSION_PATCH(*version)); *version = min(WINE_VK_VERSION, *version); @@ -1117,6 +1129,8 @@ VkResult WINAPI wine_vkEnumeratePhysicalDeviceGroupsKHR(VkInstance instance, BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved) { + TRACE("%p, %u, %p\n", hinst, reason, reserved); + switch (reason) { case DLL_PROCESS_ATTACH: diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index 58c08ad..93c3065 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -82,7 +82,6 @@ static void (*pvkDestroyInstance)(VkInstance, const VkAllocationCallbacks *); static void (*pvkDestroySurfaceKHR)(VkInstance, VkSurfaceKHR, const VkAllocationCallbacks *); static void (*pvkDestroySwapchainKHR)(VkDevice, VkSwapchainKHR, const VkAllocationCallbacks *); static VkResult (*pvkEnumerateInstanceExtensionProperties)(const char *, uint32_t *, VkExtensionProperties *); -static VkResult (*pvkEnumerateInstanceVersion)(uint32_t *); static VkResult (*pvkGetDeviceGroupSurfacePresentModesKHR)(VkDevice, VkSurfaceKHR, VkDeviceGroupPresentModeFlagsKHR *); static void * (*pvkGetDeviceProcAddr)(VkDevice, const char *); static void * (*pvkGetInstanceProcAddr)(VkInstance, const char *); @@ -132,7 +131,6 @@ static BOOL WINAPI wine_vk_init(INIT_ONCE *once, void *param, void **context) LOAD_FUNCPTR(vkGetPhysicalDeviceXlibPresentationSupportKHR) LOAD_FUNCPTR(vkGetSwapchainImagesKHR) LOAD_FUNCPTR(vkQueuePresentKHR) - LOAD_OPTIONAL_FUNCPTR(vkEnumerateInstanceVersion) LOAD_OPTIONAL_FUNCPTR(vkGetDeviceGroupSurfacePresentModesKHR) LOAD_OPTIONAL_FUNCPTR(vkGetPhysicalDevicePresentRectanglesKHR) #undef LOAD_FUNCPTR @@ -426,19 +424,6 @@ static VkResult X11DRV_vkEnumerateInstanceExtensionProperties(const char *layer_ return res; } -static VkResult X11DRV_vkEnumerateInstanceVersion(uint32_t *version) -{ - TRACE("%p\n", version); - - if (!pvkEnumerateInstanceVersion) - { - *version = VK_API_VERSION_1_0; - return VK_SUCCESS; - } - - return pvkEnumerateInstanceVersion(version); -} - static VkResult X11DRV_vkGetDeviceGroupSurfacePresentModesKHR(VkDevice device, VkSurfaceKHR surface, VkDeviceGroupPresentModeFlagsKHR *flags) { @@ -555,7 +540,6 @@ static const struct vulkan_funcs vulkan_funcs = X11DRV_vkDestroySurfaceKHR, X11DRV_vkDestroySwapchainKHR, X11DRV_vkEnumerateInstanceExtensionProperties, - X11DRV_vkEnumerateInstanceVersion, X11DRV_vkGetDeviceGroupSurfacePresentModesKHR, X11DRV_vkGetDeviceProcAddr, X11DRV_vkGetInstanceProcAddr, @@ -612,8 +596,6 @@ static void *get_vulkan_driver_instance_proc_addr(const struct vulkan_funcs *vul return vulkan_funcs->p_vkCreateInstance; if (!strcmp(name, "EnumerateInstanceExtensionProperties")) return vulkan_funcs->p_vkEnumerateInstanceExtensionProperties; - if (!strcmp(name, "EnumerateInstanceVersion")) - return vulkan_funcs->p_vkEnumerateInstanceVersion; if (!instance) return NULL; diff --git a/include/wine/vulkan_driver.h b/include/wine/vulkan_driver.h index 37fe9ad..790d630 100644 --- a/include/wine/vulkan_driver.h +++ b/include/wine/vulkan_driver.h @@ -39,7 +39,7 @@ #define __WINE_VULKAN_DRIVER_H /* Wine internal vulkan driver version, needs to be bumped upon vulkan_funcs changes. */ -#define WINE_VULKAN_DRIVER_VERSION 5 +#define WINE_VULKAN_DRIVER_VERSION 6 struct vulkan_funcs { @@ -55,7 +55,6 @@ struct vulkan_funcs void (*p_vkDestroySurfaceKHR)(VkInstance, VkSurfaceKHR, const VkAllocationCallbacks *); void (*p_vkDestroySwapchainKHR)(VkDevice, VkSwapchainKHR, const VkAllocationCallbacks *); VkResult (*p_vkEnumerateInstanceExtensionProperties)(const char *, uint32_t *, VkExtensionProperties *); - VkResult (*p_vkEnumerateInstanceVersion)(uint32_t *); VkResult (*p_vkGetDeviceGroupSurfacePresentModesKHR)(VkDevice, VkSurfaceKHR, VkDeviceGroupPresentModeFlagsKHR *); void * (*p_vkGetDeviceProcAddr)(VkDevice, const char *); void * (*p_vkGetInstanceProcAddr)(VkInstance, const char *);

1 0

Roderick Colenbrander : winevulkan: Implement vkGetDeviceQueue2.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: d1d9d5495d2b25f23e03e1ea56e113039b9a5fe7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1d9d5495d2b25f23e03e1ea… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Jul 16 15:18:19 2018 +0200 winevulkan: Implement vkGetDeviceQueue2. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vulkan-1/vulkan-1.spec | 2 +- dlls/winevulkan/make_vulkan | 3 ++- dlls/winevulkan/vulkan.c | 35 ++++++++++++++++++++++++++++------- dlls/winevulkan/vulkan_private.h | 2 ++ dlls/winevulkan/vulkan_thunks.c | 1 + dlls/winevulkan/vulkan_thunks.h | 1 + dlls/winevulkan/winevulkan.spec | 2 +- include/wine/vulkan.h | 2 ++ 8 files changed, 38 insertions(+), 10 deletions(-) diff --git a/dlls/vulkan-1/vulkan-1.spec b/dlls/vulkan-1/vulkan-1.spec index 2e05979..52ee47a 100644 --- a/dlls/vulkan-1/vulkan-1.spec +++ b/dlls/vulkan-1/vulkan-1.spec @@ -164,7 +164,7 @@ @ stdcall vkGetDeviceMemoryCommitment(ptr int64 ptr) winevulkan.wine_vkGetDeviceMemoryCommitment @ stdcall vkGetDeviceProcAddr(ptr str) winevulkan.wine_vkGetDeviceProcAddr @ stdcall vkGetDeviceQueue(ptr long long ptr) winevulkan.wine_vkGetDeviceQueue -@ stub vkGetDeviceQueue2 +@ stdcall vkGetDeviceQueue2(ptr ptr ptr) winevulkan.wine_vkGetDeviceQueue2 @ stub vkGetDisplayModePropertiesKHR @ stub vkGetDisplayPlaneCapabilitiesKHR @ stub vkGetDisplayPlaneSupportedDisplaysKHR diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 7773f34..e922203 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -161,6 +161,7 @@ FUNCTION_OVERRIDES = { "vkFreeCommandBuffers" : {"dispatch" : True, "driver" : False, "thunk" : False}, "vkGetDeviceProcAddr" : {"dispatch" : False, "driver" : True, "thunk" : False}, "vkGetDeviceQueue" : {"dispatch": True, "driver" : False, "thunk" : False}, + "vkGetDeviceQueue2" : {"dispatch": False, "driver" : False, "thunk" : False}, "vkQueueSubmit" : {"dispatch": True, "driver" : False, "thunk" : False}, # VK_KHR_surface @@ -402,7 +403,7 @@ class VkFunction(object): # Required is set while parsing which APIs and types are required # and is used by the code generation. - self.required = True if self.driver else False + self.required = True if func_info else False @staticmethod def from_alias(command, alias): diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 34ef457..b07025a 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -168,7 +168,7 @@ static void wine_vk_command_buffers_free(struct VkDevice_T *device, VkCommandPoo /* Helper function to create queues for a given family index. */ static struct VkQueue_T *wine_vk_device_alloc_queues(struct VkDevice_T *device, - uint32_t family_index, uint32_t queue_count) + uint32_t family_index, uint32_t queue_count, VkDeviceQueueCreateFlags flags) { struct VkQueue_T *queues; unsigned int i; @@ -182,15 +182,15 @@ static struct VkQueue_T *wine_vk_device_alloc_queues(struct VkDevice_T *device, for (i = 0; i < queue_count; i++) { struct VkQueue_T *queue = &queues[i]; + + queue->base.loader_magic = VULKAN_ICD_MAGIC_VALUE; queue->device = device; + queue->flags = flags; /* The native device was already allocated with the required number of queues, * so just fetch them from there. */ device->funcs.p_vkGetDeviceQueue(device->device, family_index, i, &queue->queue); - - /* Set special header for ICD loader. */ - queue->base.loader_magic = VULKAN_ICD_MAGIC_VALUE; } return queues; @@ -342,7 +342,7 @@ static void wine_vk_instance_convert_create_info(const VkInstanceCreateInfo *src TRACE("Application name %s, application version %#x\n", debugstr_a(app_info->pApplicationName), app_info->applicationVersion); TRACE("Engine name %s, engine version %#x\n", debugstr_a(app_info->pEngineName), - app_info->engineVersion); + app_info->engineVersion); TRACE("API version %#x\n", app_info->apiVersion); } @@ -633,12 +633,14 @@ VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice phys_dev, for (i = 0; i < create_info_host.queueCreateInfoCount; i++) { + uint32_t flags = create_info_host.pQueueCreateInfos[i].flags; uint32_t family_index = create_info_host.pQueueCreateInfos[i].queueFamilyIndex; uint32_t queue_count = create_info_host.pQueueCreateInfos[i].queueCount; TRACE("queueFamilyIndex %u, queueCount %u\n", family_index, queue_count); - object->queues[family_index] = wine_vk_device_alloc_queues(object, family_index, queue_count); + object->queues[family_index] = wine_vk_device_alloc_queues(object, family_index, + queue_count, flags); if (!object->queues[family_index]) { ERR("Failed to allocate memory for queues\n"); @@ -928,11 +930,30 @@ PFN_vkVoidFunction WINAPI wine_vkGetDeviceProcAddr(VkDevice device, const char * void WINAPI wine_vkGetDeviceQueue(VkDevice device, uint32_t family_index, uint32_t queue_index, VkQueue *queue) { - TRACE("%p %u %u %p\n", device, family_index, queue_index, queue); + TRACE("%p, %u, %u, %p\n", device, family_index, queue_index, queue); *queue = &device->queues[family_index][queue_index]; } +void WINAPI wine_vkGetDeviceQueue2(VkDevice device, const VkDeviceQueueInfo2 *info, VkQueue *queue) +{ + const struct wine_vk_structure_header *chain; + struct VkQueue_T *matching_queue; + + TRACE("%p, %p, %p\n", device, info, queue); + + if ((chain = info->pNext)) + FIXME("Ignoring a linked structure of type %#x.\n", chain->sType); + + matching_queue = &device->queues[info->queueFamilyIndex][info->queueIndex]; + if (matching_queue->flags != info->flags) + { + WARN("No matching flags were specified %#x, %#x.\n", matching_queue->flags, info->flags); + matching_queue = VK_NULL_HANDLE; + } + *queue = matching_queue; +} + PFN_vkVoidFunction WINAPI wine_vkGetInstanceProcAddr(VkInstance instance, const char *name) { void *func; diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index 37af920..2e071a5 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -106,6 +106,8 @@ struct VkQueue_T struct wine_vk_base base; struct VkDevice_T *device; /* parent */ VkQueue queue; /* native queue */ + + VkDeviceQueueCreateFlags flags; }; void *wine_vk_get_device_proc_addr(const char *name) DECLSPEC_HIDDEN; diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index b88158c..9d637bf 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -2966,6 +2966,7 @@ static const struct vulkan_func vk_device_dispatch_table[] = {"vkGetDeviceMemoryCommitment", &wine_vkGetDeviceMemoryCommitment}, {"vkGetDeviceProcAddr", &wine_vkGetDeviceProcAddr}, {"vkGetDeviceQueue", &wine_vkGetDeviceQueue}, + {"vkGetDeviceQueue2", &wine_vkGetDeviceQueue2}, {"vkGetEventStatus", &wine_vkGetEventStatus}, {"vkGetFenceStatus", &wine_vkGetFenceStatus}, {"vkGetImageMemoryRequirements", &wine_vkGetImageMemoryRequirements}, diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index 86b81ab..a03d115 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -53,6 +53,7 @@ VkResult WINAPI wine_vkEnumeratePhysicalDevices(VkInstance instance, uint32_t *p void WINAPI wine_vkFreeCommandBuffers(VkDevice device, VkCommandPool commandPool, uint32_t commandBufferCount, const VkCommandBuffer *pCommandBuffers); PFN_vkVoidFunction WINAPI wine_vkGetDeviceProcAddr(VkDevice device, const char *pName); void WINAPI wine_vkGetDeviceQueue(VkDevice device, uint32_t queueFamilyIndex, uint32_t queueIndex, VkQueue *pQueue); +void WINAPI wine_vkGetDeviceQueue2(VkDevice device, const VkDeviceQueueInfo2 *pQueueInfo, VkQueue *pQueue); VkResult WINAPI wine_vkQueueSubmit(VkQueue queue, uint32_t submitCount, const VkSubmitInfo *pSubmits, VkFence fence); typedef struct VkAcquireNextImageInfoKHR_host diff --git a/dlls/winevulkan/winevulkan.spec b/dlls/winevulkan/winevulkan.spec index 91f7333..8aab0fe 100644 --- a/dlls/winevulkan/winevulkan.spec +++ b/dlls/winevulkan/winevulkan.spec @@ -166,7 +166,7 @@ @ stdcall wine_vkGetDeviceMemoryCommitment(ptr int64 ptr) @ stdcall wine_vkGetDeviceProcAddr(ptr str) @ stdcall wine_vkGetDeviceQueue(ptr long long ptr) -@ stub vkGetDeviceQueue2 +@ stdcall wine_vkGetDeviceQueue2(ptr ptr ptr) @ stub vkGetDisplayModePropertiesKHR @ stub vkGetDisplayPlaneCapabilitiesKHR @ stub vkGetDisplayPlaneSupportedDisplaysKHR diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index 10c1243..965e26f 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -4319,6 +4319,7 @@ typedef VkResult (VKAPI_PTR *PFN_vkGetDeviceGroupSurfacePresentModesKHR)(VkDevic typedef void (VKAPI_PTR *PFN_vkGetDeviceMemoryCommitment)(VkDevice, VkDeviceMemory, VkDeviceSize *); typedef PFN_vkVoidFunction (VKAPI_PTR *PFN_vkGetDeviceProcAddr)(VkDevice, const char *); typedef void (VKAPI_PTR *PFN_vkGetDeviceQueue)(VkDevice, uint32_t, uint32_t, VkQueue *); +typedef void (VKAPI_PTR *PFN_vkGetDeviceQueue2)(VkDevice, const VkDeviceQueueInfo2 *, VkQueue *); typedef VkResult (VKAPI_PTR *PFN_vkGetEventStatus)(VkDevice, VkEvent); typedef VkResult (VKAPI_PTR *PFN_vkGetFenceStatus)(VkDevice, VkFence); typedef void (VKAPI_PTR *PFN_vkGetImageMemoryRequirements)(VkDevice, VkImage, VkMemoryRequirements *); @@ -4537,6 +4538,7 @@ VkResult VKAPI_CALL vkGetDeviceGroupSurfacePresentModesKHR(VkDevice device, VkSu void VKAPI_CALL vkGetDeviceMemoryCommitment(VkDevice device, VkDeviceMemory memory, VkDeviceSize *pCommittedMemoryInBytes); PFN_vkVoidFunction VKAPI_CALL vkGetDeviceProcAddr(VkDevice device, const char *pName); void VKAPI_CALL vkGetDeviceQueue(VkDevice device, uint32_t queueFamilyIndex, uint32_t queueIndex, VkQueue *pQueue); +void VKAPI_CALL vkGetDeviceQueue2(VkDevice device, const VkDeviceQueueInfo2 *pQueueInfo, VkQueue *pQueue); VkResult VKAPI_CALL vkGetEventStatus(VkDevice device, VkEvent event); VkResult VKAPI_CALL vkGetFenceStatus(VkDevice device, VkFence fence); void VKAPI_CALL vkGetImageMemoryRequirements(VkDevice device, VkImage image, VkMemoryRequirements *pMemoryRequirements);

1 0

Piotr Caban : msvcr80: Add gets_s implementation.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: 6b268e77bbe4f4d77748d028ea090b6afc2dd062 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b268e77bbe4f4d77748d028… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jul 16 19:29:04 2018 +0200 msvcr80: Add gets_s implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45393 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-stdio-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/file.c | 62 +++++++++++++++------- dlls/ucrtbase/ucrtbase.spec | 2 +- 9 files changed, 50 insertions(+), 28 deletions(-) diff --git a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec index 4921883..853a43f 100644 --- a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec +++ b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec @@ -140,7 +140,7 @@ @ cdecl getc(ptr) ucrtbase.getc @ cdecl getchar() ucrtbase.getchar @ cdecl gets(str) ucrtbase.gets -@ stub gets_s +@ cdecl gets_s(ptr long) ucrtbase.gets_s @ cdecl getwc(ptr) ucrtbase.getwc @ cdecl getwchar() ucrtbase.getwchar @ cdecl putc(long ptr) ucrtbase.putc diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 4426987..88698ca 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1700,7 +1700,7 @@ @ cdecl getenv(str) MSVCRT_getenv @ cdecl getenv_s(ptr ptr long str) @ cdecl gets(str) MSVCRT_gets -@ stub gets_s +@ cdecl gets_s(ptr long) MSVCRT_gets_s @ cdecl getwc(ptr) MSVCRT_getwc @ cdecl getwchar() MSVCRT_getwchar @ cdecl is_wctype(long long) ntdll.iswctype diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 3572664..3d116c4 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -2058,7 +2058,7 @@ @ cdecl getenv(str) MSVCRT_getenv @ cdecl getenv_s(ptr ptr long str) @ cdecl gets(str) MSVCRT_gets -@ stub gets_s +@ cdecl gets_s(ptr long) MSVCRT_gets_s @ cdecl getwc(ptr) MSVCRT_getwc @ cdecl getwchar() MSVCRT_getwchar @ cdecl is_wctype(long long) ntdll.iswctype diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index b7d644a..f317d1f 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2204,7 +2204,7 @@ @ cdecl getenv(str) MSVCRT_getenv @ cdecl getenv_s(ptr ptr long str) @ cdecl gets(str) MSVCRT_gets -@ stub gets_s +@ cdecl gets_s(ptr long) MSVCRT_gets_s @ cdecl getwc(ptr) MSVCRT_getwc @ cdecl getwchar() MSVCRT_getwchar @ stub ilogb diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 2d096fc..0f5d143 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1868,7 +1868,7 @@ @ cdecl getc(ptr) msvcr120.getc @ cdecl getchar() msvcr120.getchar @ cdecl gets(str) msvcr120.gets -@ stub gets_s +@ cdecl gets_s(ptr long) msvcr120.gets_s @ cdecl getwc(ptr) msvcr120.getwc @ cdecl getwchar() msvcr120.getwchar @ stub ilogb diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 0df1f0a..b563427 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1382,7 +1382,7 @@ @ cdecl getenv(str) MSVCRT_getenv @ cdecl getenv_s(ptr ptr long str) @ cdecl gets(str) MSVCRT_gets -@ stub gets_s +@ cdecl gets_s(ptr long) MSVCRT_gets_s @ cdecl getwc(ptr) MSVCRT_getwc @ cdecl getwchar() MSVCRT_getwchar @ cdecl is_wctype(long long) ntdll.iswctype diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 7238163..a735005 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1355,7 +1355,7 @@ @ cdecl getenv(str) MSVCRT_getenv @ cdecl getenv_s(ptr ptr long str) @ cdecl gets(str) MSVCRT_gets -@ stub gets_s +@ cdecl gets_s(ptr long) MSVCRT_gets_s @ cdecl getwc(ptr) MSVCRT_getwc @ cdecl getwchar() MSVCRT_getwchar @ cdecl is_wctype(long long) ntdll.iswctype diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 1c7b5a4..2c05f25 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -4719,31 +4719,53 @@ int CDECL MSVCRT_getc(MSVCRT_FILE* file) } /********************************************************************* - * gets (MSVCRT.@) + * gets_s (MSVCR80.@) */ -char * CDECL MSVCRT_gets(char *buf) +char * CDECL MSVCRT_gets_s(char *buf, MSVCRT_size_t len) { - int cc; - char * buf_start = buf; + char *buf_start = buf; + int cc; - MSVCRT__lock_file(MSVCRT_stdin); - for(cc = MSVCRT__fgetc_nolock(MSVCRT_stdin); cc != MSVCRT_EOF && cc != '\n'; - cc = MSVCRT__fgetc_nolock(MSVCRT_stdin)) - { - if(cc != '\r') - *buf++ = (char)cc; - } - MSVCRT__unlock_file(MSVCRT_stdin); + if (!MSVCRT_CHECK_PMT(buf != NULL)) return NULL; + if (!MSVCRT_CHECK_PMT(len != 0)) return NULL; - if ((cc == MSVCRT_EOF) && (buf_start == buf)) - { - TRACE(":nothing read\n"); - return NULL; - } - *buf = '\0'; + MSVCRT__lock_file(MSVCRT_stdin); + for(cc = MSVCRT__fgetc_nolock(MSVCRT_stdin); + len != 0 && cc != MSVCRT_EOF && cc != '\n'; + cc = MSVCRT__fgetc_nolock(MSVCRT_stdin)) + { + if (cc != '\r') + { + *buf++ = (char)cc; + len--; + } + } + MSVCRT__unlock_file(MSVCRT_stdin); - TRACE("got '%s'\n", buf_start); - return buf_start; + if (!len) + { + *buf_start = 0; + MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + return NULL; + } + + if ((cc == MSVCRT_EOF) && (buf_start == buf)) + { + TRACE(":nothing read\n"); + return NULL; + } + *buf = '\0'; + + TRACE("got '%s'\n", buf_start); + return buf_start; +} + +/********************************************************************* + * gets (MSVCRT.@) + */ +char * CDECL MSVCRT_gets(char *buf) +{ + return MSVCRT_gets_s(buf, -1); } /********************************************************************* diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 6304663..1ced9ca 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2337,7 +2337,7 @@ @ cdecl getenv(str) MSVCRT_getenv @ cdecl getenv_s(ptr ptr long str) @ cdecl gets(str) MSVCRT_gets -@ stub gets_s +@ cdecl gets_s(ptr long) MSVCRT_gets_s @ cdecl getwc(ptr) MSVCRT_getwc @ cdecl getwchar() MSVCRT_getwchar @ cdecl hypot(double double) _hypot

1 0

Zhiyi Zhang : user32: Send notification for the focused button in IsDialogMessage().
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: 608aa7f3d743ffdf4072cfb0cbb7780bda44559d URL: https://source.winehq.org/git/wine.git/?a=commit;h=608aa7f3d743ffdf4072cfb0… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jul 16 15:48:14 2018 +0800 user32: Send notification for the focused button in IsDialogMessage(). When handling WM_KEYDOWN,VK_RETURN messages from a dialog hwnd in IsDialogMessage(), if the focused button is in the dialog, send a BN_CLICKED notification to the dialog proc. This also make it possible for the default button with an id larger than 0xFFFF in the dialog to receive the correct BN_CLICKED notification, which has a null lParam before this. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/dialog.c | 8 ++++---- dlls/user32/tests/dialog.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 4 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 6f23c74..e584cc1 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -1252,10 +1252,11 @@ BOOL WINAPI IsDialogMessageW( HWND hwndDlg, LPMSG msg ) case VK_RETURN: { DWORD dw; - if ((GetFocus() == msg->hwnd) && - (SendMessageW (msg->hwnd, WM_GETDLGCODE, 0, 0) & DLGC_DEFPUSHBUTTON)) + HWND hwndFocus = GetFocus(); + if (IsChild( hwndDlg, hwndFocus ) && + (SendMessageW( hwndFocus, WM_GETDLGCODE, 0, 0 ) & DLGC_DEFPUSHBUTTON)) { - SendMessageW (hwndDlg, WM_COMMAND, MAKEWPARAM (GetDlgCtrlID(msg->hwnd),BN_CLICKED), (LPARAM)msg->hwnd); + SendMessageW( hwndDlg, WM_COMMAND, MAKEWPARAM( GetDlgCtrlID( hwndFocus ), BN_CLICKED ), (LPARAM)hwndFocus ); } else if (DC_HASDEFID == HIWORD(dw = SendMessageW (hwndDlg, DM_GETDEFID, 0, 0))) { @@ -1266,7 +1267,6 @@ BOOL WINAPI IsDialogMessageW( HWND hwndDlg, LPMSG msg ) else { SendMessageW( hwndDlg, WM_COMMAND, IDOK, (LPARAM)GetDlgItem( hwndDlg, IDOK ) ); - } } return TRUE; diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index e1fe803..0604423 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -55,6 +55,7 @@ static LONG g_styleInitialFocusT1, g_styleInitialFocusT2; static BOOL g_bInitialFocusInitDlgResult, g_bReceivedCommand; static BOOL g_terminated; +static BOOL g_button1Clicked; typedef struct { INT_PTR id; @@ -474,6 +475,10 @@ static LRESULT CALLBACK main_window_procA (HWND hwnd, UINT uiMsg, WPARAM wParam, g_terminated = TRUE; return 0; } + else if ((wParam == 100 || wParam == 0xFFFF) && lParam) + { + g_button1Clicked = TRUE; + } break; } @@ -788,6 +793,33 @@ static void test_IsDialogMessage(void) UnhookWindowsHookEx(hook); DestroyWindow(g_hwndMain); + + g_hwndMain = CreateWindowA("IsDialogMessageWindowClass", "IsDialogMessageWindowClass", WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, g_hinst, 0); + SetFocus(g_hwndButton1); + g_button1Clicked = FALSE; + FormEnterMsg(&msg, g_hwndButton1); + ok(IsDialogMessageA(g_hwndMain, &msg), "Did not handle the ENTER\n"); + ok(g_button1Clicked, "Did not receive button 1 click notification\n"); + + g_button1Clicked = FALSE; + FormEnterMsg(&msg, g_hwndMain); + ok(IsDialogMessageA(g_hwndMain, &msg), "Did not handle the ENTER\n"); + ok(g_button1Clicked, "Did not receive button 1 click notification\n"); + + g_button1Clicked = FALSE; + FormEnterMsg(&msg, g_hwndButton2); + ok(IsDialogMessageA(g_hwndMain, &msg), "Did not handle the ENTER\n"); + ok(g_button1Clicked, "Did not receive button 1 click notification\n"); + + /* Button with id larger than 0xFFFF should also work */ + g_button1Clicked = FALSE; + FormEnterMsg(&msg, g_hwndMain); + SetWindowLongPtrW(g_hwndButton1, GWLP_ID, 0x1FFFF); + ok(IsDialogMessageA(g_hwndMain, &msg), "Did not handle the ENTER\n"); + ok(g_button1Clicked, "Did not receive button 1 click notification\n"); + + DestroyWindow(g_hwndMain); }

1 0

André Hentschel : winedbg: Check for visible window station before displaying crash dialog.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: 13f9461e99398f4080bf0fdd68a03f57a5427002 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13f9461e99398f4080bf0fdd… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jul 13 19:49:40 2018 +0200 winedbg: Check for visible window station before displaying crash dialog. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=35928 Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/crashdlg.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/programs/winedbg/crashdlg.c b/programs/winedbg/crashdlg.c index a925378..cda2642 100644 --- a/programs/winedbg/crashdlg.c +++ b/programs/winedbg/crashdlg.c @@ -48,6 +48,20 @@ int msgbox_res_id(HWND hwnd, UINT textid, UINT captionid, UINT type) return IDCANCEL; } +static BOOL is_visible(void) +{ + USEROBJECTFLAGS flags; + HWINSTA winstation; + + if (!(winstation = GetProcessWindowStation())) + return FALSE; + + if (!(GetUserObjectInformationA(winstation, UOI_FLAGS, &flags, sizeof(flags), NULL))) + return FALSE; + + return flags.dwFlags & WSF_VISIBLE; +} + static WCHAR *get_program_name(HANDLE hProcess) { WCHAR image_name[MAX_PATH]; @@ -362,7 +376,7 @@ int display_crash_dialog(void) /* dbg_curr_process->handle is not set */ HANDLE hProcess; - if (!DBG_IVAR(ShowCrashDialog)) + if (!DBG_IVAR(ShowCrashDialog) || !is_visible()) return TRUE; hProcess = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, dbg_curr_pid);

1 0