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

[PATCH] gdiplus/tests: Fix copy-paste typos.
by Andrey Gusev 02 Mar '18

02 Mar '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/gdiplus/tests/image.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 34222e7ce0..4fd2744132 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -5171,11 +5171,11 @@ static void test_GdipLoadImageFromStream(void) HRESULT hr; status = GdipLoadImageFromStream(NULL, NULL); - ok(status == InvalidParameter, "Unexected return value %d.\n", status); + ok(status == InvalidParameter, "Unexpected return value %d.\n", status); image = (void *)0xdeadbeef; status = GdipLoadImageFromStream(NULL, &image); - ok(status == InvalidParameter, "Unexected return value %d.\n", status); + ok(status == InvalidParameter, "Unexpected return value %d.\n", status); ok(image == (void *)0xdeadbeef, "Unexpected image pointer.\n"); hglob = GlobalAlloc(0, sizeof(pngimage)); -- 2.13.6

2 1

[PATCH] gdiplus/tests: Check the correct value
by Alistair Leslie-Hughes 02 Mar '18

02 Mar '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/gdiplus/tests/graphicspath.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 102c33c..c5403cb 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -1316,7 +1316,7 @@ static void test_empty_rect(void) status = GdipIsVisiblePathPoint(path, -2.0, 2.0, NULL, &result); expect(Ok, status); - expect(FALSE, status); + expect(FALSE, result); status = GdipAddPathRectangle(path, 0.0, 0.0, 5.0, -5.0); expect(Ok, status); -- 1.9.1

2 1

[PATCH v2 1/3] ntdll: Implement ProcessImageFileNameWin32 in NtQueryInformationProcess.
by Zebediah Figura 02 Mar '18

02 Mar '18

From: Michael Müller <michael(a)fds-team.de> This patch allows Process Hacker to show the filename, icon and description of an executable. Since ProcessImageFileName incorrectly returns a Win32 path, we can simply reuse the existing implementation. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: update comment dlls/ntdll/process.c | 4 ++-- include/winternl.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 835d7e6..b299287 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -515,8 +515,8 @@ NTSTATUS WINAPI NtQueryInformationProcess( } break; case ProcessImageFileName: - /* FIXME: this will return a DOS path. Windows returns an NT path. Changing this would require also changing kernel32.QueryFullProcessImageName. - * The latter may be harder because of the lack of RtlNtPathNameToDosPathName. */ + /* FIXME: Should return a device path */ + case ProcessImageFileNameWin32: SERVER_START_REQ(get_dll_info) { UNICODE_STRING *image_file_name_str = ProcessInformation; diff --git a/include/winternl.h b/include/winternl.h index c3cca80..f72a071 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -853,6 +853,7 @@ typedef enum _PROCESSINFOCLASS { ProcessDebugFlags = 31, ProcessHandleTracing = 32, ProcessExecuteFlags = 34, + ProcessImageFileNameWin32 = 43, MaxProcessInfoClass } PROCESSINFOCLASS, PROCESS_INFORMATION_CLASS; -- 2.7.4

3 4

[PATCH v3] msvcrt: Compile but show an error if Bessel functions aren't available
by Alex Henrie 02 Mar '18

02 Mar '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Fixes https://bugs.winehq.org/show_bug.cgi?id=37809 v3: Dropped incorrect fallbacks for j0 and j1 configure.ac | 8 +++++++- dlls/msvcrt/math.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 2e99320371..e198018427 100644 --- a/configure.ac +++ b/configure.ac @@ -2698,6 +2698,9 @@ AC_CHECK_FUNCS(\ exp2f \ expm1 \ expm1f \ + j0 \ + j1 \ + jn \ lgamma \ lgammaf \ llrint \ @@ -2722,7 +2725,10 @@ AC_CHECK_FUNCS(\ round \ roundf \ trunc \ - truncf + truncf \ + y0 \ + y1 \ + yn ) LIBS="$ac_save_LIBS" diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 9b480117fc..cc1979b96c 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1412,7 +1412,12 @@ INT CDECL MSVCRT__isnan(double num) double CDECL MSVCRT__j0(double num) { /* FIXME: errno handling */ +#ifdef HAVE_J0 return j0(num); +#else + FIXME( "not implemented\n" ); + return 0; +#endif } /********************************************************************* @@ -1421,7 +1426,12 @@ double CDECL MSVCRT__j0(double num) double CDECL MSVCRT__j1(double num) { /* FIXME: errno handling */ +#ifdef HAVE_J1 return j1(num); +#else + FIXME( "not implemented\n" ); + return 0; +#endif } /********************************************************************* @@ -1430,7 +1440,12 @@ double CDECL MSVCRT__j1(double num) double CDECL MSVCRT__jn(int n, double num) { /* FIXME: errno handling */ +#ifdef HAVE_JN return jn(n, num); +#else + FIXME( "not implemented\n" ); + return 0; +#endif } /********************************************************************* @@ -1440,12 +1455,17 @@ double CDECL MSVCRT__y0(double num) { double retval; if (!isfinite(num)) *MSVCRT__errno() = MSVCRT_EDOM; +#ifdef HAVE_Y0 retval = y0(num); if (MSVCRT__fpclass(retval) == MSVCRT__FPCLASS_NINF) { *MSVCRT__errno() = MSVCRT_EDOM; retval = sqrt(-1); } +#else + FIXME( "not implemented\n" ); + retval = 0; +#endif return retval; } @@ -1456,12 +1476,17 @@ double CDECL MSVCRT__y1(double num) { double retval; if (!isfinite(num)) *MSVCRT__errno() = MSVCRT_EDOM; +#ifdef HAVE_Y1 retval = y1(num); if (MSVCRT__fpclass(retval) == MSVCRT__FPCLASS_NINF) { *MSVCRT__errno() = MSVCRT_EDOM; retval = sqrt(-1); } +#else + FIXME( "not implemented\n" ); + retval = 0; +#endif return retval; } @@ -1472,12 +1497,17 @@ double CDECL MSVCRT__yn(int order, double num) { double retval; if (!isfinite(num)) *MSVCRT__errno() = MSVCRT_EDOM; +#ifdef HAVE_YN retval = yn(order,num); if (MSVCRT__fpclass(retval) == MSVCRT__FPCLASS_NINF) { *MSVCRT__errno() = MSVCRT_EDOM; retval = sqrt(-1); } +#else + FIXME( "not implemented\n" ); + retval = 0; +#endif return retval; } -- 2.16.2

2 1

[PATCH] msvcrt: Add fallback implementations for Bessel functions
by Alex Henrie 02 Mar '18

02 Mar '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Fixes https://bugs.winehq.org/show_bug.cgi?id=37809 The formulas for j0 and j1 are from Wolfram Alpha. The formulas for jn, y0, y1, and yn are from "Fast and Accurate Bessel Function Computation" by John Harrison <http://www.cl.cam.ac.uk/~jrh13/papers/bessel.pdf>. Recognizing that jn is always between -1 and 1 but this simple formula only roughly approximates that, my implementation clamps the value of jn to [-1, 1]. configure.ac | 8 +++++++- dlls/msvcrt/math.c | 32 +++++++++++++++++++++++++++++++- include/wine/port.h | 4 ++++ 3 files changed, 42 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 2e99320371..e198018427 100644 --- a/configure.ac +++ b/configure.ac @@ -2698,6 +2698,9 @@ AC_CHECK_FUNCS(\ exp2f \ expm1 \ expm1f \ + j0 \ + j1 \ + jn \ lgamma \ lgammaf \ llrint \ @@ -2722,7 +2725,10 @@ AC_CHECK_FUNCS(\ round \ roundf \ trunc \ - truncf + truncf \ + y0 \ + y1 \ + yn ) LIBS="$ac_save_LIBS" diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 9b480117fc..d1c38b9649 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1412,7 +1412,11 @@ INT CDECL MSVCRT__isnan(double num) double CDECL MSVCRT__j0(double num) { /* FIXME: errno handling */ +#ifdef HAVE_J0 return j0(num); +#else + return sin(num) / num; +#endif } /********************************************************************* @@ -1421,7 +1425,11 @@ double CDECL MSVCRT__j0(double num) double CDECL MSVCRT__j1(double num) { /* FIXME: errno handling */ +#ifdef HAVE_J1 return j1(num); +#else + return sin(num) / (num * num) - cos(num) / num; +#endif } /********************************************************************* @@ -1429,8 +1437,18 @@ double CDECL MSVCRT__j1(double num) */ double CDECL MSVCRT__jn(int n, double num) { + double retval; /* FIXME: errno handling */ - return jn(n, num); +#ifdef HAVE_JN + retval = jn(n, num); +#else + if (n == 0) return MSVCRT__j0(num); + if (n == 1) return MSVCRT__j1(num); + retval = sqrt(2 / (M_PI * num)) * cos(num - (n / 2.0 + 0.25) * M_PI); + if (retval < -1) return -1; + if (retval > 1) return 1; +#endif + return retval; } /********************************************************************* @@ -1440,7 +1458,11 @@ double CDECL MSVCRT__y0(double num) { double retval; if (!isfinite(num)) *MSVCRT__errno() = MSVCRT_EDOM; +#ifdef HAVE_Y0 retval = y0(num); +#else + retval = sqrt(2 / (M_PI * num)) * sin(num - M_PI_4); +#endif if (MSVCRT__fpclass(retval) == MSVCRT__FPCLASS_NINF) { *MSVCRT__errno() = MSVCRT_EDOM; @@ -1456,7 +1478,11 @@ double CDECL MSVCRT__y1(double num) { double retval; if (!isfinite(num)) *MSVCRT__errno() = MSVCRT_EDOM; +#ifdef HAVE_Y1 retval = y1(num); +#else + retval = sqrt(2 / (M_PI * num)) * sin(num - 0.75 * M_PI); +#endif if (MSVCRT__fpclass(retval) == MSVCRT__FPCLASS_NINF) { *MSVCRT__errno() = MSVCRT_EDOM; @@ -1472,7 +1498,11 @@ double CDECL MSVCRT__yn(int order, double num) { double retval; if (!isfinite(num)) *MSVCRT__errno() = MSVCRT_EDOM; +#ifdef HAVE_YN retval = yn(order,num); +#else + retval = sqrt(2 / (M_PI * num)) * sin(num - (order / 2.0 + 0.25) * M_PI); +#endif if (MSVCRT__fpclass(retval) == MSVCRT__FPCLASS_NINF) { *MSVCRT__errno() = MSVCRT_EDOM; diff --git a/include/wine/port.h b/include/wine/port.h index fb7251edd6..07366ea498 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -202,6 +202,10 @@ struct statvfs #define M_PI_2 1.570796326794896619 #endif +#ifndef M_PI_4 +#define M_PI_4 0.785398163397448310 +#endif + #ifndef INFINITY static inline float __port_infinity(void) { -- 2.16.2

2 4

Re: Introdction
by Rajitha Opanayaka 02 Mar '18

02 Mar '18

As it seems there are bugs in other calculator apps. are their specifications on the implement calculator app On 28 February 2018 at 23:26, Rajitha Opanayaka < rajithaopanayaka.ro(a)gmail.com> wrote: > Hi, > > > I'm a Computer Engineering student from University of Peradeniya, Sri > Lanka and interested in the GSoC project idea on 'Implement calculator app' > which is available at Wine GSoC ideas. I'm quite familiar with C. > > > > Thanks. > Rajitha > >

1 0

[PATCH v2] msvcrt: Add fallback implementations for Bessel functions
by Alex Henrie 02 Mar '18

02 Mar '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Fixes https://bugs.winehq.org/show_bug.cgi?id=37809 v2: - Dropped inaccurate fallbacks for jn, y0, y1, and yn - Avoided division by 0 in fallbacks for j0 and j1 configure.ac | 8 +++++++- dlls/msvcrt/math.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 2e99320371..e198018427 100644 --- a/configure.ac +++ b/configure.ac @@ -2698,6 +2698,9 @@ AC_CHECK_FUNCS(\ exp2f \ expm1 \ expm1f \ + j0 \ + j1 \ + jn \ lgamma \ lgammaf \ llrint \ @@ -2722,7 +2725,10 @@ AC_CHECK_FUNCS(\ round \ roundf \ trunc \ - truncf + truncf \ + y0 \ + y1 \ + yn ) LIBS="$ac_save_LIBS" diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 9b480117fc..4fd1fc28ed 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1412,7 +1412,12 @@ INT CDECL MSVCRT__isnan(double num) double CDECL MSVCRT__j0(double num) { /* FIXME: errno handling */ +#ifdef HAVE_J0 return j0(num); +#else + if (num == 0) return 1; + return sin(num) / num; +#endif } /********************************************************************* @@ -1421,7 +1426,12 @@ double CDECL MSVCRT__j0(double num) double CDECL MSVCRT__j1(double num) { /* FIXME: errno handling */ +#ifdef HAVE_J1 return j1(num); +#else + if (num == 0) return 0; + return sin(num) / (num * num) - cos(num) / num; +#endif } /********************************************************************* @@ -1430,7 +1440,14 @@ double CDECL MSVCRT__j1(double num) double CDECL MSVCRT__jn(int n, double num) { /* FIXME: errno handling */ +#ifdef HAVE_JN return jn(n, num); +#else + if (n == 0) return MSVCRT__j0(num); + if (n == 1) return MSVCRT__j1(num); + FIXME( "not implemented\n" ); + return 0; +#endif } /********************************************************************* @@ -1440,12 +1457,17 @@ double CDECL MSVCRT__y0(double num) { double retval; if (!isfinite(num)) *MSVCRT__errno() = MSVCRT_EDOM; +#ifdef HAVE_Y0 retval = y0(num); if (MSVCRT__fpclass(retval) == MSVCRT__FPCLASS_NINF) { *MSVCRT__errno() = MSVCRT_EDOM; retval = sqrt(-1); } +#else + FIXME( "not implemented\n" ); + retval = 0; +#endif return retval; } @@ -1456,12 +1478,17 @@ double CDECL MSVCRT__y1(double num) { double retval; if (!isfinite(num)) *MSVCRT__errno() = MSVCRT_EDOM; +#ifdef HAVE_Y1 retval = y1(num); if (MSVCRT__fpclass(retval) == MSVCRT__FPCLASS_NINF) { *MSVCRT__errno() = MSVCRT_EDOM; retval = sqrt(-1); } +#else + FIXME( "not implemented\n" ); + retval = 0; +#endif return retval; } @@ -1472,12 +1499,17 @@ double CDECL MSVCRT__yn(int order, double num) { double retval; if (!isfinite(num)) *MSVCRT__errno() = MSVCRT_EDOM; +#ifdef HAVE_YN retval = yn(order,num); if (MSVCRT__fpclass(retval) == MSVCRT__FPCLASS_NINF) { *MSVCRT__errno() = MSVCRT_EDOM; retval = sqrt(-1); } +#else + FIXME( "not implemented\n" ); + retval = 0; +#endif return retval; } -- 2.16.2

1 0

[PATCH 1/3] winevulkan: Load instance functions.
by Roderick Colenbrander 02 Mar '18

02 Mar '18

Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> --- dlls/winevulkan/make_vulkan | 32 ++++++++++++++++++++++++++++---- dlls/winevulkan/vulkan.c | 9 +++++++++ dlls/winevulkan/vulkan_private.h | 1 + dlls/winevulkan/vulkan_thunks.h | 29 +++++++++++++++++++++++++++++ dlls/winex11.drv/vulkan.c | 6 ++++-- 5 files changed, 71 insertions(+), 6 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 6c6cf2ea3c..5657b70c4c 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1035,17 +1035,41 @@ class VkGenerator(object): # Generate prototypes for device and instance functions requiring a custom implementation. f.write("/* Functions for which we have custom implementations outside of the thunks. */\n") for vk_func in self.registry.funcs.values(): + if not vk_func.is_required() or vk_func.is_global_func() or vk_func.needs_thunk(): + continue + + f.write("{0};\n".format(vk_func.prototype("WINAPI", prefix="wine_", postfix="DECLSPEC_HIDDEN"))) + f.write("\n") + + f.write("/* For use by vkInstance and children */\n") + f.write("struct vulkan_instance_funcs\n{\n") + for vk_func in self.registry.instance_funcs: if not vk_func.is_required(): continue - if vk_func.is_global_func(): + if not vk_func.needs_dispatch() or vk_func.is_driver_func(): + LOGGER.debug("skipping {0} in vulkan_instance_funcs".format(vk_func.name)) continue - if vk_func.needs_thunk(): + f.write(" {0};\n".format(vk_func.pfn(conv=False))) + f.write("};\n\n") + + f.write("#define ALL_VK_INSTANCE_FUNCS() \\\n") + first = True + for vk_func in self.registry.instance_funcs: + if not vk_func.is_required(): continue - f.write("{0};\n".format(vk_func.prototype("WINAPI", prefix="wine_", postfix="DECLSPEC_HIDDEN"))) - f.write("\n") + if not vk_func.needs_dispatch() or vk_func.is_driver_func(): + LOGGER.debug("skipping {0} in ALL_VK_INSTANCE_FUNCS".format(vk_func.name)) + continue + + if first: + f.write(" USE_VK_FUNC({0})".format(vk_func.name)) + first = False + else: + f.write("\\\n USE_VK_FUNC({0})".format(vk_func.name)) + f.write("\n\n") f.write("#endif /* __WINE_VULKAN_THUNKS_H */\n") diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 85836bdd42..0f48d971e2 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -99,6 +99,15 @@ static VkResult WINAPI wine_vkCreateInstance(const VkInstanceCreateInfo *create_ goto err; } + /* Load all instance functions we are aware of. Note the loader takes care + * of any filtering for extensions which were not requested, but which the + * ICD may support. + */ +#define USE_VK_FUNC(name) \ + object->funcs.p_##name = (void*)vk_funcs->p_vkGetInstanceProcAddr(object->instance, #name); + ALL_VK_INSTANCE_FUNCS() +#undef USE_VK_FUNC + *instance = object; TRACE("Done, instance=%p native_instance=%p\n", object, object->instance); return VK_SUCCESS; diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index 5688137833..16aa0ce55c 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -51,6 +51,7 @@ struct wine_vk_base struct VkInstance_T { struct wine_vk_base base; + struct vulkan_instance_funcs funcs; VkInstance instance; /* native instance */ }; diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index 969bf125f9..087fa17d0e 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -9,4 +9,33 @@ 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; +/* For use by vkInstance and children */ +struct vulkan_instance_funcs +{ + VkResult (*p_vkCreateDevice)(VkPhysicalDevice, const VkDeviceCreateInfo *, const VkAllocationCallbacks *, VkDevice *); + VkResult (*p_vkEnumerateDeviceExtensionProperties)(VkPhysicalDevice, const char *, uint32_t *, VkExtensionProperties *); + VkResult (*p_vkEnumerateDeviceLayerProperties)(VkPhysicalDevice, uint32_t *, VkLayerProperties *); + VkResult (*p_vkEnumeratePhysicalDevices)(VkInstance, uint32_t *, VkPhysicalDevice *); + void (*p_vkGetPhysicalDeviceFeatures)(VkPhysicalDevice, VkPhysicalDeviceFeatures *); + void (*p_vkGetPhysicalDeviceFormatProperties)(VkPhysicalDevice, VkFormat, VkFormatProperties *); + VkResult (*p_vkGetPhysicalDeviceImageFormatProperties)(VkPhysicalDevice, VkFormat, VkImageType, VkImageTiling, VkImageUsageFlags, VkImageCreateFlags, VkImageFormatProperties *); + void (*p_vkGetPhysicalDeviceMemoryProperties)(VkPhysicalDevice, VkPhysicalDeviceMemoryProperties *); + void (*p_vkGetPhysicalDeviceProperties)(VkPhysicalDevice, VkPhysicalDeviceProperties *); + void (*p_vkGetPhysicalDeviceQueueFamilyProperties)(VkPhysicalDevice, uint32_t *, VkQueueFamilyProperties *); + void (*p_vkGetPhysicalDeviceSparseImageFormatProperties)(VkPhysicalDevice, VkFormat, VkImageType, VkSampleCountFlagBits, VkImageUsageFlags, VkImageTiling, uint32_t *, VkSparseImageFormatProperties *); +}; + +#define ALL_VK_INSTANCE_FUNCS() \ + USE_VK_FUNC(vkCreateDevice)\ + USE_VK_FUNC(vkEnumerateDeviceExtensionProperties)\ + USE_VK_FUNC(vkEnumerateDeviceLayerProperties)\ + USE_VK_FUNC(vkEnumeratePhysicalDevices)\ + USE_VK_FUNC(vkGetPhysicalDeviceFeatures)\ + USE_VK_FUNC(vkGetPhysicalDeviceFormatProperties)\ + USE_VK_FUNC(vkGetPhysicalDeviceImageFormatProperties)\ + USE_VK_FUNC(vkGetPhysicalDeviceMemoryProperties)\ + USE_VK_FUNC(vkGetPhysicalDeviceProperties)\ + USE_VK_FUNC(vkGetPhysicalDeviceQueueFamilyProperties)\ + USE_VK_FUNC(vkGetPhysicalDeviceSparseImageFormatProperties) + #endif /* __WINE_VULKAN_THUNKS_H */ diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index adc3da35e4..c3fed9e58a 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -36,6 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(vulkan); static VkResult (*pvkCreateInstance)(const VkInstanceCreateInfo *, const VkAllocationCallbacks *, VkInstance *); static void (*pvkDestroyInstance)(VkInstance, const VkAllocationCallbacks *); +static void * (*pvkGetInstanceProcAddr)(VkInstance, const char *); static BOOL wine_vk_init(void) { @@ -50,6 +51,7 @@ static BOOL wine_vk_init(void) #define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(vulkan_handle, #f, NULL, 0)) == NULL) return FALSE; LOAD_FUNCPTR(vkCreateInstance) LOAD_FUNCPTR(vkDestroyInstance) +LOAD_FUNCPTR(vkGetInstanceProcAddr) #undef LOAD_FUNCPTR return TRUE; @@ -116,8 +118,8 @@ static VkResult X11DRV_vkEnumerateInstanceExtensionProperties(const char *layer_ static void * X11DRV_vkGetInstanceProcAddr(VkInstance instance, const char *name) { - FIXME("stub: %p, %s\n", instance, debugstr_a(name)); - return NULL; + TRACE("%p, %s\n", instance, debugstr_a(name)); + return pvkGetInstanceProcAddr(instance, name); } static const struct vulkan_funcs vulkan_funcs = -- 2.14.3

2 5

[PATCH 5/5] usp10: Use heap_calloc() in ScriptTextOut().
by Henri Verbeet 02 Mar '18

02 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/usp10/usp10.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 4daba34..35533a5 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3609,14 +3609,13 @@ HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UIN if (!psa->fNoGlyphIndex) /* Have Glyphs? */ fuOptions |= ETO_GLYPH_INDEX; /* Say don't do translation to glyph */ - lpDx = heap_alloc(cGlyphs * sizeof(INT) * 2); - if (!lpDx) return E_OUTOFMEMORY; + if (!(lpDx = heap_calloc(cGlyphs, 2 * sizeof(*lpDx)))) + return E_OUTOFMEMORY; fuOptions |= ETO_PDY; if (psa->fRTL && psa->fLogicalOrder) { - reordered_glyphs = heap_alloc( cGlyphs * sizeof(WORD) ); - if (!reordered_glyphs) + if (!(reordered_glyphs = heap_calloc(cGlyphs, sizeof(*reordered_glyphs)))) { heap_free( lpDx ); return E_OUTOFMEMORY; -- 2.1.4

2 1

[v2 PATCH] d3dx9: Improve argument validation in CloneEffect()
by Nikolay Sivov 02 Mar '18

02 Mar '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: using separate device now, added GetDevice() test. dlls/d3dx9_36/effect.c | 9 +++ dlls/d3dx9_36/tests/effect.c | 189 ++++++++++++++++++++++++++++--------------- 2 files changed, 135 insertions(+), 63 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index f8c480303c..a98495e555 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -4367,6 +4367,15 @@ static HRESULT WINAPI ID3DXEffectImpl_CloneEffect(ID3DXEffect *iface, FIXME("(%p)->(%p, %p): stub\n", This, device, effect); + if (!effect) + return D3DERR_INVALIDCALL; + + if (This->base_effect.flags & D3DXFX_NOT_CLONEABLE) + return E_FAIL; + + if (!device) + return D3DERR_INVALIDCALL; + return E_NOTIMPL; } diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 1900f3eac1..5efc117a13 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -149,6 +149,44 @@ static void set_number(void *outdata, D3DXPARAMETER_TYPE outtype, const void *in } } +static IDirect3DDevice9 *create_device(IDirect3D9 *d3d, HWND *window) +{ + D3DPRESENT_PARAMETERS present_parameters = { 0 }; + IDirect3DDevice9 *device; + HRESULT hr; + + if (!(*window = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) + { + skip("Couldn't create application window\n"); + return NULL; + } + + if (d3d) + IDirect3D9_AddRef(d3d); + + if (!d3d && !(d3d = Direct3DCreate9(D3D_SDK_VERSION))) + { + skip("Couldn't create IDirect3D9 object\n"); + DestroyWindow(*window); + return NULL; + } + + present_parameters.Windowed = TRUE; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, *window, D3DCREATE_HARDWARE_VERTEXPROCESSING, + &present_parameters, &device); + IDirect3D9_Release(d3d); + if (FAILED(hr)) + { + skip("Failed to create IDirect3DDevice9 object %#x\n", hr); + DestroyWindow(*window); + return NULL; + } + + return device; +} + static const char effect_desc[] = "Technique\n" "{\n" @@ -7063,40 +7101,18 @@ static const DWORD test_effect_unsupported_shader_blob[] = static void test_effect_unsupported_shader(void) { - D3DPRESENT_PARAMETERS present_parameters = {0}; IDirect3DVertexShader9 *vshader; unsigned int passes_count; IDirect3DDevice9 *device; UINT byte_code_size; ID3DXEffect *effect; - IDirect3D9 *d3d; void *byte_code; ULONG refcount; HWND window; HRESULT hr; - if (!(window = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, - 640, 480, NULL, NULL, NULL, NULL))) - { - skip("Couldn't create application window\n"); - return; - } - if (!(d3d = Direct3DCreate9(D3D_SDK_VERSION))) - { - skip("Couldn't create IDirect3D9 object\n"); - DestroyWindow(window); - return; - } - present_parameters.Windowed = TRUE; - present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, - D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device); - if (FAILED(hr)) { - skip("Failed to create IDirect3DDevice9 object, hr %#x\n", hr); - IDirect3D9_Release(d3d); - DestroyWindow(window); + if (!(device = create_device(NULL, &window))) return; - } hr = D3DXCreateEffectEx(device, test_effect_unsupported_shader_blob, sizeof(test_effect_unsupported_shader_blob), NULL, NULL, NULL, 0, NULL, &effect, NULL); @@ -7168,7 +7184,6 @@ static void test_effect_unsupported_shader(void) refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); - IDirect3D9_Release(d3d); DestroyWindow(window); } @@ -7217,11 +7232,9 @@ static const DWORD test_effect_null_shader_blob[] = static void test_effect_null_shader(void) { - D3DPRESENT_PARAMETERS present_parameters = {0}; IDirect3DDevice9 *device; ID3DXEffect *effect; D3DXPASS_DESC desc; - IDirect3D9 *d3d; D3DXHANDLE pass; ULONG refcount; HWND window; @@ -7230,29 +7243,8 @@ static void test_effect_null_shader(void) /* Creating a fresh device because the existing device can have invalid * render states from previous tests. If IDirect3DDevice9_ValidateDevice() * returns certain error codes, native ValidateTechnique() fails. */ - if (!(window = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, - 640, 480, NULL, NULL, NULL, NULL))) - { - skip("Failed to create window.\n"); - return; - } - if (!(d3d = Direct3DCreate9(D3D_SDK_VERSION))) - { - skip("Failed to create IDirect3D9 object.\n"); - DestroyWindow(window); - return; - } - present_parameters.Windowed = TRUE; - present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, - D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device); - if (FAILED(hr)) - { - skip("Failed to create IDirect3DDevice9 object, hr %#x.\n", hr); - IDirect3D9_Release(d3d); - DestroyWindow(window); + if (!(device = create_device(NULL, &window))) return; - } hr = D3DXCreateEffectEx(device, test_effect_null_shader_blob, sizeof(test_effect_null_shader_blob), NULL, NULL, NULL, 0, NULL, &effect, NULL); @@ -7290,8 +7282,91 @@ static void test_effect_null_shader(void) refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(window); +} + +static void test_effect_clone(void) +{ + IDirect3DDevice9 *device, *device2, *device3; + ID3DXEffect *effect, *cloned; + HWND window, window2; + IDirect3D9 *d3d; + HRESULT hr; + + if (!(device = create_device(NULL, &window))) + return; + + /* D3DXFX_NOT_CLONEABLE */ + hr = D3DXCreateEffect(device, test_effect_preshader_effect_blob, sizeof(test_effect_preshader_effect_blob), + NULL, NULL, D3DXFX_NOT_CLONEABLE, NULL, &effect, NULL); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + hr = effect->lpVtbl->CloneEffect(effect, NULL, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got result %#x.\n", hr); + + cloned = (void *)0xdeadbeef; + hr = effect->lpVtbl->CloneEffect(effect, NULL, &cloned); + ok(hr == E_FAIL, "Got result %#x.\n", hr); + ok(cloned == (void *)0xdeadbeef, "Unexpected effect pointer.\n"); + + hr = effect->lpVtbl->CloneEffect(effect, device, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got result %#x.\n", hr); + + cloned = (void *)0xdeadbeef; + hr = effect->lpVtbl->CloneEffect(effect, device, &cloned); + ok(hr == E_FAIL, "Got result %#x.\n", hr); + ok(cloned == (void *)0xdeadbeef, "Unexpected effect pointer.\n"); + + effect->lpVtbl->Release(effect); + + hr = D3DXCreateEffect(device, test_effect_preshader_effect_blob, sizeof(test_effect_preshader_effect_blob), + NULL, NULL, 0, NULL, &effect, NULL); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + hr = effect->lpVtbl->CloneEffect(effect, NULL, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got result %#x.\n", hr); + + cloned = (void *)0xdeadbeef; + hr = effect->lpVtbl->CloneEffect(effect, NULL, &cloned); + ok(hr == D3DERR_INVALIDCALL, "Got result %#x.\n", hr); + ok(cloned == (void *)0xdeadbeef, "Unexpected effect pointer.\n"); + + hr = effect->lpVtbl->CloneEffect(effect, device, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got result %#x.\n", hr); + + hr = effect->lpVtbl->CloneEffect(effect, device, &cloned); +todo_wine + ok(hr == D3D_OK, "Got result %#x.\n", hr); +if (hr == D3D_OK) +{ + ok(cloned != effect, "Expected new effect instance.\n"); + cloned->lpVtbl->Release(cloned); +} + /* Try with different device. */ + hr = IDirect3DDevice9_GetDirect3D(device, &d3d); + ok(hr == D3D_OK, "Failed to get IDirect3D9 pointer.\n"); + + device2 = create_device(d3d, &window2); + hr = effect->lpVtbl->CloneEffect(effect, device2, &cloned); +todo_wine + ok(hr == D3D_OK, "Got result %#x.\n", hr); +if (hr == D3D_OK) +{ + ok(cloned != effect, "Expected new effect instance.\n"); + + hr = cloned->lpVtbl->GetDevice(cloned, &device3); + ok(hr == S_OK, "Failed to get effect device.\n"); + ok(device3 == device2, "Unexpected device instance.\n"); + IDirect3DDevice9_Release(device3); + + cloned->lpVtbl->Release(cloned); +} + IDirect3DDevice9_Release(device2); IDirect3D9_Release(d3d); + DestroyWindow(window2); DestroyWindow(window); + + effect->lpVtbl->Release(effect); } START_TEST(effect) @@ -7299,16 +7374,8 @@ START_TEST(effect) HWND wnd; IDirect3D9 *d3d; IDirect3DDevice9 *device; - D3DPRESENT_PARAMETERS d3dpp; - HRESULT hr; ULONG refcount; - if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, - 640, 480, NULL, NULL, NULL, NULL))) - { - skip("Couldn't create application window\n"); - return; - } if (!(d3d = Direct3DCreate9(D3D_SDK_VERSION))) { skip("Couldn't create IDirect3D9 object\n"); @@ -7316,14 +7383,9 @@ START_TEST(effect) return; } - ZeroMemory(&d3dpp, sizeof(d3dpp)); - d3dpp.Windowed = TRUE; - d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); - if (FAILED(hr)) { - skip("Failed to create IDirect3DDevice9 object %#x\n", hr); + if (!(device = create_device(d3d, &wnd))) + { IDirect3D9_Release(d3d); - DestroyWindow(wnd); return; } @@ -7355,4 +7417,5 @@ START_TEST(effect) test_effect_unsupported_shader(); test_effect_null_shader(); + test_effect_clone(); } -- 2.16.1

2 1