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

[PATCH 1/3] dxgi: Return DXGI_ERROR_SDK_COMPONENT_MISSING from DXGIGetDebugInterface1().
by Józef Kucia 16 Aug '18

16 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- I did more testing and DXGI_ERROR_SDK_COMPONENT_MISSING is the correct error code to return. --- dlls/dxgi/dxgi_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/dxgi_main.c b/dlls/dxgi/dxgi_main.c index cd2c39f4e14d..83c3f3734a77 100644 --- a/dlls/dxgi/dxgi_main.c +++ b/dlls/dxgi/dxgi_main.c @@ -253,6 +253,6 @@ HRESULT WINAPI DXGIGetDebugInterface1(UINT flags, REFIID iid, void **debug) { TRACE("flags %#x, iid %s, debug %p.\n", flags, debugstr_guid(iid), debug); - WARN("Returning E_NOINTERFACE.\n"); - return E_NOINTERFACE; + WARN("Returning DXGI_ERROR_SDK_COMPONENT_MISSING.\n"); + return DXGI_ERROR_SDK_COMPONENT_MISSING; } -- 2.16.4

2 1

[PATCH 5/6] wined3d: Allow copying between different texture types.
by Józef Kucia 16 Aug '18

16 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/device.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b7e8cecca323..5079113120eb 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4090,14 +4090,6 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev return WINED3DERR_INVALIDCALL; } - if (src_resource->type != dst_resource->type) - { - WARN("Resource types (%s / %s) don't match.\n", - debug_d3dresourcetype(dst_resource->type), - debug_d3dresourcetype(src_resource->type)); - return WINED3DERR_INVALIDCALL; - } - if (src_resource->format->typeless_id != dst_resource->format->typeless_id || (!src_resource->format->typeless_id && src_resource->format->id != dst_resource->format->id)) { @@ -4109,6 +4101,14 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev if (dst_resource->type == WINED3D_RTYPE_BUFFER) { + if (src_resource->type != WINED3D_RTYPE_BUFFER) + { + WARN("Resource types (%s / %s) don't match.\n", + debug_d3dresourcetype(dst_resource->type), + debug_d3dresourcetype(src_resource->type)); + return WINED3DERR_INVALIDCALL; + } + if (dst_sub_resource_idx) { WARN("Invalid dst_sub_resource_idx %u.\n", dst_sub_resource_idx); -- 2.16.4

2 1

[PATCH 1/6] wined3d: Add fall through comment in texture2d_blt_fbo() (Coverity).
by Józef Kucia 16 Aug '18

16 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/surface.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5502d055c263..2f74ad689fd5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -175,6 +175,7 @@ static void texture2d_blt_fbo(const struct wined3d_device *device, struct wined3 default: FIXME("Unsupported filter mode %s (%#x).\n", debug_d3dtexturefiltertype(filter), filter); + /* fall through */ case WINED3D_TEXF_NONE: case WINED3D_TEXF_POINT: gl_filter = GL_NEAREST; -- 2.16.4

2 1

[PATCH 4/6] wined3d: Mark vOutputControlPointID register as scalar.
by Józef Kucia 16 Aug '18

16 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/wined3d_private.h | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 39bb06ad2658..5187bcf7291e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4109,6 +4109,7 @@ static inline BOOL shader_is_scalar(const struct wined3d_shader_register *reg) case WINED3DSPR_DEPTHOUTGE: case WINED3DSPR_DEPTHOUTLE: case WINED3DSPR_LOOP: /* aL */ + case WINED3DSPR_OUTPOINTID: case WINED3DSPR_PREDICATE: /* p0 */ case WINED3DSPR_PRIMID: /* primID */ case WINED3DSPR_SAMPLEMASK: /* oMask */ -- 2.16.4

2 1

[PATCH 3/6] wined3d: Use snprintf() in shader_arb_request_a0() (Coverity).
by Józef Kucia 16 Aug '18

16 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index c05dca0046a2..97584b6124b3 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -987,9 +987,10 @@ static void shader_arb_request_a0(const struct wined3d_shader_instruction *ins, struct shader_arb_ctx_priv *priv = ins->ctx->backend_data; struct wined3d_string_buffer *buffer = ins->ctx->buffer; - if (!strcmp(priv->addr_reg, src)) return; + if (!strcmp(priv->addr_reg, src)) + return; - strcpy(priv->addr_reg, src); + snprintf(priv->addr_reg, sizeof(priv->addr_reg), src); shader_addline(buffer, "ARL A0.x, %s;\n", src); } -- 2.16.4

2 1

[PATCH v2 1/5] kernel32: Implement stub for SetProcessMitigationPolicy
by Fabian Maurer 16 Aug '18

16 Aug '18

This is needed by x64 chromium sandbox for >= win8. Not doing anything but returning true is enough to make it work, though security won't be perfect. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45643 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- ...api-ms-win-core-processthreads-l1-1-1.spec | 2 +- ...api-ms-win-core-processthreads-l1-1-2.spec | 2 +- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/process.c | 10 ++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- include/winnt.h | 19 +++++++++++++++++++ 6 files changed, 33 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec index ebbe55fe68..616fa63909 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec @@ -44,7 +44,7 @@ @ stdcall ResumeThread(long) kernel32.ResumeThread @ stdcall SetPriorityClass(long long) kernel32.SetPriorityClass @ stdcall SetProcessAffinityUpdateMode(long long) kernel32.SetProcessAffinityUpdateMode -@ stub SetProcessMitigationPolicy +@ stdcall SetProcessMitigationPolicy(long ptr long) kernel32.SetProcessMitigationPolicy @ stdcall SetProcessShutdownParameters(long long) kernel32.SetProcessShutdownParameters @ stdcall SetThreadContext(long ptr) kernel32.SetThreadContext @ stdcall SetThreadIdealProcessorEx(long ptr ptr) kernel32.SetThreadIdealProcessorEx diff --git a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec index db94c2e5e7..8de6c5b66c 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec @@ -49,7 +49,7 @@ @ stdcall ResumeThread(long) kernel32.ResumeThread @ stdcall SetPriorityClass(long long) kernel32.SetPriorityClass @ stdcall SetProcessAffinityUpdateMode(long long) kernel32.SetProcessAffinityUpdateMode -@ stub SetProcessMitigationPolicy +@ stdcall SetProcessMitigationPolicy(long ptr long) kernel32.SetProcessMitigationPolicy @ stdcall SetProcessPriorityBoost(long long) kernel32.SetProcessPriorityBoost @ stdcall SetProcessShutdownParameters(long long) kernel32.SetProcessShutdownParameters @ stdcall SetThreadContext(long ptr) kernel32.SetThreadContext diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 3060896daa..c53276c70a 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1428,6 +1428,7 @@ @ stdcall SetProcessAffinityMask(long long) @ stdcall SetProcessAffinityUpdateMode(long long) @ stdcall SetProcessDEPPolicy(long) +@ stdcall SetProcessMitigationPolicy(long ptr long) # @ stub SetProcessPreferredUILanguages @ stdcall SetProcessPriorityBoost(long long) @ stdcall SetProcessShutdownParameters(long long) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 5aa245cf1a..320b7cfa55 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -4389,3 +4389,13 @@ BOOL WINAPI BaseFlushAppcompatCache(void) SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +/********************************************************************** + * SetProcessMitigationPolicy (KERNEL32.@) + */ +BOOL WINAPI SetProcessMitigationPolicy(PROCESS_MITIGATION_POLICY migitation_policy, void *buffer, SIZE_T length) +{ + FIXME("(%d, %p, %lu): stub\n", migitation_policy, buffer, length); + + return TRUE; +} diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index cae825defd..5865ee7c48 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1456,7 +1456,7 @@ # @ stub SetProcessDefaultCpuSets # @ stub SetProcessGroupAffinity # @ stub SetProcessInformation -# @ stub SetProcessMitigationPolicy +@ stdcall SetProcessMitigationPolicy(long ptr long) kernel32.SetProcessMitigationPolicy # @ stub SetProcessPreferredUILanguages @ stdcall SetProcessPriorityBoost(long long) kernel32.SetProcessPriorityBoost @ stdcall SetProcessShutdownParameters(long long) kernel32.SetProcessShutdownParameters diff --git a/include/winnt.h b/include/winnt.h index 7f822c4aec..e9e5989f24 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6273,6 +6273,25 @@ typedef enum _RTL_UMS_SCHEDULER_REASON typedef void (CALLBACK *PRTL_UMS_SCHEDULER_ENTRY_POINT)(RTL_UMS_SCHEDULER_REASON,ULONG_PTR,PVOID); +typedef enum _PROCESS_MITIGATION_POLICY { + ProcessDEPPolicy, + ProcessASLRPolicy, + ProcessDynamicCodePolicy, + ProcessStrictHandleCheckPolicy, + ProcessSystemCallDisablePolicy, + ProcessMitigationOptionsMask, + ProcessExtensionPointDisablePolicy, + ProcessControlFlowGuardPolicy, + ProcessSignaturePolicy, + ProcessFontDisablePolicy, + ProcessImageLoadPolicy, + ProcessSystemCallFilterPolicy, + ProcessPayloadRestrictionPolicy, + ProcessChildProcessPolicy, + ProcessSideChannelIsolationPolicy, + MaxProcessMitigationPolicy +} PROCESS_MITIGATION_POLICY, *PPROCESS_MITIGATION_POLICY; + #ifdef __cplusplus } #endif -- 2.18.0

2 11

[PATCH] kernel32: Set environment variable %PUBLIC% on the process start-up.
by Dmitry Timoshkov 16 Aug '18

16 Aug '18

This patch fixes an installer that has "[%PUBLIC]\Documents" entry for some of the targets being copied from a cabinet file. Under Windows %PUBLIC% environment variable is set to C:\Users\Public. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kernel32/process.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 4e6ba1118e..280f406627 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -520,6 +520,7 @@ static void set_additional_environment(void) static const WCHAR computernameW[] = {'C','O','M','P','U','T','E','R','N','A','M','E',0}; static const WCHAR allusersW[] = {'A','L','L','U','S','E','R','S','P','R','O','F','I','L','E',0}; static const WCHAR programdataW[] = {'P','r','o','g','r','a','m','D','a','t','a',0}; + static const WCHAR publicW[] = {'P','U','B','L','I','C',0}; OBJECT_ATTRIBUTES attr; UNICODE_STRING nameW; WCHAR *profile_dir = NULL, *all_users_dir = NULL, *program_data_dir = NULL; @@ -560,6 +561,7 @@ static void set_additional_environment(void) if (p > value && p[-1] != '\\') *p++ = '\\'; strcpyW( p, all_users_dir ); SetEnvironmentVariableW( allusersW, value ); + SetEnvironmentVariableW( publicW, value ); HeapFree( GetProcessHeap(), 0, value ); } -- 2.17.1

3 6

[PATCH vkd3d 2/2] build: Check how many arguments pthread_setname_np() takes.
by Józef Kucia 16 Aug '18

16 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Based on a patch by Chip Davis. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- configure.ac | 2 +- libs/vkd3d/command.c | 4 +--- libs/vkd3d/vkd3d_private.h | 9 +++++++++ m4/check-functions.m4 | 39 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 50 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index a6104498a2f9..d437e1b73262 100644 --- a/configure.ac +++ b/configure.ac @@ -94,7 +94,7 @@ VKD3D_CHECK_FUNC([HAVE_BUILTIN_POPCOUNT], [__builtin_popcount], [__builtin_popco VKD3D_CHECK_FUNC([HAVE_SYNC_ADD_AND_FETCH], [__sync_add_and_fetch], [__sync_add_and_fetch((int *)0, 0)]) VKD3D_CHECK_FUNC([HAVE_SYNC_SUB_AND_FETCH], [__sync_sub_and_fetch], [__sync_sub_and_fetch((int *)0, 0)]) -VKD3D_CHECK_LIB_FUNCS([pthread_setname_np], [$PTHREAD_LIBS]) +VKD3D_CHECK_PTHREAD_SETNAME_NP AM_CONDITIONAL([BUILD_DEMOS], [test "x$enable_demos" = "xyes"]) AM_CONDITIONAL([HAVE_WIDL], [test "x$WIDL" != "xno"]) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 4db9967e08b5..ff7cc9de314e 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -199,9 +199,7 @@ static void *vkd3d_fence_worker_main(void *arg) struct vkd3d_fence_worker *worker = arg; int rc; -#ifdef HAVE_PTHREAD_SETNAME_NP - pthread_setname_np(pthread_self(), "vkd3d_worker"); -#endif + vkd3d_set_thread_name("vkd3d_worker"); for (;;) { diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 8efb9304a554..c928cc719828 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -818,4 +818,13 @@ HRESULT vkd3d_load_vk_device_procs(struct vkd3d_vk_device_procs *procs, extern const char vkd3d_build[]; +static inline void vkd3d_set_thread_name(const char *name) +{ +#if defined(HAVE_PTHREAD_SETNAME_NP_2) + pthread_setname_np(pthread_self(), name); +#elif defined(HAVE_PTHREAD_SETNAME_NP_1) + pthread_setname_np(name); +#endif +} + #endif /* __VKD3D_PRIVATE_H */ diff --git a/m4/check-functions.m4 b/m4/check-functions.m4 index 17082a179719..4d018d6924a1 100644 --- a/m4/check-functions.m4 +++ b/m4/check-functions.m4 @@ -14,3 +14,42 @@ AC_DEFUN([VKD3D_CHECK_LIB_FUNCS], LIBS="$LIBS $2" AC_CHECK_FUNCS([$1], [$3], [$4]) LIBS="$vkd3d_libs_saved"]) + +dnl VKD3D_CHECK_WHICH_PTHREAD_SETNAME_NP +AC_DEFUN([VKD3D_CHECK_WHICH_PTHREAD_SETNAME_NP], + [AC_MSG_CHECKING([how many arguments pthread_set_np() takes]) + AC_CACHE_VAL([vkd3d_cv_which_pthread_set_np], [ + +vkd3d_cv_which_pthread_set_np=unknown + +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>], + [pthread_setname_np(pthread_self(), "conftest")])], + [vkd3d_cv_which_pthread_set_np=two]) + +AS_IF([test "$vkd3d_cv_which_pthread_set_np" = "unknown"], + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>], + [pthread_setname_np("conftest")])], + [vkd3d_cv_which_pthread_set_np=one])]) + +]) dnl AC_CACHE_VAL + +AS_CASE(["$vkd3d_cv_which_pthread_set_np"], + [one], + [AC_DEFINE([HAVE_PTHREAD_SETNAME_NP_1], [1], + [Define to 1 if you have the one-argument variant of pthread_setname_np().]) + AC_MSG_RESULT([one])], + + [two], + [AC_DEFINE([HAVE_PTHREAD_SETNAME_NP_2], [1], + [Define to 1 if you have the two-argument variant of pthread_setname_np().]) + AC_MSG_RESULT([two])], + + [AC_MSG_RESULT([unknown])]) + +]) dnl AC_DEFUN + +dnl VKD3D_CHECK_PTHREAD_SETNAME_NP +AC_DEFUN([VKD3D_CHECK_PTHREAD_SETNAME_NP], + [VKD3D_CHECK_LIB_FUNCS([pthread_setname_np], [$PTHREAD_LIBS]) + AS_IF([test "x$ac_cv_func_pthread_setname_np" = "xyes"], + [VKD3D_CHECK_WHICH_PTHREAD_SETNAME_NP])]) -- 2.16.4

3 2

[PATCH vkd3d 1/2] build: Disable demos by default.
by Józef Kucia 16 Aug '18

16 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Makefile.am | 5 ++++- configure.ac | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 14f2d5168134..76cedc76e965 100644 --- a/Makefile.am +++ b/Makefile.am @@ -131,16 +131,19 @@ TESTS = $(vkd3d_tests) $(vkd3d_cross_tests) tests_d3d12_LDADD = $(LDADD) @PTHREAD_LIBS@ tests_vkd3d_api_LDADD = libvkd3d.la @VULKAN_LIBS@ +if BUILD_DEMOS DEMOS_LDADD = $(LDADD) libvkd3d-shader.la @XCB_LIBS@ @VULKAN_LIBS@ DEMOS_CFLAGS = $(AM_CFLAGS) @XCB_CFLAGS@ noinst_PROGRAMS += $(vkd3d_demos) -EXTRA_DIST += $(vkd3d_test_headers) $(vkd3d_demos_headers) demos_gears_CFLAGS = $(DEMOS_CFLAGS) demos_gears_LDADD = $(DEMOS_LDADD) -lm demos_triangle_CFLAGS = $(DEMOS_CFLAGS) demos_triangle_LDADD = $(DEMOS_LDADD) +endif + +EXTRA_DIST += $(vkd3d_test_headers) $(vkd3d_demos_headers) VKD3D_V_WIDL = $(vkd3d_v_widl_(a)AM_V@) vkd3d_v_widl_ = $(vkd3d_v_widl_(a)AM_DEFAULT_V@) diff --git a/configure.ac b/configure.ac index 2773a155cd78..a6104498a2f9 100644 --- a/configure.ac +++ b/configure.ac @@ -10,6 +10,7 @@ AC_ARG_VAR([CROSSCC32], [32-bit Windows cross compiler]) AC_ARG_VAR([CROSSCC64], [64-bit Windows cross compiler]) 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)])) AC_USE_SYSTEM_EXTENSIONS @@ -95,6 +96,7 @@ VKD3D_CHECK_FUNC([HAVE_SYNC_SUB_AND_FETCH], [__sync_sub_and_fetch], [__sync_sub_ VKD3D_CHECK_LIB_FUNCS([pthread_setname_np], [$PTHREAD_LIBS]) +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"]) AM_CONDITIONAL([HAVE_CROSSTARGET64], [test "x$CROSSTARGET64" != "xno"]) -- 2.16.4

4 3

[PATCH vkd3d 02/12] libs/vkd3d: Assert that queue is valid in vkd3d_queue_acquire().
by Józef Kucia 16 Aug '18

16 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 4db9967e08b5..4536264a6c3b 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -66,6 +66,7 @@ static VkQueue vkd3d_queue_acquire(struct vkd3d_queue *queue) return VK_NULL_HANDLE; } + assert(queue->vk_queue); return queue->vk_queue; } -- 2.16.4

2 1