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

Nikolay Sivov : comdlg32: Hide Read-only checkbox for Save dialogs.
by Alexandre Julliard March 26, 2018

March 26, 2018

Module: wine Branch: master Commit: 1b04429965cdc04ddd97124ced2b5df8d439ee2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b04429965cdc04ddd97124c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 25 18:51:17 2018 +0300 comdlg32: Hide Read-only checkbox for Save dialogs. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/filedlg.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index fa3832c..d788d4f 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -158,6 +158,11 @@ static BOOL is_dialog_hooked(const FileOpenDlgInfos *info) return (info->ofnInfos->Flags & OFN_ENABLEHOOK) && info->ofnInfos->lpfnHook; } +static BOOL filedialog_is_readonly_hidden(const FileOpenDlgInfos *info) +{ + return (info->ofnInfos->Flags & OFN_HIDEREADONLY) || (info->DlgInfos.dwDlgProp & FODPROP_SAVEDLG); +} + /*********************************************************************** * Prototypes */ @@ -1838,7 +1843,7 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) } /* Must the open as read only check box be hidden? */ - if(fodInfos->ofnInfos->Flags & OFN_HIDEREADONLY) + if (filedialog_is_readonly_hidden(fodInfos)) { ShowWindow(GetDlgItem(hwnd,IDC_OPENREADONLY),SW_HIDE); EnableWindow(GetDlgItem(hwnd, IDC_OPENREADONLY), FALSE); @@ -1882,7 +1887,7 @@ static LRESULT FILEDLG95_ResizeControls(HWND hwnd, WPARAM wParam, LPARAM lParam) UINT flags = SWP_NOACTIVATE; ArrangeCtrlPositions(fodInfos->DlgInfos.hwndCustomDlg, hwnd, - (fodInfos->ofnInfos->Flags & (OFN_HIDEREADONLY | OFN_SHOWHELP)) == OFN_HIDEREADONLY); + filedialog_is_readonly_hidden(fodInfos) && !(fodInfos->ofnInfos->Flags & OFN_SHOWHELP)); /* resize the custom dialog to the parent size */ if (fodInfos->ofnInfos->Flags & (OFN_ENABLETEMPLATE | OFN_ENABLETEMPLATEHANDLE)) @@ -1903,7 +1908,7 @@ static LRESULT FILEDLG95_ResizeControls(HWND hwnd, WPARAM wParam, LPARAM lParam) /* Resize the height; if opened as read-only, checkbox and help button are * hidden and we are not using a custom template nor a customDialog */ - if ( (fodInfos->ofnInfos->Flags & OFN_HIDEREADONLY) && + if (filedialog_is_readonly_hidden(fodInfos) && (!(fodInfos->ofnInfos->Flags & (OFN_SHOWHELP|OFN_ENABLETEMPLATE|OFN_ENABLETEMPLATEHANDLE)))) {

1 0

Józef Kucia : winex11: Return Wine Vulkan driver functions from vkGetDeviceProcAddr().
by Alexandre Julliard March 26, 2018

March 26, 2018

Module: wine Branch: master Commit: 295b6301447963351d1daab64743215d3e419d69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=295b6301447963351d1daab6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat Mar 24 14:28:04 2018 +0100 winex11: Return Wine Vulkan driver functions from vkGetDeviceProcAddr(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/vulkan.c | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index d40afb3..c633579 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -77,6 +77,7 @@ static VkBool32 (*pvkGetPhysicalDeviceXlibPresentationSupportKHR)(VkPhysicalDevi static VkResult (*pvkGetSwapchainImagesKHR)(VkDevice, VkSwapchainKHR, uint32_t *, VkImage *); static VkResult (*pvkQueuePresentKHR)(VkQueue, const VkPresentInfoKHR *); +static void *X11DRV_get_vk_device_proc_addr(const char *name); static void *X11DRV_get_vk_instance_proc_addr(VkInstance instance, const char *name); static struct VkExtensionProperties *winex11_vk_instance_extensions = NULL; @@ -397,9 +398,15 @@ static VkResult X11DRV_vkEnumerateInstanceExtensionProperties(const char *layer_ return *count < winex11_vk_instance_extensions_count ? VK_INCOMPLETE : VK_SUCCESS; } -static void * X11DRV_vkGetDeviceProcAddr(VkDevice device, const char *name) +static void *X11DRV_vkGetDeviceProcAddr(VkDevice device, const char *name) { + void *proc_addr; + TRACE("%p, %s\n", device, debugstr_a(name)); + + if ((proc_addr = X11DRV_get_vk_device_proc_addr(name))) + return proc_addr; + return pvkGetDeviceProcAddr(device, name); } @@ -545,6 +552,35 @@ static void *X11DRV_get_vk_instance_proc_addr(VkInstance instance, const char *n return get_vulkan_driver_instance_proc_addr(&vulkan_funcs, instance, name); } +static void *get_vulkan_driver_device_proc_addr(const struct vulkan_funcs *vulkan_funcs, + const char *name) +{ + if (!name || name[0] != 'v' || name[1] != 'k') + return NULL; + + name += 2; + + if (!strcmp(name, "AcquireNextImageKHR")) + return vulkan_funcs->p_vkAcquireNextImageKHR; + if (!strcmp(name, "CreateSwapchainKHR")) + return vulkan_funcs->p_vkCreateSwapchainKHR; + if (!strcmp(name, "DestroySwapchainKHR")) + return vulkan_funcs->p_vkDestroySwapchainKHR; + if (!strcmp(name, "GetDeviceProcAddr")) + return vulkan_funcs->p_vkGetDeviceProcAddr; + if (!strcmp(name, "GetSwapchainImagesKHR")) + return vulkan_funcs->p_vkGetSwapchainImagesKHR; + if (!strcmp(name, "QueuePresentKHR")) + return vulkan_funcs->p_vkQueuePresentKHR; + + return NULL; +} + +static void *X11DRV_get_vk_device_proc_addr(const char *name) +{ + return get_vulkan_driver_device_proc_addr(&vulkan_funcs, name); +} + const struct vulkan_funcs *get_vulkan_driver(UINT version) { if (version != WINE_VULKAN_DRIVER_VERSION)

1 0

Józef Kucia : winevulkan: Mark explicitly if driver function is needed in dispatch tables.
by Alexandre Julliard March 26, 2018

March 26, 2018

Module: wine Branch: master Commit: f0c3f9e4948d96a789cf0496bda9e22da7261bd0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0c3f9e4948d96a789cf0496… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat Mar 24 14:28:02 2018 +0100 winevulkan: Mark explicitly if driver function is needed in dispatch tables. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index f214ce1..146b485 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -127,7 +127,7 @@ FUNCTION_OVERRIDES = { # Instance functions "vkCreateDevice" : {"dispatch" : True, "driver" : False, "thunk" : False}, - "vkDestroyInstance" : {"dispatch" : True, "driver" : True, "thunk" : False }, + "vkDestroyInstance" : {"dispatch" : False, "driver" : True, "thunk" : False }, "vkEnumerateDeviceExtensionProperties" : {"dispatch" : True, "driver" : False, "thunk" : False}, "vkEnumeratePhysicalDevices" : {"dispatch" : True, "driver" : False, "thunk" : False}, @@ -136,27 +136,27 @@ FUNCTION_OVERRIDES = { "vkCmdExecuteCommands" : {"dispatch" : True, "driver" : False, "thunk" : False}, "vkDestroyDevice" : {"dispatch" : True, "driver" : False, "thunk" : False}, "vkFreeCommandBuffers" : {"dispatch" : True, "driver" : False, "thunk" : False}, - "vkGetDeviceProcAddr" : {"dispatch" : True, "driver" : True, "thunk" : False}, + "vkGetDeviceProcAddr" : {"dispatch" : False, "driver" : True, "thunk" : False}, "vkGetDeviceQueue" : {"dispatch": True, "driver" : False, "thunk" : False}, "vkQueueSubmit" : {"dispatch": True, "driver" : False, "thunk" : False}, # VK_KHR_surface - "vkDestroySurfaceKHR" : {"dispatch" : True, "driver" : True, "thunk" : False}, - "vkGetPhysicalDeviceSurfaceSupportKHR" : {"dispatch" : True, "driver" : True, "thunk" : False}, - "vkGetPhysicalDeviceSurfaceCapabilitiesKHR" : {"dispatch" : True, "driver" : True, "thunk" : False}, - "vkGetPhysicalDeviceSurfaceFormatsKHR" : {"dispatch" : True, "driver" : True, "thunk" : False}, - "vkGetPhysicalDeviceSurfacePresentModesKHR" : {"dispatch" : True, "driver" : True, "thunk" : False}, + "vkDestroySurfaceKHR" : {"dispatch" : False, "driver" : True, "thunk" : False}, + "vkGetPhysicalDeviceSurfaceSupportKHR" : {"dispatch" : False, "driver" : True, "thunk" : False}, + "vkGetPhysicalDeviceSurfaceCapabilitiesKHR" : {"dispatch" : False, "driver" : True, "thunk" : False}, + "vkGetPhysicalDeviceSurfaceFormatsKHR" : {"dispatch" : False, "driver" : True, "thunk" : False}, + "vkGetPhysicalDeviceSurfacePresentModesKHR" : {"dispatch" : False, "driver" : True, "thunk" : False}, # VK_KHR_win32_surface - "vkCreateWin32SurfaceKHR" : {"dispatch" : True, "driver" : True, "thunk" : False}, - "vkGetPhysicalDeviceWin32PresentationSupportKHR" : {"dispatch" : True, "driver" : True, "thunk" : False}, + "vkCreateWin32SurfaceKHR" : {"dispatch" : False, "driver" : True, "thunk" : False}, + "vkGetPhysicalDeviceWin32PresentationSupportKHR" : {"dispatch" : False, "driver" : True, "thunk" : False}, # VK_KHR_swapchain - "vkAcquireNextImageKHR": {"dispatch" : True, "driver" : True, "thunk" : False}, - "vkCreateSwapchainKHR" : {"dispatch" : True, "driver" : True, "thunk" : False}, - "vkDestroySwapchainKHR" : {"dispatch" : True, "driver" : True, "thunk" : False}, - "vkGetSwapchainImagesKHR": {"dispatch" : True, "driver" : True, "thunk" : False}, - "vkQueuePresentKHR": {"dispatch" : True, "driver" : True, "thunk" : False}, + "vkAcquireNextImageKHR": {"dispatch" : False, "driver" : True, "thunk" : False}, + "vkCreateSwapchainKHR" : {"dispatch" : False, "driver" : True, "thunk" : False}, + "vkDestroySwapchainKHR" : {"dispatch" : False, "driver" : True, "thunk" : False}, + "vkGetSwapchainImagesKHR": {"dispatch" : False, "driver" : True, "thunk" : False}, + "vkQueuePresentKHR": {"dispatch" : False, "driver" : True, "thunk" : False}, } @@ -1876,7 +1876,7 @@ class VkGenerator(object): if not vk_func.is_required(): continue - if not vk_func.needs_dispatch() or vk_func.is_driver_func(): + if not vk_func.needs_dispatch(): LOGGER.debug("skipping {0} in vulkan_device_funcs".format(vk_func.name)) continue @@ -1896,7 +1896,7 @@ class VkGenerator(object): if not vk_func.is_required(): continue - if not vk_func.needs_dispatch() or vk_func.is_driver_func(): + if not vk_func.needs_dispatch(): LOGGER.debug("skipping {0} in vulkan_instance_funcs".format(vk_func.name)) continue @@ -1916,7 +1916,7 @@ class VkGenerator(object): if not vk_func.is_required(): continue - if not vk_func.needs_dispatch() or vk_func.is_driver_func(): + if not vk_func.needs_dispatch(): LOGGER.debug("skipping {0} in ALL_VK_DEVICE_FUNCS".format(vk_func.name)) continue @@ -1933,7 +1933,7 @@ class VkGenerator(object): if not vk_func.is_required(): continue - if not vk_func.needs_dispatch() or vk_func.is_driver_func(): + if not vk_func.needs_dispatch(): LOGGER.debug("skipping {0} in ALL_VK_INSTANCE_FUNCS".format(vk_func.name)) continue

1 0

Józef Kucia : winevulkan: Autogenerate thunks for functions overridden by Wine Vulkan driver.
by Alexandre Julliard March 26, 2018

March 26, 2018

Module: wine Branch: master Commit: 8e64c7bd2ccf8b13214ce3f28a6cbe899b7b2ded URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e64c7bd2ccf8b13214ce3f2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat Mar 24 14:28:05 2018 +0100 winevulkan: Autogenerate thunks for functions overridden by Wine Vulkan driver. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 24 +++---- dlls/winevulkan/vulkan.c | 153 ---------------------------------------- dlls/winevulkan/vulkan_thunks.c | 107 ++++++++++++++++++++++++++++ dlls/winevulkan/vulkan_thunks.h | 42 +++++++---- 4 files changed, 148 insertions(+), 178 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8e64c7bd2ccf8b13214c…

1 0

Józef Kucia : winex11: Return Wine Vulkan driver functions from vkGetInstanceProcAddr().
by Alexandre Julliard March 26, 2018

March 26, 2018

Module: wine Branch: master Commit: e952a1879f3927b5b40c9d8b8f3934f0dd177a48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e952a1879f3927b5b40c9d8b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat Mar 24 14:28:03 2018 +0100 winex11: Return Wine Vulkan driver functions from vkGetInstanceProcAddr(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/vulkan.c | 56 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 53 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index 8db61f1..d40afb3 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -77,6 +77,8 @@ static VkBool32 (*pvkGetPhysicalDeviceXlibPresentationSupportKHR)(VkPhysicalDevi static VkResult (*pvkGetSwapchainImagesKHR)(VkDevice, VkSwapchainKHR, uint32_t *, VkImage *); static VkResult (*pvkQueuePresentKHR)(VkQueue, const VkPresentInfoKHR *); +static void *X11DRV_get_vk_instance_proc_addr(VkInstance instance, const char *name); + static struct VkExtensionProperties *winex11_vk_instance_extensions = NULL; static unsigned int winex11_vk_instance_extensions_count = 0; @@ -401,9 +403,15 @@ static void * X11DRV_vkGetDeviceProcAddr(VkDevice device, const char *name) return pvkGetDeviceProcAddr(device, name); } -static void * X11DRV_vkGetInstanceProcAddr(VkInstance instance, const char *name) +static void *X11DRV_vkGetInstanceProcAddr(VkInstance instance, const char *name) { + void *proc_addr; + TRACE("%p, %s\n", instance, debugstr_a(name)); + + if ((proc_addr = X11DRV_get_vk_instance_proc_addr(instance, name))) + return proc_addr; + return pvkGetInstanceProcAddr(instance, name); } @@ -473,7 +481,6 @@ static VkResult X11DRV_vkQueuePresentKHR(VkQueue queue, const VkPresentInfoKHR * return pvkQueuePresentKHR(queue, present_info); } - static const struct vulkan_funcs vulkan_funcs = { X11DRV_vkAcquireNextImageKHR, @@ -492,9 +499,52 @@ static const struct vulkan_funcs vulkan_funcs = X11DRV_vkGetPhysicalDeviceSurfaceSupportKHR, X11DRV_vkGetPhysicalDeviceWin32PresentationSupportKHR, X11DRV_vkGetSwapchainImagesKHR, - X11DRV_vkQueuePresentKHR + X11DRV_vkQueuePresentKHR, }; +static void *get_vulkan_driver_instance_proc_addr(const struct vulkan_funcs *vulkan_funcs, + VkInstance instance, const char *name) +{ + if (!name || name[0] != 'v' || name[1] != 'k') + return NULL; + + name += 2; + + if (!strcmp(name, "CreateInstance")) + return vulkan_funcs->p_vkCreateInstance; + if (!strcmp(name, "EnumerateInstanceExtensionProperties")) + return vulkan_funcs->p_vkEnumerateInstanceExtensionProperties; + + if (!instance) + return NULL; + + if (!strcmp(name, "CreateWin32SurfaceKHR")) + return vulkan_funcs->p_vkCreateWin32SurfaceKHR; + if (!strcmp(name, "DestroyInstance")) + return vulkan_funcs->p_vkDestroyInstance; + if (!strcmp(name, "DestroySurfaceKHR")) + return vulkan_funcs->p_vkDestroySurfaceKHR; + if (!strcmp(name, "GetInstanceProcAddr")) + return vulkan_funcs->p_vkGetInstanceProcAddr; + if (!strcmp(name, "GetPhysicalDeviceSurfaceCapabilitiesKHR")) + return vulkan_funcs->p_vkGetPhysicalDeviceSurfaceCapabilitiesKHR; + if (!strcmp(name, "GetPhysicalDeviceSurfaceFormatsKHR")) + return vulkan_funcs->p_vkGetPhysicalDeviceSurfaceFormatsKHR; + if (!strcmp(name, "GetPhysicalDeviceSurfacePresentModesKHR")) + return vulkan_funcs->p_vkGetPhysicalDeviceSurfacePresentModesKHR; + if (!strcmp(name, "GetPhysicalDeviceSurfaceSupportKHR")) + return vulkan_funcs->p_vkGetPhysicalDeviceSurfaceSupportKHR; + if (!strcmp(name, "GetPhysicalDeviceWin32PresentationSupportKHR")) + return vulkan_funcs->p_vkGetPhysicalDeviceWin32PresentationSupportKHR; + + return NULL; +} + +static void *X11DRV_get_vk_instance_proc_addr(VkInstance instance, const char *name) +{ + return get_vulkan_driver_instance_proc_addr(&vulkan_funcs, instance, name); +} + const struct vulkan_funcs *get_vulkan_driver(UINT version) { if (version != WINE_VULKAN_DRIVER_VERSION)

1 0

Józef Kucia : winevulkan: Put all required functions into function tables.
by Alexandre Julliard March 26, 2018

March 26, 2018

Module: wine Branch: master Commit: 48e4801e02ddc2697d1c417961faad9d004dccfd URL: https://source.winehq.org/git/wine.git/?a=commit;h=48e4801e02ddc2697d1c4179… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat Mar 24 14:28:01 2018 +0100 winevulkan: Put all required functions into function tables. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 8 -------- 1 file changed, 8 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 14a61b9..f214ce1 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1760,10 +1760,6 @@ class VkGenerator(object): if not vk_func.is_required(): continue - if not vk_func.needs_dispatch(): - LOGGER.debug("skipping {0} in device dispatch table".format(vk_func.name)) - continue - f.write(" {{\"{0}\", &{1}{0}}},\n".format(vk_func.name, prefix)) f.write("};\n\n") @@ -1772,10 +1768,6 @@ class VkGenerator(object): if not vk_func.is_required(): continue - if not vk_func.needs_dispatch(): - LOGGER.debug("skipping {0} in instance dispatch table".format(vk_func.name)) - continue - f.write(" {{\"{0}\", &{1}{0}}},\n".format(vk_func.name, prefix)) f.write("};\n\n")

1 0

Józef Kucia : winevulkan: Get rid of unnecessary forward declarations.
by Alexandre Julliard March 26, 2018

March 26, 2018

Module: wine Branch: master Commit: 00e50233d74b124faeb16b873baa0de5519c7e20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00e50233d74b124faeb16b87… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat Mar 24 14:27:59 2018 +0100 winevulkan: Get rid of unnecessary forward declarations. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 188 +++++++++++++++++++++++------------------------ 1 file changed, 92 insertions(+), 96 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 7e800cc..aebd205 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -46,12 +46,101 @@ struct wine_vk_structure_header }; static void *wine_vk_get_global_proc_addr(const char *name); -static struct VkPhysicalDevice_T *wine_vk_physical_device_alloc(struct VkInstance_T *instance, - VkPhysicalDevice phys_dev_host); -static void wine_vk_physical_device_free(struct VkPhysicalDevice_T *phys_dev); static const struct vulkan_funcs *vk_funcs = NULL; +static void wine_vk_physical_device_free(struct VkPhysicalDevice_T *phys_dev) +{ + if (!phys_dev) + return; + + heap_free(phys_dev->properties); + heap_free(phys_dev); +} + +static struct VkPhysicalDevice_T *wine_vk_physical_device_alloc(struct VkInstance_T *instance, + VkPhysicalDevice phys_dev) +{ + struct VkPhysicalDevice_T *object; + uint32_t num_host_properties, num_properties = 0; + VkExtensionProperties *host_properties = NULL; + VkResult res; + unsigned int i, j; + + if (!(object = heap_alloc_zero(sizeof(*object)))) + return NULL; + + object->base.loader_magic = VULKAN_ICD_MAGIC_VALUE; + object->instance = instance; + object->phys_dev = phys_dev; + + res = instance->funcs.p_vkEnumerateDeviceExtensionProperties(phys_dev, + NULL, &num_host_properties, NULL); + if (res != VK_SUCCESS) + { + ERR("Failed to enumerate device extensions, res=%d\n", res); + goto err; + } + + host_properties = heap_calloc(num_host_properties, sizeof(*host_properties)); + if (!host_properties) + { + ERR("Failed to allocate memory for device properties!\n"); + goto err; + } + + res = instance->funcs.p_vkEnumerateDeviceExtensionProperties(phys_dev, + NULL, &num_host_properties, host_properties); + if (res != VK_SUCCESS) + { + ERR("Failed to enumerate device extensions, res=%d\n", res); + goto err; + } + + /* Count list of extensions for which we have an implementation. + * TODO: perform translation for platform specific extensions. + */ + for (i = 0; i < num_host_properties; i++) + { + if (wine_vk_device_extension_supported(host_properties[i].extensionName)) + { + TRACE("Enabling extension '%s' for physical device %p\n", host_properties[i].extensionName, object); + num_properties++; + } + else + { + TRACE("Skipping extension '%s', no implementation found in winevulkan.\n", host_properties[i].extensionName); + } + } + + TRACE("Host supported extensions %u, Wine supported extensions %u\n", num_host_properties, num_properties); + + object->properties = heap_calloc(num_properties, sizeof(*object->properties)); + if (!object->properties) + { + ERR("Failed to allocate memory for device properties!\n"); + goto err; + } + + for (i = 0, j = 0; i < num_host_properties; i++) + { + if (wine_vk_device_extension_supported(host_properties[i].extensionName)) + { + memcpy(&object->properties[j], &host_properties[i], sizeof(*object->properties)); + j++; + } + } + object->num_properties = num_properties; + + heap_free(host_properties); + return object; + +err: + wine_vk_physical_device_free(object); + heap_free(host_properties); + return NULL; +} + /* Helper function for release command buffers. */ static void wine_vk_command_buffers_free(struct VkDevice_T *device, VkCommandPool pool, uint32_t count, const VkCommandBuffer *buffers) @@ -332,99 +421,6 @@ static void wine_vk_instance_free(struct VkInstance_T *instance) heap_free(instance); } -static struct VkPhysicalDevice_T *wine_vk_physical_device_alloc(struct VkInstance_T *instance, - VkPhysicalDevice phys_dev) -{ - struct VkPhysicalDevice_T *object; - uint32_t num_host_properties, num_properties = 0; - VkExtensionProperties *host_properties = NULL; - VkResult res; - unsigned int i, j; - - object = heap_alloc_zero(sizeof(*object)); - if (!object) - return NULL; - - object->base.loader_magic = VULKAN_ICD_MAGIC_VALUE; - object->instance = instance; - object->phys_dev = phys_dev; - - res = instance->funcs.p_vkEnumerateDeviceExtensionProperties(phys_dev, - NULL, &num_host_properties, NULL); - if (res != VK_SUCCESS) - { - ERR("Failed to enumerate device extensions, res=%d\n", res); - goto err; - } - - host_properties = heap_calloc(num_host_properties, sizeof(*host_properties)); - if (!host_properties) - { - ERR("Failed to allocate memory for device properties!\n"); - goto err; - } - - res = instance->funcs.p_vkEnumerateDeviceExtensionProperties(phys_dev, - NULL, &num_host_properties, host_properties); - if (res != VK_SUCCESS) - { - ERR("Failed to enumerate device extensions, res=%d\n", res); - goto err; - } - - /* Count list of extensions for which we have an implementation. - * TODO: perform translation for platform specific extensions. - */ - for (i = 0; i < num_host_properties; i++) - { - if (wine_vk_device_extension_supported(host_properties[i].extensionName)) - { - TRACE("Enabling extension '%s' for physical device %p\n", host_properties[i].extensionName, object); - num_properties++; - } - else - { - TRACE("Skipping extension '%s', no implementation found in winevulkan.\n", host_properties[i].extensionName); - } - } - - TRACE("Host supported extensions %u, Wine supported extensions %u\n", num_host_properties, num_properties); - - object->properties = heap_calloc(num_properties, sizeof(*object->properties)); - if (!object->properties) - { - ERR("Failed to allocate memory for device properties!\n"); - goto err; - } - - for (i = 0, j = 0; i < num_host_properties; i++) - { - if (wine_vk_device_extension_supported(host_properties[i].extensionName)) - { - memcpy(&object->properties[j], &host_properties[i], sizeof(*object->properties)); - j++; - } - } - object->num_properties = num_properties; - - heap_free(host_properties); - return object; - -err: - wine_vk_physical_device_free(object); - heap_free(host_properties); - return NULL; -} - -static void wine_vk_physical_device_free(struct VkPhysicalDevice_T *phys_dev) -{ - if (!phys_dev) - return; - - heap_free(phys_dev->properties); - heap_free(phys_dev); -} - VkResult WINAPI wine_vkAcquireNextImageKHR(VkDevice device, VkSwapchainKHR swapchain, uint64_t timeout, VkSemaphore semaphore, VkFence fence, uint32_t *image_index) {

1 0

Nikolay Sivov : include: Add WinInet error codes.
by Alexandre Julliard March 26, 2018

March 26, 2018

Module: wine Branch: master Commit: 2c41d5b0e32a2030037f010c77673b96c22e5ab8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c41d5b0e32a2030037f010c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 24 12:29:26 2018 +0300 include: Add WinInet error codes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winerror.h | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/include/winerror.h b/include/winerror.h index 2c6ce20..886182f 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -3010,6 +3010,85 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define SCARD_W_CACHE_ITEM_STALE _HRESULT_TYPEDEF_(0x80100071) #define SCARD_W_CACHE_ITEM_TOO_BIG _HRESULT_TYPEDEF_(0x80100072) +#define WININET_E_OUT_OF_HANDLES _HRESULT_TYPEDEF_(0x80072ee1) +#define WININET_E_TIMEOUT _HRESULT_TYPEDEF_(0x80072ee2) +#define WININET_E_EXTENDED_ERROR _HRESULT_TYPEDEF_(0x80072ee3) +#define WININET_E_INTERNAL_ERROR _HRESULT_TYPEDEF_(0x80072ee4) +#define WININET_E_INVALID_URL _HRESULT_TYPEDEF_(0x80072ee5) +#define WININET_E_UNRECOGNIZED_SCHEME _HRESULT_TYPEDEF_(0x80072ee6) +#define WININET_E_NAME_NOT_RESOLVED _HRESULT_TYPEDEF_(0x80072ee7) +#define WININET_E_PROTOCOL_NOT_FOUND _HRESULT_TYPEDEF_(0x80072ee8) +#define WININET_E_INVALID_OPTION _HRESULT_TYPEDEF_(0x80072ee9) +#define WININET_E_BAD_OPTION_LENGTH _HRESULT_TYPEDEF_(0x80072eea) +#define WININET_E_OPTION_NOT_SETTABLE _HRESULT_TYPEDEF_(0x80072eeb) +#define WININET_E_SHUTDOWN _HRESULT_TYPEDEF_(0x80072eec) +#define WININET_E_INCORRECT_USER_NAME _HRESULT_TYPEDEF_(0x80072eed) +#define WININET_E_INCORRECT_PASSWORD _HRESULT_TYPEDEF_(0x80072eee) +#define WININET_E_LOGIN_FAILURE _HRESULT_TYPEDEF_(0x80072eef) +#define WININET_E_INVALID_OPERATION _HRESULT_TYPEDEF_(0x80072ef0) +#define WININET_E_OPERATION_CANCELLED _HRESULT_TYPEDEF_(0x80072ef1) +#define WININET_E_INCORRECT_HANDLE_TYPE _HRESULT_TYPEDEF_(0x80072ef2) +#define WININET_E_INCORRECT_HANDLE_STATE _HRESULT_TYPEDEF_(0x80072ef3) +#define WININET_E_NOT_PROXY_REQUEST _HRESULT_TYPEDEF_(0x80072ef4) +#define WININET_E_REGISTRY_VALUE_NOT_FOUND _HRESULT_TYPEDEF_(0x80072ef5) +#define WININET_E_BAD_REGISTRY_PARAMETER _HRESULT_TYPEDEF_(0x80072ef6) +#define WININET_E_NO_DIRECT_ACCESS _HRESULT_TYPEDEF_(0x80072ef7) +#define WININET_E_NO_CONTEXT _HRESULT_TYPEDEF_(0x80072ef8) +#define WININET_E_NO_CALLBACK _HRESULT_TYPEDEF_(0x80072ef9) +#define WININET_E_REQUEST_PENDING _HRESULT_TYPEDEF_(0x80072efa) +#define WININET_E_INCORRECT_FORMAT _HRESULT_TYPEDEF_(0x80072efb) +#define WININET_E_ITEM_NOT_FOUND _HRESULT_TYPEDEF_(0x80072efc) +#define WININET_E_CANNOT_CONNECT _HRESULT_TYPEDEF_(0x80072efd) +#define WININET_E_CONNECTION_ABORTED _HRESULT_TYPEDEF_(0x80072efe) +#define WININET_E_CONNECTION_RESET _HRESULT_TYPEDEF_(0x80072eff) +#define WININET_E_FORCE_RETRY _HRESULT_TYPEDEF_(0x80072f00) +#define WININET_E_INVALID_PROXY_REQUREST _HRESULT_TYPEDEF_(0x80072f01) +#define WININET_E_NEED_UI _HRESULT_TYPEDEF_(0x80072f02) +#define WININET_E_HANDLE_EXISTS _HRESULT_TYPEDEF_(0x80072f04) +#define WININET_E_SEC_CERT_DATE_INVALID _HRESULT_TYPEDEF_(0x80072f05) +#define WININET_E_SEC_CERT_CN_INVALID _HRESULT_TYPEDEF_(0x80072f06) +#define WININET_E_HTTP_TO_HTTPS_ON_REDIR _HRESULT_TYPEDEF_(0x80072f07) +#define WININET_E_HTTPS_TO_HTTP_ON_REDIR _HRESULT_TYPEDEF_(0x80072f08) +#define WININET_E_MIXED_SECURITY _HRESULT_TYPEDEF_(0x80072f09) +#define WININET_E_CHG_POST_IS_NON_SECURE _HRESULT_TYPEDEF_(0x80072f0a) +#define WININET_E_POST_IS_NON_SECURE _HRESULT_TYPEDEF_(0x80072f0b) +#define WININET_E_CLIENT_AUTH_CERT_NEEDED _HRESULT_TYPEDEF_(0x80072f0c) +#define WININET_E_INVALID_CA _HRESULT_TYPEDEF_(0x80072f0d) +#define WININET_E_CLIENT_AUTH_NOT_SETUP _HRESULT_TYPEDEF_(0x80072f0e) +#define WININET_E_ASYNC_THREAD_FAILED _HRESULT_TYPEDEF_(0x80072f0f) +#define WININET_E_REDIRECT_SCHEME_CHANGE _HRESULT_TYPEDEF_(0x80072f10) +#define WININET_E_DIALOG_PENDING _HRESULT_TYPEDEF_(0x80072f11) +#define WININET_E_RETRY_DIALOG _HRESULT_TYPEDEF_(0x80072f12) +#define WININET_E_NO_NEW_CONTAINERS _HRESULT_TYPEDEF_(0x80072f13) +#define WININET_E_HTTPS_HTTP_SUBMIT_REDIR _HRESULT_TYPEDEF_(0x80072f14) +#define WININET_E_SEC_CERT_ERRORS _HRESULT_TYPEDEF_(0x80072f17) +#define WININET_E_SEC_CERT_REV_FAILED _HRESULT_TYPEDEF_(0x80072f19) +#define WININET_E_HEADER_NOT_FOUND _HRESULT_TYPEDEF_(0x80072f76) +#define WININET_E_DOWNLEVEL_SERVER _HRESULT_TYPEDEF_(0x80072f77) +#define WININET_E_INVALID_SERVER_RESPONSE _HRESULT_TYPEDEF_(0x80072f78) +#define WININET_E_INVALID_HEADER _HRESULT_TYPEDEF_(0x80072f79) +#define WININET_E_INVALID_QUERY_REQUEST _HRESULT_TYPEDEF_(0x80072f7a) +#define WININET_E_HEADER_ALREADY_EXISTS _HRESULT_TYPEDEF_(0x80072f7b) +#define WININET_E_REDIRECT_FAILED _HRESULT_TYPEDEF_(0x80072f7c) +#define WININET_E_SECURITY_CHANNEL_ERROR _HRESULT_TYPEDEF_(0x80072f7d) +#define WININET_E_UNABLE_TO_CACHE_FILE _HRESULT_TYPEDEF_(0x80072f7e) +#define WININET_E_TCPIP_NOT_INSTALLED _HRESULT_TYPEDEF_(0x80072f7f) +#define WININET_E_NOT_REDIRECTED _HRESULT_TYPEDEF_(0x80072f80) +#define WININET_E_COOKIE_NEEDS_CONFIRMATION _HRESULT_TYPEDEF_(0x80072f81) +#define WININET_E_COOKIE_DECLINED _HRESULT_TYPEDEF_(0x80072f82) +#define WININET_E_DISCONNECTED _HRESULT_TYPEDEF_(0x80072f83) +#define WININET_E_SERVER_UNREACHABLE _HRESULT_TYPEDEF_(0x80072f84) +#define WININET_E_PROXY_SERVER_UNREACHABLE _HRESULT_TYPEDEF_(0x80072f85) +#define WININET_E_BAD_AUTO_PROXY_SCRIPT _HRESULT_TYPEDEF_(0x80072f86) +#define WININET_E_UNABLE_TO_DOWNLOAD_SCRIPT _HRESULT_TYPEDEF_(0x80072f87) +#define WININET_E_REDIRECT_NEEDS_CONFIRMATION _HRESULT_TYPEDEF_(0x80072f88) +#define WININET_E_SEC_INVALID_CERT _HRESULT_TYPEDEF_(0x80072f89) +#define WININET_E_SEC_CERT_REVOKED _HRESULT_TYPEDEF_(0x80072f8a) +#define WININET_E_FAILED_DUETOSECURITYCHECK _HRESULT_TYPEDEF_(0x80072f8b) +#define WININET_E_NOT_INITIALIZED _HRESULT_TYPEDEF_(0x80072f8c) +#define WININET_E_LOGIN_FAILURE_DISPLAY_ENTITY_BODY _HRESULT_TYPEDEF_(0x80072f8e) +#define WININET_E_DECODING_FAILED _HRESULT_TYPEDEF_(0x80072f8f) + #define D3D11_ERROR_TOO_MANY_UNIQUE_STATE_OBJECTS _HRESULT_TYPEDEF_(0x887c0001) #define D3D11_ERROR_FILE_NOT_FOUND _HRESULT_TYPEDEF_(0x887c0002) #define D3D11_ERROR_TOO_MANY_UNIQUE_VIEW_OBJECTS _HRESULT_TYPEDEF_(0x887c0003)

1 0

Józef Kucia : winevulkan: Generate conversions only for autogenerated thunks.
by Alexandre Julliard March 26, 2018

March 26, 2018

Module: wine Branch: master Commit: 789fc6257427b63bdb5af9afd60d537fa8444401 URL: https://source.winehq.org/git/wine.git/?a=commit;h=789fc6257427b63bdb5af9af… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat Mar 24 14:28:00 2018 +0100 winevulkan: Generate conversions only for autogenerated thunks. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 5 ++--- dlls/winevulkan/vulkan_thunks.c | 11 ----------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 5303fec..14a61b9 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1710,9 +1710,8 @@ class VkGenerator(object): conversions = func.get_conversions() for conv in conversions: - # Pull in any conversions for vulkan_thunks.c. Driver conversions we - # handle manually in vulkan.c if needed. - if not func.is_driver_func(): + # Pull in any conversions for vulkan_thunks.c. + if func.needs_thunk(): # Append if we don't already have this conversion. if not any(c == conv for c in self.conversions): self.conversions.append(conv) diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index bf8e78c..463a04a 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -12,17 +12,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(vulkan); #if defined(USE_STRUCT_CONVERSION) -static inline void convert_VkCommandBufferAllocateInfo_win_to_host(const VkCommandBufferAllocateInfo *in, VkCommandBufferAllocateInfo_host *out) -{ - if (!in) return; - - out->sType = in->sType; - out->pNext = in->pNext; - out->commandPool = in->commandPool; - out->level = in->level; - out->commandBufferCount = in->commandBufferCount; -} - static inline void convert_VkDescriptorSetAllocateInfo_win_to_host(const VkDescriptorSetAllocateInfo *in, VkDescriptorSetAllocateInfo_host *out) { if (!in) return;

1 0

Francois Gouget : testbot/web: Tweak ItemPage to save the Item directly.
by Alexandre Julliard March 26, 2018

March 26, 2018

Module: tools Branch: master Commit: c18379abe004411ca779d4c42e26d7e7f3d72ba6 URL: https://source.winehq.org/git/tools.git/?a=commit;h=c18379abe004411ca779d4c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 26 05:21:05 2018 +0200 testbot/web: Tweak ItemPage to save the Item directly. This avoids depending on whether Items retrieved with Collection::GetItem() are stored in the Collection or not. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/ItemPage.pm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm index 4086a93..b44e5b2 100644 --- a/testbot/lib/ObjectModel/CGI/ItemPage.pm +++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm @@ -137,6 +137,16 @@ sub SaveProperty($$$) return 1; } +sub Save($) +{ + my ($self) = @_; + + return !1 if (!$self->SaveProperties()); + + ($self->{ErrField}, $self->{ErrMessage}) = $self->{Item}->Save(); + return ! defined($self->{ErrMessage}); +} + sub OnAction($$) { my ($self, $Action) = @_;

1 0