wine-commits March 2018

wine-commits@winehq.org

2 participants
785 discussions

Alexandre Julliard : makefiles: Generate the crosstest disabled rule from makedep.
by Alexandre Julliard 05 Mar '18

05 Mar '18

Module: wine Branch: master Commit: 2fa7ae05f2378567f650e185079b657b89334858 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2fa7ae05f2378567f650e185… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Mar 4 15:33:02 2018 +0100 makefiles: Generate the crosstest disabled rule from makedep. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 3 --- configure.ac | 4 ---- tools/makedep.c | 14 +++++++------- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/configure b/configure index c9150d3..cba521b 100755 --- a/configure +++ b/configure @@ -18198,9 +18198,6 @@ Makefile: $srcdir/Makefile.in config.status \$(MAKEDEP) depend: \$(MAKEDEP) dummy \$(MAKEDEP)" -test -n "$CROSSTARGET" || wine_fn_append_rule "crosstest: - @echo \"crosstest is not supported (mingw not installed?)\" && false" - if test "x$enable_fonts" != xno; then ac_config_links="$ac_config_links fonts/marlett.ttf:fonts/marlett.ttf" ac_config_links="$ac_config_links fonts/symbol.ttf:fonts/symbol.ttf" diff --git a/configure.ac b/configure.ac index 2e99320..5d09075 100644 --- a/configure.ac +++ b/configure.ac @@ -2797,10 +2797,6 @@ Makefile: $srcdir/Makefile.in config.status \$(MAKEDEP) depend: \$(MAKEDEP) dummy \$(MAKEDEP)]) -test -n "$CROSSTARGET" || WINE_APPEND_RULE( -[crosstest: - @echo \"crosstest is not supported (mingw not installed?)\" && false]) - WINE_CONFIG_SYMLINK(fonts,fonts,[marlett.ttf,symbol.ttf,tahoma.ttf,tahomabd.ttf,wingding.ttf],enable_fonts) WINE_CONFIG_SYMLINK(loader,loader,[l_intl.nls]) WINE_CONFIG_SYMLINK(,tools,[wine],,winewrapper) diff --git a/tools/makedep.c b/tools/makedep.c index 457dcd0..7e14ed4 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3547,13 +3547,13 @@ static void output_subdirs( struct makefile *make ) strarray_add( &make->phony_targets, "check" ); strarray_add( &make->phony_targets, "test" ); } - if (crosstest_deps.count) - { - output( "crosstest:" ); - output_filenames( crosstest_deps ); - output( "\n" ); - strarray_add( &make->phony_targets, "crosstest" ); - } + output( "crosstest:" ); + output_filenames( crosstest_deps ); + output( "\n" ); + if (!crosstest_deps.count) + output( "\t@echo \"crosstest is not supported (mingw not installed?)\" && false\n" ); + strarray_add( &make->phony_targets, "crosstest" ); + output( "clean::\n"); output_rm_filenames( clean_files ); output( "testclean::\n");

1 0

Alexandre Julliard : makefiles: Fix typo in documentation rules generation.
by Alexandre Julliard 05 Mar '18

05 Mar '18

Module: wine Branch: master Commit: 84ddddfffb41029b2b5b0d10d6e57fddee834297 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84ddddfffb41029b2b5b0d10… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Mar 4 10:45:39 2018 +0100 makefiles: Fix typo in documentation rules generation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/makedep.c b/tools/makedep.c index caaa50f..457dcd0 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3484,7 +3484,7 @@ static void output_subdirs( struct makefile *make ) if (!submake->staticlib) { strarray_add( &builddeps_deps, subdir ); - if (!make->appmode.count) + if (!submake->appmode.count) { output( "manpages htmlpages sgmlpages xmlpages::\n" ); output( "\t@cd %s && $(MAKE) $@\n", subdir );

1 0

Alexandre Julliard : Wine release 3.3
by Alexandre Julliard 02 Mar '18

02 Mar '18

Module: website Branch: master Commit: 59196e1be6dcc42bc90b441049141d22c6f7ecc6 URL: https://source.winehq.org/git/website.git/?a=commit;h=59196e1be6dcc42bc90b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 2 19:17:33 2018 +0100 Wine release 3.3 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2018030201.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2018030201.xml b/news/en/2018030201.xml new file mode 100644 index 0000000..0e106e6 --- /dev/null +++ b/news/en/2018030201.xml @@ -0,0 +1,17 @@ +<news> +<date>March 2, 2018</date> +<title>Wine 3.3 Released</title> +<body> + The Wine development release 3.3 is now available. + <a href="{$root}/announce/3.3">What's new</a> in this release: +<ul> + <li>Beginnings of Vulkan support.</li> + <li>Direct3D multi-threaded command stream enabled by default.</li> + <li>Multisample textures enabled by default.</li> + <li>Support for game controllers through SDL.</li> + <li>Support for loading CIL-only .Net binaries.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/3.x/wine-3.3.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-3.3 : Alexandre Julliard : Release 3.3
by Alexandre Julliard 02 Mar '18

02 Mar '18

Module: wine Branch: refs/tags/wine-3.3 Tag: 729e6cece7d63c15b7149a7f6b32dd634b004ba8 URL: https://source.winehq.org/git/wine.git/?a=tag;h=729e6cece7d63c15b7149a7f6b3… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 2 19:12:41 2018 +0100 Release 3.3

1 0

Alexandre Julliard : Release 3.3.
by Alexandre Julliard 02 Mar '18

02 Mar '18

Module: wine Branch: master Commit: f17120d11b0e1272bb9742ad88eb526ac914d7da URL: https://source.winehq.org/git/wine.git/?a=commit;h=f17120d11b0e1272bb9742ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 2 19:12:41 2018 +0100 Release 3.3. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 949 +++++++++++++++++++++++++++++++++----------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 4 files changed, 517 insertions(+), 454 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f17120d11b0e1272bb97…

1 0

Andrey Gusev : gdiplus/tests: Fix copy-paste typos.
by Alexandre Julliard 02 Mar '18

02 Mar '18

Module: wine Branch: master Commit: 71e2c4b429429851bddfed247b1dfcbae15f1057 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71e2c4b429429851bddfed24… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Mar 2 12:03:49 2018 +0200 gdiplus/tests: Fix copy-paste typos. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 34222e7..4fd2744 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));

1 0

Alistair Leslie-Hughes : gdiplus/tests: Check the correct value.
by Alexandre Julliard 02 Mar '18

02 Mar '18

Module: wine Branch: master Commit: 51fe44ed423ad3148e1f7d936b5be64ce99de5f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=51fe44ed423ad3148e1f7d93… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Mar 1 23:04:49 2018 +0000 gdiplus/tests: Check the correct value. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 0

Michael Müller : dwmapi: Add stub for DwmSetIconicLivePreviewBitmap.
by Alexandre Julliard 02 Mar '18

02 Mar '18

Module: wine Branch: master Commit: 7deb0909a9ace8802d2729fc17d74849ea3f4ff3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7deb0909a9ace8802d2729fc… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Mar 2 03:23:02 2018 +0000 dwmapi: Add stub for DwmSetIconicLivePreviewBitmap. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwmapi/dwmapi.spec | 2 +- dlls/dwmapi/dwmapi_main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/dwmapi/dwmapi.spec b/dlls/dwmapi/dwmapi.spec index 697cefc..3744719 100644 --- a/dlls/dwmapi/dwmapi.spec +++ b/dlls/dwmapi/dwmapi.spec @@ -80,7 +80,7 @@ @ stdcall DwmRegisterThumbnail(long long ptr) # @ stub DwmRenderGesture @ stub DwmSetDxFrameDuration -@ stub DwmSetIconicLivePreviewBitmap +@ stdcall DwmSetIconicLivePreviewBitmap(long long ptr long) @ stdcall DwmSetIconicThumbnail(long long long) @ stdcall DwmSetPresentParameters(ptr ptr) @ stdcall DwmSetWindowAttribute(long long ptr long) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index 7ac0b2b..0e6ba3b 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -270,6 +270,15 @@ HRESULT WINAPI DwmSetPresentParameters(HWND hwnd, DWM_PRESENT_PARAMETERS *params }; /********************************************************************** + * DwmSetIconicLivePreviewBitmap (DWMAPI.@) + */ +HRESULT WINAPI DwmSetIconicLivePreviewBitmap(HWND hwnd, HBITMAP hbmp, POINT *pos, DWORD flags) +{ + FIXME("(%p %p %p %x) stub\n", hwnd, hbmp, pos, flags); + return S_OK; +}; + +/********************************************************************** * DwmSetIconicThumbnail (DWMAPI.@) */ HRESULT WINAPI DwmSetIconicThumbnail(HWND hwnd, HBITMAP hbmp, DWORD flags)

1 0

Roderick Colenbrander : winevulkan: Load instance functions.
by Alexandre Julliard 02 Mar '18

02 Mar '18

Module: wine Branch: master Commit: 4ab041c370f342f293841b7898c01ba77858aa5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ab041c370f342f293841b78… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Thu Mar 1 22:13:35 2018 -0800 winevulkan: Load instance functions. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 6c6cf2e..5657b70 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 85836bd..0f48d97 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 5688137..16aa0ce 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 969bf12..087fa17 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 adc3da3..c3fed9e 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 =

1 0

Nikolay Sivov : kernelbase: Implement PathCchAddBackslash()/ PathCchAddBackslashEx().
by Alexandre Julliard 02 Mar '18

02 Mar '18

Module: wine Branch: master Commit: 203c5a8f7aa890656929436fa8a203797b0af5a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=203c5a8f7aa890656929436f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 2 14:14:54 2018 +0300 kernelbase: Implement PathCchAddBackslash()/PathCchAddBackslashEx(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-path-l1-1-0.spec | 4 +- dlls/kernelbase/Makefile.in | 3 +- dlls/kernelbase/kernelbase.spec | 4 +- dlls/kernelbase/path.c | 67 ++++++++++ dlls/kernelbase/tests/path.c | 136 +++++++++++++++++++++ include/pathcch.h | 2 + tools/make_specfiles | 1 + 7 files changed, 212 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=203c5a8f7aa890656929…

1 0

← Newer
1
...
66
67
68
69
70
71
72
...
79
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2018