July 2019 - Wine-Devel - list.winehq.org

[PATCH 1/3] ntdll: Store the actual used value in error cases.
by Jacek Caban July 3, 2019

July 3, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/printf.c | 38 ++++++++++++++++++++++++++++++++------ 1 file changed, 32 insertions(+), 6 deletions(-)

2 1

[PATCH 3/3] ntdll: Implement _snprintf_s and _vsnprintf_s.
by Jacek Caban July 3, 2019

July 3, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/printf.c | 45 +++++++++++++++++++++++++++++++++ dlls/ntdll/tests/string.c | 53 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 100 insertions(+)

1 0

[PATCH 2/3] ntdll: Move null terminating result to pf_vsnprintf callers.
by Jacek Caban July 3, 2019

July 3, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/printf.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)

1 0

[PATCH v2 1/8] user32/tests: Test opening raw input devices.
by Zebediah Figura July 3, 2019

July 3, 2019

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v2: fix test failures on XP/2003; other patches are unaffected dlls/user32/tests/input.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 168b055773e..d0dc4a8bcf3 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1625,6 +1625,7 @@ static void test_GetRawInputDeviceList(void) char nameA[128]; UINT sz, len; RID_DEVICE_INFO info; + HANDLE file; /* get required buffer size */ name[0] = '\0'; @@ -1664,6 +1665,14 @@ static void test_GetRawInputDeviceList(void) ok(ret == sizeof(info), "GetRawInputDeviceInfo gave wrong return: %d\n", err); ok(sz == sizeof(info), "GetRawInputDeviceInfo set wrong size\n"); ok(info.dwType == devices[i].dwType, "GetRawInputDeviceInfo set wrong type: 0x%x\n", info.dwType); + + /* setupapi returns an NT device path, but CreateFile() < Vista can't + * understand that; so use the \\?\ prefix instead */ + name[1] = '\\'; + file = CreateFileW(name, 0, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL); + todo_wine_if(info.dwType != RIM_TYPEHID) + ok(file != INVALID_HANDLE_VALUE, "Failed to open %s, error %u\n", wine_dbgstr_w(name), GetLastError()); + CloseHandle(file); } /* check if variable changes from larger to smaller value */ -- 2.20.1

1 0

[PATCH 3/3] kernel32: Terminate process in unhandled exception handler.
by Jacek Caban July 3, 2019

July 3, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/process.c | 2 +- dlls/kernel32/tests/debugger.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-)

1 0

[PATCH 2/3] server: Fix debug event order in generate_startup_debug_events.
by Jacek Caban July 3, 2019

July 3, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/debugger.c | 2 -- server/debugger.c | 20 +++++++++++++------- 2 files changed, 13 insertions(+), 9 deletions(-)

1 0

[PATCH 1/2] wineserver: Implement thread priorities on Unix with sched_setscheduler / setpriority
by Rémi Bernon July 3, 2019

July 3, 2019

This does not really check for errors in order to avoid introducing breaking changes. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- configure | 69 ++++++++++++++++++++ configure.ac | 19 ++++++ include/config.h.in | 6 ++ server/thread.c | 149 ++++++++++++++++++++++++++++++++++++++++---- 4 files changed, 230 insertions(+), 13 deletions(-) diff --git a/configure b/configure index 3b6d744c391..e89be467e2e 100755 --- a/configure +++ b/configure @@ -18065,6 +18065,75 @@ $as_echo "#define HAVE_SCHED_SETAFFINITY 1" >>confdefs.h fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sched_setscheduler" >&5 +$as_echo_n "checking for sched_setscheduler... " >&6; } +if ${wine_cv_have_sched_setscheduler+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#define _GNU_SOURCE +#include <sched.h> +int +main () +{ +sched_setscheduler(0, 0, 0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + wine_cv_have_sched_setscheduler=yes +else + wine_cv_have_sched_setscheduler=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wine_cv_have_sched_setscheduler" >&5 +$as_echo "$wine_cv_have_sched_setscheduler" >&6; } +if test "$wine_cv_have_sched_setscheduler" = "yes" +then + +$as_echo "#define HAVE_SCHED_SETSCHEDULER 1" >>confdefs.h + +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for setpriority" >&5 +$as_echo_n "checking for setpriority... " >&6; } +if ${wine_cv_have_setpriority+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#define _GNU_SOURCE +#include <sys/resource.h> +#include <sys/time.h> +int +main () +{ +setpriority(0, 0, 0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + wine_cv_have_setpriority=yes +else + wine_cv_have_setpriority=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wine_cv_have_setpriority" >&5 +$as_echo "$wine_cv_have_setpriority" >&6; } +if test "$wine_cv_have_setpriority" = "yes" +then + +$as_echo "#define HAVE_SETPRIORITY 1" >>confdefs.h + +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fallocate" >&5 $as_echo_n "checking for fallocate... " >&6; } if ${wine_cv_have_fallocate+:} false; then : diff --git a/configure.ac b/configure.ac index 709b43b9478..4a3ff36e6b7 100644 --- a/configure.ac +++ b/configure.ac @@ -2233,6 +2233,25 @@ then AC_DEFINE(HAVE_SCHED_SETAFFINITY, 1, [Define to 1 if you have the `sched_setaffinity' function.]) fi +AC_CACHE_CHECK([for sched_setscheduler],wine_cv_have_sched_setscheduler, + AC_LINK_IFELSE([AC_LANG_PROGRAM( +[[#define _GNU_SOURCE +#include <sched.h>]], [[sched_setscheduler(0, 0, 0);]])],[wine_cv_have_sched_setscheduler=yes],[wine_cv_have_sched_setscheduler=no])) +if test "$wine_cv_have_sched_setscheduler" = "yes" +then + AC_DEFINE(HAVE_SCHED_SETSCHEDULER, 1, [Define to 1 if you have the `sched_setscheduler' function.]) +fi + +AC_CACHE_CHECK([for setpriority],wine_cv_have_setpriority, + AC_LINK_IFELSE([AC_LANG_PROGRAM( +[[#define _GNU_SOURCE +#include <sys/resource.h> +#include <sys/time.h>]], [[setpriority(0, 0, 0);]])],[wine_cv_have_setpriority=yes],[wine_cv_have_setpriority=no])) +if test "$wine_cv_have_setpriority" = "yes" +then + AC_DEFINE(HAVE_SETPRIORITY, 1, [Define to 1 if you have the `setpriority' function.]) +fi + AC_CACHE_CHECK([for fallocate],wine_cv_have_fallocate, AC_LINK_IFELSE([AC_LANG_PROGRAM( [[#define _GNU_SOURCE diff --git a/include/config.h.in b/include/config.h.in index ce5c1570541..1acc02b7173 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -788,6 +788,9 @@ /* Define to 1 if you have the `sched_setaffinity' function. */ #undef HAVE_SCHED_SETAFFINITY +/* Define to 1 if you have the `sched_setscheduler' function. */ +#undef HAVE_SCHED_SETSCHEDULER + /* Define to 1 if you have the `sched_yield' function. */ #undef HAVE_SCHED_YIELD @@ -812,6 +815,9 @@ /* Define to 1 if you have the `select' function. */ #undef HAVE_SELECT +/* Define to 1 if you have the `setpriority' function. */ +#undef HAVE_SETPRIORITY + /* Define to 1 if you have the `setproctitle' function. */ #undef HAVE_SETPROCTITLE diff --git a/server/thread.c b/server/thread.c index 7057c9bbd0c..5b5f3cde617 100644 --- a/server/thread.c +++ b/server/thread.c @@ -38,6 +38,12 @@ #ifdef HAVE_SCHED_H #include <sched.h> #endif +#ifdef HAVE_SYS_TIME_H +#include <sys/time.h> +#endif +#ifdef HAVE_SYS_RESOURCE_H +#include <sys/resource.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS @@ -517,28 +523,144 @@ affinity_t get_thread_affinity( struct thread *thread ) return mask; } +#if defined(HAVE_SCHED_SETSCHEDULER) || defined(HAVE_SETPRIORITY) +static int get_unix_priority( int priority_class, int priority ) +{ + switch (priority_class) { + case PROCESS_PRIOCLASS_IDLE: + switch (priority) { + case THREAD_PRIORITY_IDLE: return 15; + case THREAD_PRIORITY_LOWEST: return 10; + case THREAD_PRIORITY_BELOW_NORMAL: return 8; + case THREAD_PRIORITY_NORMAL: return 6; + case THREAD_PRIORITY_ABOVE_NORMAL: return 4; + case THREAD_PRIORITY_HIGHEST: return 2; + case THREAD_PRIORITY_TIME_CRITICAL: return -15; + } + case PROCESS_PRIOCLASS_BELOW_NORMAL: + switch (priority) { + case THREAD_PRIORITY_IDLE: return 15; + case THREAD_PRIORITY_LOWEST: return 8; + case THREAD_PRIORITY_BELOW_NORMAL: return 6; + case THREAD_PRIORITY_NORMAL: return 4; + case THREAD_PRIORITY_ABOVE_NORMAL: return 2; + case THREAD_PRIORITY_HIGHEST: return 0; + case THREAD_PRIORITY_TIME_CRITICAL: return -15; + } + case PROCESS_PRIOCLASS_NORMAL: + switch (priority) { + case THREAD_PRIORITY_IDLE: return 15; + case THREAD_PRIORITY_LOWEST: return 4; + case THREAD_PRIORITY_BELOW_NORMAL: return 2; + case THREAD_PRIORITY_NORMAL: return 0; + case THREAD_PRIORITY_ABOVE_NORMAL: return -2; + case THREAD_PRIORITY_HIGHEST: return -4; + case THREAD_PRIORITY_TIME_CRITICAL: return -15; + } + case PROCESS_PRIOCLASS_ABOVE_NORMAL: + switch (priority) { + case THREAD_PRIORITY_IDLE: return 15; + case THREAD_PRIORITY_LOWEST: return 0; + case THREAD_PRIORITY_BELOW_NORMAL: return -2; + case THREAD_PRIORITY_NORMAL: return -4; + case THREAD_PRIORITY_ABOVE_NORMAL: return -6; + case THREAD_PRIORITY_HIGHEST: return -8; + case THREAD_PRIORITY_TIME_CRITICAL: return -15; + } + case PROCESS_PRIOCLASS_HIGH: + switch (priority) { + case THREAD_PRIORITY_IDLE: return 15; + case THREAD_PRIORITY_LOWEST: return -2; + case THREAD_PRIORITY_BELOW_NORMAL: return -4; + case THREAD_PRIORITY_NORMAL: return -6; + case THREAD_PRIORITY_ABOVE_NORMAL: return -8; + case THREAD_PRIORITY_HIGHEST: return -10; + case THREAD_PRIORITY_TIME_CRITICAL: return -15; + } + case PROCESS_PRIOCLASS_REALTIME: + switch (priority) { + case THREAD_PRIORITY_IDLE: return 1; + case -7: + case -6: + case -5: + case -4: + case -3: + case THREAD_PRIORITY_LOWEST: + case THREAD_PRIORITY_BELOW_NORMAL: + case THREAD_PRIORITY_NORMAL: + case THREAD_PRIORITY_ABOVE_NORMAL: + case THREAD_PRIORITY_HIGHEST: + case 3: + case 4: + case 5: + case 6: + return priority + 9; + case THREAD_PRIORITY_TIME_CRITICAL: + return 16; + } + } + return 0; +} +#endif + #define THREAD_PRIORITY_REALTIME_HIGHEST 6 #define THREAD_PRIORITY_REALTIME_LOWEST -7 +int set_thread_priority( struct thread* thread, int priority ) +{ + int max = THREAD_PRIORITY_HIGHEST; + int min = THREAD_PRIORITY_LOWEST; + if (thread->process->priority == PROCESS_PRIOCLASS_REALTIME) + { + max = THREAD_PRIORITY_REALTIME_HIGHEST; + min = THREAD_PRIORITY_REALTIME_LOWEST; + } + + if ((priority < min || priority > max) && + priority != THREAD_PRIORITY_IDLE && + priority != THREAD_PRIORITY_TIME_CRITICAL) + { + errno = EINVAL; + return -1; + } + + thread->priority = priority; + if (thread->unix_tid == -1) + return 0; + + if (thread->process->priority == PROCESS_PRIOCLASS_REALTIME) + { +#ifdef HAVE_SCHED_SETSCHEDULER + struct sched_param param; + if (sched_getparam( thread->unix_tid, &param ) != 0) + goto error; + + param.sched_priority = get_unix_priority( thread->process->priority, priority ); + if (sched_setscheduler( thread->unix_tid, SCHED_RR|SCHED_RESET_ON_FORK, &param ) == 0) + return 0; +#endif + } + else + { +#ifdef HAVE_SETPRIORITY + if (setpriority( PRIO_PROCESS, thread->unix_tid, + get_unix_priority( thread->process->priority, priority ) ) == 0) + return 0; +#endif + } + +error: + return 0; +} + /* set all information about a thread */ static void set_thread_info( struct thread *thread, const struct set_thread_info_request *req ) { if (req->mask & SET_THREAD_INFO_PRIORITY) { - int max = THREAD_PRIORITY_HIGHEST; - int min = THREAD_PRIORITY_LOWEST; - if (thread->process->priority == PROCESS_PRIOCLASS_REALTIME) - { - max = THREAD_PRIORITY_REALTIME_HIGHEST; - min = THREAD_PRIORITY_REALTIME_LOWEST; - } - if ((req->priority >= min && req->priority <= max) || - req->priority == THREAD_PRIORITY_IDLE || - req->priority == THREAD_PRIORITY_TIME_CRITICAL) - thread->priority = req->priority; - else - set_error( STATUS_INVALID_PARAMETER ); + if (set_thread_priority( thread, req->priority )) + file_set_error(); } if (req->mask & SET_THREAD_INFO_AFFINITY) { @@ -1402,6 +1524,7 @@ DECL_HANDLER(init_thread) process->unix_pid = -1; /* can happen with linuxthreads */ init_thread_context( current ); generate_debug_event( current, CREATE_THREAD_DEBUG_EVENT, &req->entry ); + set_thread_priority( current, current->priority ); set_thread_affinity( current, current->affinity ); } debug_level = max( debug_level, req->debug_level ); -- 2.20.1

2 4

[PATCH 5/5] wined3d: Also try to create a depth/stencil buffer for WINED3D_NO3D devices in swapchain_init().
by Henri Verbeet July 3, 2019

July 3, 2019

If requested. It will fail as it should, but the client library should never request it. I.e., the additional check is redundant. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/swapchain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 9be6658c83d..69580adbffb 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -938,7 +938,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 } /* Swapchains share the depth/stencil buffer, so only create a single depthstencil surface. */ - if (desc->enable_auto_depth_stencil && !(device->wined3d->flags & WINED3D_NO3D)) + if (desc->enable_auto_depth_stencil) { TRACE("Creating depth/stencil buffer.\n"); if (!device->auto_depth_stencil_view) -- 2.11.0

2 1

[PATCH 4/5] wined3d: Pass a wined3d_context_gl structure to set_glsl_compute_shader_program().
by Henri Verbeet July 3, 2019

July 3, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 34bb0b75bfb..1cd6bb6b507 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -10062,16 +10062,15 @@ static GLuint find_glsl_compute_shader(const struct wined3d_context_gl *context_ } /* Context activation is done by the caller. */ -static void set_glsl_compute_shader_program(const struct wined3d_context *context, +static void set_glsl_compute_shader_program(const struct wined3d_context_gl *context_gl, const struct wined3d_state *state, struct shader_glsl_priv *priv, struct glsl_context_data *ctx_data) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct glsl_shader_prog_link *entry; struct wined3d_shader *shader; struct glsl_program_key key; GLuint cs_id; - if (!(context->shader_update_mask & (1u << WINED3D_SHADER_TYPE_COMPUTE))) + if (!(context_gl->c.shader_update_mask & (1u << WINED3D_SHADER_TYPE_COMPUTE))) return; if (!(shader = state->shader[WINED3D_SHADER_TYPE_COMPUTE])) @@ -10591,13 +10590,14 @@ static void shader_glsl_select(void *shader_priv, struct wined3d_context *contex static void shader_glsl_select_compute(void *shader_priv, struct wined3d_context *context, const struct wined3d_state *state) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); struct glsl_context_data *ctx_data = context->shader_backend_data; const struct wined3d_gl_info *gl_info = context->gl_info; struct shader_glsl_priv *priv = shader_priv; GLuint program_id, prev_id; prev_id = ctx_data->glsl_program ? ctx_data->glsl_program->id : 0; - set_glsl_compute_shader_program(context, state, priv, ctx_data); + set_glsl_compute_shader_program(context_gl, state, priv, ctx_data); program_id = ctx_data->glsl_program ? ctx_data->glsl_program->id : 0; TRACE("Using GLSL program %u.\n", program_id); -- 2.11.0

2 1

[PATCH 3/5] wined3d: Pass a wined3d_context_gl structure to find_glsl_compute_shader().
by Henri Verbeet July 3, 2019

July 3, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e7c7bca8e9e..34bb0b75bfb 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -10043,10 +10043,9 @@ static HRESULT shader_glsl_compile_compute_shader(struct shader_glsl_priv *priv, return WINED3D_OK; } -static GLuint find_glsl_compute_shader(const struct wined3d_context *context, +static GLuint find_glsl_compute_shader(const struct wined3d_context_gl *context_gl, struct shader_glsl_priv *priv, struct wined3d_shader *shader) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct glsl_shader_private *shader_data; if (!shader->backend_data) @@ -10066,6 +10065,7 @@ static GLuint find_glsl_compute_shader(const struct wined3d_context *context, static void set_glsl_compute_shader_program(const struct wined3d_context *context, const struct wined3d_state *state, struct shader_glsl_priv *priv, struct glsl_context_data *ctx_data) { + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct glsl_shader_prog_link *entry; struct wined3d_shader *shader; struct glsl_program_key key; @@ -10081,7 +10081,7 @@ static void set_glsl_compute_shader_program(const struct wined3d_context *contex return; } - cs_id = find_glsl_compute_shader(context, priv, shader); + cs_id = find_glsl_compute_shader(context_gl, priv, shader); memset(&key, 0, sizeof(key)); key.cs_id = cs_id; if (!(entry = get_glsl_program_entry(priv, &key))) -- 2.11.0

2 1