wine-devel August 2018

wine-devel@winehq.org

62 participants
701 discussions

[PATCH 05/10] dinput: Return DIDEVTYPEKEYBOARD_JAPAN106 subtype when it is used.
by Akihiro Sagawa 17 Aug '18

17 Aug '18

For the further improvments, subtype is a member of SysKeyboardImpl structure. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/dinput/keyboard.c | 43 +++++++++++++++++++++++++++++++------------ dlls/dinput/tests/keyboard.c | 2 +- 2 files changed, 32 insertions(+), 13 deletions(-)

1 0

[PATCH 04/10] dinput/tests: Add more tests for keyboard subtypes.
by Akihiro Sagawa 17 Aug '18

17 Aug '18

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/dinput/tests/keyboard.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)

1 0

[PATCH 02/10] user32: Support Japanese keyboard type in GetKeyboardType.
by Akihiro Sagawa 17 Aug '18

17 Aug '18

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/input.c | 42 ++++++++++++++++++++++++++++++++---------- 1 file changed, 32 insertions(+), 10 deletions(-)

1 0

[PATCH 01/10] winex11: Fix Japanese 106 keyboard scan/vkey code tables.
by Akihiro Sagawa 17 Aug '18

17 Aug '18

Otherwise, some symbol keys (e.g. backslash) map differently. As a result, jp106's scan code and vkey tables equal to macjp. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winex11.drv/keyboard.c | 37 ++++++------------------------------- 1 file changed, 6 insertions(+), 31 deletions(-)

1 0

[PATCH vkd3d 5/9] build: Add support for MoltenVK.
by Józef Kucia 17 Aug '18

17 Aug '18

From: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- configure.ac | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 90557ee42e68..ada7e9a7f0f8 100644 --- a/configure.ac +++ b/configure.ac @@ -79,7 +79,10 @@ AC_CHECK_LIB([pthread], [pthread_create], AC_SUBST([VULKAN_LIBS]) VKD3D_CHECK_SONAME([vulkan], [vkGetInstanceProcAddr], [VULKAN_LIBS="-lvulkan"], - [AC_MSG_ERROR([libvulkan not found.])]) + [VKD3D_CHECK_SONAME([MoltenVK], [vkGetInstanceProcAddr], + [VULKAN_LIBS="-lMoltenVK" + AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN],["$ac_cv_lib_soname_MoltenVK"])], + [AC_MSG_ERROR([libvulkan and libMoltenVK not found.])])]) AS_IF([test "x$with_spirv_tools" = "xyes"], [PKG_CHECK_MODULES([SPIRV_TOOLS], [SPIRV-Tools-shared], -- 2.16.4

2 1

[PATCH vkd3d 3/9] build: Make libxcb optional.
by Józef Kucia 17 Aug '18

17 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- configure.ac | 19 ++++++++++++++----- libs/vkd3d-utils/vkd3d_utils_main.c | 2 ++ libs/vkd3d-utils/vkd3d_utils_private.h | 14 ++++++++------ 3 files changed, 24 insertions(+), 11 deletions(-) diff --git a/configure.ac b/configure.ac index 8e201f43b744..90557ee42e68 100644 --- a/configure.ac +++ b/configure.ac @@ -8,6 +8,7 @@ AC_CONFIG_HEADERS(include/config.h) AC_ARG_VAR([WIDL], [widl IDL compiler]) AC_ARG_VAR([CROSSCC32], [32-bit Windows cross compiler]) AC_ARG_VAR([CROSSCC64], [64-bit Windows cross compiler]) +AC_ARG_WITH([xcb], AS_HELP_STRING([--with-xcb], [Build with XCB library (default: test)])) AC_ARG_WITH([spirv-tools], AS_HELP_STRING([--with-spirv-tools], [Build with SPIRV-Tools library (default: disabled)])) AC_ARG_ENABLE([demos], AS_HELP_STRING([--enable-demos], [Build demo programs (default: disabled)])) @@ -80,13 +81,17 @@ VKD3D_CHECK_SONAME([vulkan], [vkGetInstanceProcAddr], [VULKAN_LIBS="-lvulkan"], [AC_MSG_ERROR([libvulkan not found.])]) -HAVE_SPIRV_TOOLS=no AS_IF([test "x$with_spirv_tools" = "xyes"], [PKG_CHECK_MODULES([SPIRV_TOOLS], [SPIRV-Tools-shared], - [AC_DEFINE([HAVE_SPIRV_TOOLS], [1], [Define to 1 if you have SPIRV-Tools.]) - HAVE_SPIRV_TOOLS=yes])]) + [AC_DEFINE([HAVE_SPIRV_TOOLS], [1], [Define to 1 if you have SPIRV-Tools.])])], + [with_spirv_tools=no]) -PKG_CHECK_MODULES([XCB], [xcb xcb-keysyms]) +HAVE_XCB=no +AS_IF([test "x$with_xcb" != "xno"], + [PKG_CHECK_MODULES([XCB], [xcb xcb-keysyms], + [AC_DEFINE([HAVE_XCB], [1], [Define to 1 if you have libxcb.]) + HAVE_XCB=yes], + [HAVE_XCB=no])]) dnl Check for functions VKD3D_CHECK_FUNC([HAVE_BUILTIN_CLZ], [__builtin_clz], [__builtin_clz(0)]) @@ -96,7 +101,10 @@ VKD3D_CHECK_FUNC([HAVE_SYNC_SUB_AND_FETCH], [__sync_sub_and_fetch], [__sync_sub_ VKD3D_CHECK_PTHREAD_SETNAME_NP +dnl Makefiles AS_IF([test "x$enable_demos" != "xyes"], [enable_demos=no]) +AS_IF([test "x$enable_demos" = "xyes" -a "x$HAVE_XCB" != "xyes"], + [AC_MSG_ERROR([libxcb is required for demos.])]) AM_CONDITIONAL([BUILD_DEMOS], [test "x$enable_demos" = "xyes"]) AM_CONDITIONAL([HAVE_WIDL], [test "x$WIDL" != "xno"]) AM_CONDITIONAL([HAVE_CROSSTARGET32], [test "x$CROSSTARGET32" != "xno"]) @@ -112,7 +120,8 @@ AS_IF([test "x$CROSSTARGET32" != "xno" -o "x$CROSSTARGET64" != "xno"], AS_ECHO([" Configuration summary for $PACKAGE $VERSION - Have SPIRV-Tools: ${HAVE_SPIRV_TOOLS} + Have XCB: ${HAVE_XCB} + Have SPIRV-Tools: ${with_spirv_tools} Building demos: ${enable_demos} diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index 2c4d89a7e38e..8c2503784e37 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -34,7 +34,9 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, static const char * const instance_extensions[] = { VK_KHR_SURFACE_EXTENSION_NAME, +#ifdef HAVE_XCB VK_KHR_XCB_SURFACE_EXTENSION_NAME, +#endif }; static const char * const device_extensions[] = { diff --git a/libs/vkd3d-utils/vkd3d_utils_private.h b/libs/vkd3d-utils/vkd3d_utils_private.h index 6aa0df6eeef5..b4828cc3ed5c 100644 --- a/libs/vkd3d-utils/vkd3d_utils_private.h +++ b/libs/vkd3d-utils/vkd3d_utils_private.h @@ -19,17 +19,19 @@ #ifndef __VKD3D_UTILS_PRIVATE_H #define __VKD3D_UTILS_PRIVATE_H -#define VK_NO_PROTOTYPES -#define VK_USE_PLATFORM_XCB_KHR - -#include <pthread.h> -#include <vkd3d.h> - #define COBJMACROS #define NONAMELESSUNION #include "vkd3d_memory.h" #include "vkd3d_utils.h" +#define VK_NO_PROTOTYPES +#ifdef HAVE_XCB +# define VK_USE_PLATFORM_XCB_KHR +#endif + +#include <pthread.h> +#include <vkd3d.h> + struct vkd3d_event { pthread_mutex_t mutex; -- 2.16.4

2 1

[PATCH vkd3d 1/9] build: Detect soname of libvulkan at configure time.
by Józef Kucia 17 Aug '18

17 Aug '18

From: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- configure.ac | 6 +++--- libs/vkd3d/device.c | 4 ++-- m4/check-soname.m4 | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+), 5 deletions(-) create mode 100644 m4/check-soname.m4 diff --git a/configure.ac b/configure.ac index d437e1b73262..83b0b0d8fcec 100644 --- a/configure.ac +++ b/configure.ac @@ -76,9 +76,9 @@ AC_CHECK_LIB([pthread], [pthread_create], [AC_MSG_ERROR([libpthread not found.])]) AC_SUBST([VULKAN_LIBS]) -AC_CHECK_LIB([vulkan], [vkGetInstanceProcAddr], - [VULKAN_LIBS="-lvulkan"], - [AC_MSG_ERROR([libvulkan not found.])]) +VKD3D_CHECK_SONAME([vulkan], [vkGetInstanceProcAddr], + [VULKAN_LIBS="-lvulkan"], + [AC_MSG_ERROR([libvulkan not found.])]) HAVE_SPIRV_TOOLS=no AS_IF([test "x$with_spirv_tools" = "xyes"], diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 6fa001779180..47b56e5975fd 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -212,9 +212,9 @@ static HRESULT vkd3d_init_vk_global_procs(struct vkd3d_instance *instance, if (!vkGetInstanceProcAddr) { - if (!(instance->libvulkan = dlopen("libvulkan.so.1", RTLD_NOW))) + if (!(instance->libvulkan = dlopen(SONAME_LIBVULKAN, RTLD_NOW))) { - ERR("Failed to load libvulkan.\n"); + ERR("Failed to load libvulkan: %s.\n", dlerror()); return E_FAIL; } diff --git a/m4/check-soname.m4 b/m4/check-soname.m4 new file mode 100644 index 000000000000..82ad2287c8ce --- /dev/null +++ b/m4/check-soname.m4 @@ -0,0 +1,54 @@ +dnl +dnl Copyright 2002 Alexandre Julliard +dnl +dnl This library is free software; you can redistribute it and/or +dnl modify it under the terms of the GNU Lesser General Public +dnl License as published by the Free Software Foundation; either +dnl version 2.1 of the License, or (at your option) any later version. +dnl +dnl This library is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl Lesser General Public License for more details. +dnl +dnl You should have received a copy of the GNU Lesser General Public +dnl License along with this library; if not, write to the Free Software +dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA +dnl +dnl As a special exception to the GNU Lesser General Public License, +dnl if you distribute this file as part of a program that contains a +dnl configuration script generated by Autoconf, you may include it +dnl under the same distribution terms that you use for the rest of +dnl that program. + +dnl VKD3D_PATH_SONAME_TOOLS +AC_DEFUN([VKD3D_PATH_SONAME_TOOLS], +[AC_PATH_PROG(LDD,ldd,true,/sbin:/usr/sbin:$PATH) +AC_CHECK_TOOL(OTOOL,otool,otool) +AC_CHECK_TOOL(READELF,[readelf],true)]) + +dnl VKD3D_CHECK_SONAME(library, function, [action-if-found, [action-if-not-found, [other_libraries, [pattern]]]]) +AC_DEFUN([VKD3D_CHECK_SONAME], +[AC_REQUIRE([VKD3D_PATH_SONAME_TOOLS])dnl +AS_VAR_PUSHDEF([ac_Lib],[ac_cv_lib_soname_$1])dnl +m4_pushdef([ac_lib_pattern],m4_default([$6],[lib$1]))dnl +AC_MSG_CHECKING([for -l$1]) +AC_CACHE_VAL(ac_Lib, +[ac_check_soname_save_LIBS=$LIBS + LIBS="-l$1 $5 $LIBS" + AC_LINK_IFELSE([AC_LANG_CALL([], [$2])], + [AS_CASE(["$host_os"], + [darwin*|macosx*], [AS_VAR_SET(ac_Lib,[`$OTOOL -L conftest$ac_exeext | grep "]ac_lib_pattern[\\.[[0-9A-Za-z.]]*dylib" | sed -e "s/^.*\/$]ac_lib_pattern[\.[[0-9A-Za-z.]]*dylib$.*$/\1/"';2,$d'`])], + [AS_VAR_SET(ac_Lib,[`$READELF -d conftest$ac_exeext | grep "NEEDED.*]ac_lib_pattern[\\.$LIBEXT" | sed -e "s/^.*\\m4_dquote(\$]ac_lib_pattern[\\.$LIBEXT[[^ ]]*\$\\).*$/\1/"';2,$d'`]) + AS_VAR_IF([ac_Lib],[], + [AS_VAR_SET(ac_Lib,[`$LDD conftest$ac_exeext | grep "]ac_lib_pattern[\\.$LIBEXT" | sed -e "s/^.*$]ac_lib_pattern[\.$LIBEXT[[^ ]]*$.*$/\1/"';2,$d'`])])])]) + LIBS=$ac_check_soname_save_LIBS])dnl +AS_VAR_IF([ac_Lib],[], + [AC_MSG_RESULT([not found]) + $4], + [AC_MSG_RESULT(AS_VAR_GET(ac_Lib)) + AC_DEFINE_UNQUOTED(AS_TR_CPP(SONAME_LIB$1),["]AS_VAR_GET(ac_Lib)["], + [Define to the soname of the lib$1 library.]) + $3])dnl +m4_popdef([ac_lib_pattern])dnl +AS_VAR_POPDEF([ac_Lib])]) -- 2.16.4

2 1

[PATCH vkd3d 7/9] vkd3d-utils: Detect surface extensions at runtime.
by Józef Kucia 17 Aug '18

17 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Makefile.am | 1 - libs/vkd3d-utils/vkd3d_utils_main.c | 16 ++++++++++++---- libs/vkd3d-utils/vkd3d_utils_private.h | 9 +++------ 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/Makefile.am b/Makefile.am index 79e31553cb7c..3ee2f130c50d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -106,7 +106,6 @@ libvkd3d_utils_la_SOURCES = \ libs/vkd3d-utils/vkd3d_utils.map \ libs/vkd3d-utils/vkd3d_utils_main.c \ libs/vkd3d-utils/vkd3d_utils_private.h -libvkd3d_utils_la_CFLAGS = @XCB_CFLAGS@ libvkd3d_utils_la_LDFLAGS = -version-info 1:0:0 libvkd3d_utils_la_LIBADD = libvkd3d-common.la libvkd3d.la if HAVE_LD_VERSION_SCRIPT diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index 8c2503784e37..fa6e5f8f1616 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -28,15 +28,18 @@ HRESULT WINAPI D3D12GetDebugInterface(REFIID iid, void **debug) HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_feature_level, REFIID iid, void **device) { + struct vkd3d_optional_instance_extensions_info optional_extensions_info; struct vkd3d_instance_create_info instance_create_info; struct vkd3d_device_create_info device_create_info; static const char * const instance_extensions[] = { VK_KHR_SURFACE_EXTENSION_NAME, -#ifdef HAVE_XCB - VK_KHR_XCB_SURFACE_EXTENSION_NAME, -#endif + }; + static const char * const optional_instance_extensions[] = + { + "VK_KHR_xcb_surface", + "VK_MVK_macos_surface", }; static const char * const device_extensions[] = { @@ -49,9 +52,14 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, if (adapter) FIXME("Ignoring adapter %p.\n", adapter); + memset(&optional_extensions_info, 0, sizeof(optional_extensions_info)); + optional_extensions_info.type = VKD3D_STRUCTURE_TYPE_OPTIONAL_INSTANCE_EXTENSIONS_INFO; + optional_extensions_info.extensions = optional_instance_extensions; + optional_extensions_info.extension_count = ARRAY_SIZE(optional_instance_extensions); + memset(&instance_create_info, 0, sizeof(instance_create_info)); instance_create_info.type = VKD3D_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; - instance_create_info.next = NULL; + instance_create_info.next = &optional_extensions_info; instance_create_info.pfn_signal_event = vkd3d_signal_event; instance_create_info.wchar_size = sizeof(WCHAR); instance_create_info.instance_extensions = instance_extensions; diff --git a/libs/vkd3d-utils/vkd3d_utils_private.h b/libs/vkd3d-utils/vkd3d_utils_private.h index b4828cc3ed5c..a31f9b737e3f 100644 --- a/libs/vkd3d-utils/vkd3d_utils_private.h +++ b/libs/vkd3d-utils/vkd3d_utils_private.h @@ -21,13 +21,10 @@ #define COBJMACROS #define NONAMELESSUNION -#include "vkd3d_memory.h" -#include "vkd3d_utils.h" - #define VK_NO_PROTOTYPES -#ifdef HAVE_XCB -# define VK_USE_PLATFORM_XCB_KHR -#endif + +#include "vkd3d_memory.h" +#include <vkd3d_utils.h> #include <pthread.h> #include <vkd3d.h> -- 2.16.4

1 0

[PATCH] winecfg: Update changed state on associations checkbox click.
by Nikolay Sivov 17 Aug '18

17 Aug '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- programs/winecfg/theme.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index 1934538f44..5304f7240c 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -1320,6 +1320,7 @@ ThemeDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) case IDC_ENABLE_FILE_ASSOCIATIONS: update_mime_types(hDlg); + SendMessageW(GetParent(hDlg), PSM_CHANGED, 0, 0); break; } break; -- 2.18.0

3 5

[PATCH] po: Update Russian translation.
by Nikolay Sivov 17 Aug '18

17 Aug '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- po/ru.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/po/ru.po b/po/ru.po index 6a4c3c848f..aacc59532b 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,14 +5,14 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-07-20 09:26+0300\n" +"PO-Revision-Date: 2018-08-17 00:45+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.0.9\n" +"X-Generator: Poedit 2.1.1\n" #: appwiz.rc:58 msgid "Install/Uninstall" @@ -14205,11 +14205,11 @@ msgstr "Цвет:" #: winecfg.rc:304 msgid "MIME types" -msgstr "" +msgstr "Типы MIME" #: winecfg.rc:305 msgid "Manage file &associations" -msgstr "" +msgstr "Обновлять &ассоциации" #: winecfg.rc:308 msgid "Folders" -- 2.18.0

3 3

← Newer
1
...
36
37
38
39
40
41
42
...
71
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-devel August 2018