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

[PATCH] windowscodecs: Fix stride calculation in JPEG decoder.
by Dmitry Timoshkov March 6, 2018

March 6, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/jpegformat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index 08f1ee78e6..27cd88036b 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -624,7 +624,7 @@ static HRESULT WINAPI JpegDecoder_Frame_CopyPixels(IWICBitmapFrameDecode *iface, else if (This->cinfo.out_color_space == JCS_CMYK) bpp = 32; else bpp = 24; - stride = bpp * This->cinfo.output_width; + stride = (bpp * This->cinfo.output_width + 7) / 8; data_size = stride * This->cinfo.output_height; max_row_needed = prc->Y + prc->Height; -- 2.16.2

2 1

[PATCH v3 1/2] winevulkan: Implement vkEnumeratePhysicalDevices.
by Józef Kucia March 6, 2018

March 6, 2018

From: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Version 3: * Fixed off-by-one error in wine_vk_instance_load_physical_devices(). * Removed redundant memory cleanup in wine_vk_instance_load_physical_devices(), wine_vk_instance_free() is able to free partially initialized VkInstance_T objects. * Use %u for usigned integers. --- dlls/winevulkan/make_vulkan | 1 + dlls/winevulkan/vulkan.c | 126 ++++++++++++++++++++++++++++++++++++++- dlls/winevulkan/vulkan_private.h | 14 +++++ dlls/winevulkan/vulkan_thunks.c | 6 -- dlls/winevulkan/vulkan_thunks.h | 1 + 5 files changed, 141 insertions(+), 7 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 5657b70c4c73..3b045db8a927 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -90,6 +90,7 @@ FUNCTION_OVERRIDES = { # Instance functions "vkDestroyInstance" : {"dispatch" : True, "driver" : True, "thunk" : False }, + "vkEnumeratePhysicalDevices" : {"dispatch" : True, "driver" : False, "thunk" : False}, } diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 0f48d971e2be..a2223cfa7590 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -58,6 +58,69 @@ static BOOL wine_vk_init(void) return TRUE; } +/* Helper function which stores wrapped physical devices in the instance object. */ +static VkResult wine_vk_instance_load_physical_devices(struct VkInstance_T *instance) +{ + VkResult res; + struct VkPhysicalDevice_T **tmp_phys_devs = NULL; + uint32_t num_phys_devs = 0; + unsigned int i; + + res = instance->funcs.p_vkEnumeratePhysicalDevices(instance->instance, &num_phys_devs, NULL); + if (res != VK_SUCCESS) + { + ERR("Failed to enumerate physical devices, res=%d\n", res); + return res; + } + + /* Don't bother with any of the rest if the system just lacks devices. */ + if (num_phys_devs == 0) + return VK_SUCCESS; + + tmp_phys_devs = heap_calloc(num_phys_devs, sizeof(*tmp_phys_devs)); + if (!tmp_phys_devs) + return VK_ERROR_OUT_OF_HOST_MEMORY; + + res = instance->funcs.p_vkEnumeratePhysicalDevices(instance->instance, &num_phys_devs, tmp_phys_devs); + if (res != VK_SUCCESS) + goto err; + + instance->phys_devs = heap_calloc(num_phys_devs, sizeof(*instance->phys_devs)); + if (!instance->phys_devs) + { + res = VK_ERROR_OUT_OF_HOST_MEMORY; + goto err; + } + + /* Wrap each native physical device handle into a dispatchable object for the ICD loader. */ + for (i = 0; i < num_phys_devs; i++) + { + struct VkPhysicalDevice_T *phys_dev = heap_alloc(sizeof(*phys_dev)); + if (!phys_dev) + { + ERR("Unable to allocate memory for physical device!\n"); + res = VK_ERROR_OUT_OF_HOST_MEMORY; + goto err; + } + + phys_dev->base.loader_magic = VULKAN_ICD_MAGIC_VALUE; + phys_dev->instance = instance; + phys_dev->phys_dev = tmp_phys_devs[i]; + + instance->phys_devs[i] = phys_dev; + instance->num_phys_devs = i + 1; + } + instance->num_phys_devs = num_phys_devs; + + heap_free(tmp_phys_devs); + return VK_SUCCESS; + +err: + heap_free(tmp_phys_devs); + + return res; +} + /* Helper function used for freeing an instance structure. This function supports full * and partial object cleanups and can thus be used for vkCreateInstance failures. */ @@ -66,6 +129,17 @@ static void wine_vk_instance_free(struct VkInstance_T *instance) if (!instance) return; + if (instance->phys_devs) + { + unsigned int i; + + for (i = 0; i < instance->num_phys_devs; i++) + { + heap_free(&instance->phys_devs[i]); + } + heap_free(instance->phys_devs); + } + if (instance->instance) vk_funcs->p_vkDestroyInstance(instance->instance, NULL /* allocator */); @@ -83,7 +157,7 @@ static VkResult WINAPI wine_vkCreateInstance(const VkInstanceCreateInfo *create_ if (allocator) FIXME("Support for allocation callbacks not implemented yet\n"); - object = heap_alloc(sizeof(*object)); + object = heap_alloc_zero(sizeof(*object)); if (!object) { ERR("Failed to allocate memory for instance\n"); @@ -108,6 +182,18 @@ static VkResult WINAPI wine_vkCreateInstance(const VkInstanceCreateInfo *create_ ALL_VK_INSTANCE_FUNCS() #undef USE_VK_FUNC + /* Cache physical devices for vkEnumeratePhysicalDevices within the instance as + * each vkPhysicalDevice is a dispatchable object, which means we need to wrap + * the native physical device and present those the application. + * Cleanup happens as part of wine_vkDestroyInstance. + */ + res = wine_vk_instance_load_physical_devices(object); + if (res != VK_SUCCESS) + { + ERR("Failed to cache physical devices, res=%d\n", res); + goto err; + } + *instance = object; TRACE("Done, instance=%p native_instance=%p\n", object, object->instance); return VK_SUCCESS; @@ -134,6 +220,44 @@ static VkResult WINAPI wine_vkEnumerateInstanceExtensionProperties(const char *l return vk_funcs->p_vkEnumerateInstanceExtensionProperties(layer_name, count, properties); } +VkResult WINAPI wine_vkEnumeratePhysicalDevices(VkInstance instance, uint32_t *device_count, + VkPhysicalDevice *devices) +{ + VkResult res; + unsigned int i, num_copies; + + TRACE("%p %p %p\n", instance, device_count, devices); + + if (!devices) + { + *device_count = instance->num_phys_devs; + return VK_SUCCESS; + } + + if (*device_count < instance->num_phys_devs) + { + /* Incomplete is a type of success used to signal the application + * that not all devices got copied. + */ + num_copies = *device_count; + res = VK_INCOMPLETE; + } + else + { + num_copies = instance->num_phys_devs; + res = VK_SUCCESS; + } + + for (i = 0; i < num_copies; i++) + { + devices[i] = instance->phys_devs[i]; + } + *device_count = num_copies; + + TRACE("Returning %u devices\n", *device_count); + return res; +} + static 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 16aa0ce55cd4..8ef4b924a2b9 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -52,7 +52,21 @@ struct VkInstance_T { struct wine_vk_base base; struct vulkan_instance_funcs funcs; + + /* We cache devices as we need to wrap them as they are + * dispatchable objects. + */ + uint32_t num_phys_devs; + struct VkPhysicalDevice_T **phys_devs; + VkInstance instance; /* native instance */ }; +struct VkPhysicalDevice_T +{ + struct wine_vk_base base; + struct VkInstance_T *instance; /* parent */ + VkPhysicalDevice phys_dev; /* native physical device */ +}; + #endif /* __WINE_VULKAN_PRIVATE_H */ diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index c1c0b079a534..ae4f773ef0d8 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -28,12 +28,6 @@ static VkResult WINAPI wine_vkEnumerateDeviceLayerProperties(VkPhysicalDevice ph return VK_ERROR_OUT_OF_HOST_MEMORY; } -static VkResult WINAPI wine_vkEnumeratePhysicalDevices(VkInstance instance, uint32_t *pPhysicalDeviceCount, VkPhysicalDevice *pPhysicalDevices) -{ - FIXME("stub: %p, %p, %p\n", instance, pPhysicalDeviceCount, pPhysicalDevices); - return VK_ERROR_OUT_OF_HOST_MEMORY; -} - static void WINAPI wine_vkGetPhysicalDeviceFeatures(VkPhysicalDevice physicalDevice, VkPhysicalDeviceFeatures *pFeatures) { FIXME("stub: %p, %p\n", physicalDevice, pFeatures); diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index 087fa17d0eee..26e114ab74fb 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -8,6 +8,7 @@ void *wine_vk_get_instance_proc_addr(const char *name) DECLSPEC_HIDDEN; /* Functions for which we have custom implementations outside of the thunks. */ void WINAPI wine_vkDestroyInstance(VkInstance instance, const VkAllocationCallbacks *pAllocator) DECLSPEC_HIDDEN; +VkResult WINAPI wine_vkEnumeratePhysicalDevices(VkInstance instance, uint32_t *pPhysicalDeviceCount, VkPhysicalDevice *pPhysicalDevices) DECLSPEC_HIDDEN; /* For use by vkInstance and children */ struct vulkan_instance_funcs -- 2.16.2

1 1

[PATCH] wmp: Add semistub IWMPSettings invokeURLs, enableErrorDialogs and autoStart properties implementation.
by Jacek Caban March 6, 2018

March 6, 2018

From: Anton Romanov <theli.ua(a)gmail.com> WPF's MediaPlayer class expects those not to fail Signed-off-by: Anton Romanov <theli.ua(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/wmp/oleobj.c | 2 +- dlls/wmp/player.c | 43 ++++++++++++++++++++++++++++++++----------- dlls/wmp/tests/oleobj.c | 29 +++++++++++++++++++++++++++++ dlls/wmp/wmp_private.h | 7 ++++++- 4 files changed, 68 insertions(+), 13 deletions(-)

1 0

Wine staging 3.3 release
by Alistair Leslie-Hughes March 6, 2018

March 6, 2018

Hi, I would like to thank everyone's for there support during this transition of wine-staging to new maintainers. We have decided for the first few releases to have the packages published to the following repository. https://repos.wine-staging.com/alesliehughes/ Once people give this a workout and confirm that it's still working. I'll get it moved and it we become an official staging release. This is not permanent situation and once the new staging team has successfully released a few times. We'll push directly as a wine-staging release. Please bear with us during this changeover period. The last thing we want, is to break wine-staging on systems where it's currently working. Summary of the past few weeks * Rebased to current wine 3.3 (Over 1000 patches are applied to wine vanilla) * Associated more patches to wine bug. * Reviewed and upstreamed patches. Where can you help * Run Steam/Battle.net. * Try you favorite game WOW/Diablo 3/Overwatch/Need for Speed to name a few. * Test your favorite applicaions. * Steal staging patches and get the accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.com Best Regards Alistair.

3 2

[PATCH] msvcr120: Add __free_locale
by Zhiyi Zhang March 6, 2018

March 6, 2018

__free_locale (with two leading underscores) is the previous name of _free_locale Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

2 1

[PATCH 5/5] usp10: Use heap_calloc() in ScriptShape().
by Henri Verbeet March 6, 2018

March 6, 2018

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/usp10/usp10.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 411d19f..983eb83 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3333,10 +3333,10 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars, if (!psva || !pcGlyphs) return E_INVALIDARG; if (cChars > cMaxGlyphs) return E_OUTOFMEMORY; - charProps = heap_alloc_zero(sizeof(SCRIPT_CHARPROP)*cChars); - if (!charProps) return E_OUTOFMEMORY; - glyphProps = heap_alloc_zero(sizeof(SCRIPT_GLYPHPROP)*cMaxGlyphs); - if (!glyphProps) + if (!(charProps = heap_calloc(cChars, sizeof(*charProps)))) + return E_OUTOFMEMORY; + + if (!(glyphProps = heap_calloc(cMaxGlyphs, sizeof(*glyphProps)))) { heap_free(charProps); return E_OUTOFMEMORY; -- 2.1.4

2 1

Re: GSOC
by Abhishek Kumar March 6, 2018

March 6, 2018

Abhisheks-MacBook-Air:~ abhi$ *WINEARCH=win64 WINEPREFIX=~/.wine64 winecfg * 0059:err:process:__wine_kernel_init boot event wait timed out On Tue, Mar 6, 2018 at 2:37 AM, Abhishek Kumar <abhishek.sec09(a)gmail.com> wrote: > Again i get error after install ncurses. > > > *Abhisheks-MacBook-Air:~ abhi$ WINEARCH=win64 WINEPREFIX=~/.wine64 > notepad* > > *0055:err:process:__wine_kernel_init boot event wait timed out* > > *Wine cannot find the ncurses library (libncurses.5.4.dylib).* > > *002b:err:hid_report:process_hid_report Device reports coming in too fast, > last report not read yet!* > > > On Tue, Mar 6, 2018 at 2:16 AM, Abhishek Kumar <abhishek.sec09(a)gmail.com> > wrote: > >> No other app is running other than notepad. >> >> *Abhisheks-MacBook-Air:~ abhi$ WINEARCH=win32 WINEPREFIX=~/.wine64 >> explorer.exe* >> >> *-bash: explorer.exe: command not found* >> >> >> Please help >> >> On Tue, Mar 6, 2018 at 2:04 AM, Abhishek Kumar <abhishek.sec09(a)gmail.com> >> wrote: >> >>> Now i am getting this error. >>> >>> >>> *Abhisheks-MacBook-Air:~ abhi$ WINEARCH=win64 WINEPREFIX=~/.wine64 >>> notepad* >>> >>> *wine notepad* >>> >>> *004f:err:process:__wine_kernel_init boot event wait timed out* >>> >>> *Wine cannot find the ncurses library (libncurses.5.4.dylib).* >>> >>> >>> On Tue, Mar 6, 2018 at 1:16 AM, Austin English <austinenglish(a)gmail.com> >>> wrote: >>> >>>> On Mon, Mar 5, 2018 at 1:43 PM, Abhishek Kumar < >>>> abhishek.sec09(a)gmail.com> wrote: >>>> > No i have already applied this. >>>> > >>>> > sudo make install >>>> > >>>> > On Tue, Mar 6, 2018 at 1:08 AM, Austin English < >>>> austinenglish(a)gmail.com> >>>> > wrote: >>>> >> >>>> >> On Mon, Mar 5, 2018 at 1:35 PM, Abhishek Kumar < >>>> abhishek.sec09(a)gmail.com> >>>> >> wrote: >>>> >> > It has build from the source (version - 3.3) >>>> >> > >>>> >> > On Tue, Mar 6, 2018 at 12:57 AM, Abhishek Kumar >>>> >> > <abhishek.sec09(a)gmail.com> >>>> >> > wrote: >>>> >> >> >>>> >> >> i am unable to run wine after installing on my mac os sierra.It >>>> showing >>>> >> >> following error. >>>> >> >> >>>> >> >> >>>> >> >> Abhisheks-MacBook-Air:~ abhi$ wine notepad >>>> >> >> >>>> >> >> -bash: wine: command not found >>>> >> >> >>>> >> >> >>>> >> >> >>>> >> >> Please provide the solution soon as possible. >>>> >> >>>> >> You may have forgotten to run (sudo) make install >>>> >> >>>> >> -- >>>> >> -Austin >>>> >> GPG: 267B CC1F 053F 0749 (expires 2021/02/18) >>>> >>>> Then /usr/local/bin may not be in your path (or whatever you used for >>>> --prefix). >>>> >>>> P.S. Please keep wine-devel in CC and bottom post. >>>> >>>> -- >>>> -Austin >>>> GPG: 267B CC1F 053F 0749 (expires 2021/02/18) >>>> >>> >>> >> >

3 2

[PATCH] ntdll: implement RtlCreateRegistryKey
by Stefan Leichter March 6, 2018

March 6, 2018

fixes https://bugs.winehq.org/show_bug.cgi?id=44641 Signed-off-by: Stefan Leichter <sle85276(a)gmx.de> --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/reg.c | 66 ++++++++++++++++++++++++++++++------- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 2 ++ 4 files changed, 59 insertions(+), 13 deletions(-)

2 1

[PATCH] wined3d: Recognize GTX 560M card with NVIDIA driver.
by Alistair Leslie-Hughes March 6, 2018

March 6, 2018

From: Christian Costa <titan.costa(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b73966a..8bda9c4 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1341,6 +1341,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX550, "NVIDIA GeForce GTX 550 Ti", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT555M, "NVIDIA GeForce GT 555M", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX560TI, "NVIDIA GeForce GTX 560 Ti", DRIVER_NVIDIA_GEFORCE8, 1024}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX560M, "NVIDIA GeForce GTX 560M", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX560, "NVIDIA GeForce GTX 560", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX570, "NVIDIA GeForce GTX 570", DRIVER_NVIDIA_GEFORCE8, 1280}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX580, "NVIDIA GeForce GTX 580", DRIVER_NVIDIA_GEFORCE8, 1536}, @@ -1945,6 +1946,7 @@ cards_nvidia_binary[] = {"GTX 580", CARD_NVIDIA_GEFORCE_GTX580}, /* Geforce 500 - highend */ {"GTX 570", CARD_NVIDIA_GEFORCE_GTX570}, /* Geforce 500 - midend high */ {"GTX 560 Ti", CARD_NVIDIA_GEFORCE_GTX560TI}, /* Geforce 500 - midend */ + {"GTX 560M", CARD_NVIDIA_GEFORCE_GTX560M}, /* Geforce 500 - midend mobile */ {"GTX 560", CARD_NVIDIA_GEFORCE_GTX560}, /* Geforce 500 - midend */ {"GT 555M", CARD_NVIDIA_GEFORCE_GT555M}, /* Geforce 500 - midend mobile */ {"GTX 550 Ti", CARD_NVIDIA_GEFORCE_GTX550}, /* Geforce 500 - midend */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1c4c3ef..38d5e88 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2341,6 +2341,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX550 = 0x1244, CARD_NVIDIA_GEFORCE_GT555M = 0x04b8, CARD_NVIDIA_GEFORCE_GTX560TI = 0x1200, + CARD_NVIDIA_GEFORCE_GTX560M = 0x1251, CARD_NVIDIA_GEFORCE_GTX560 = 0x1201, CARD_NVIDIA_GEFORCE_GTX570 = 0x1081, CARD_NVIDIA_GEFORCE_GTX580 = 0x1080, -- 1.9.1

2 1

[PATCH] kernel32: Fix handling lines with only values in GetPrivateProfileSection
by Zhiyi Zhang March 6, 2018

March 6, 2018

Fix 32104 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/kernel32/profile.c | 2 +- dlls/kernel32/tests/profile.c | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-)

1 0