June 2018 - Wine-Devel - list.winehq.org

[PATCH 1/5] wined3d: Generate shader epilogue before conditional returns.

by Matteo Bruni

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a99762b151f..86259ae4755 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5131,20 +5131,20 @@ static void shader_glsl_default(const struct wined3d_shader_instruction *ins) shader_addline(ins->ctx->buffer, "default:\n"); } -static void shader_glsl_generate_conditional_op(const struct wined3d_shader_instruction *ins, - const char *op) +static void shader_glsl_generate_condition(const struct wined3d_shader_instruction *ins) { struct glsl_src_param src_param; const char *condition; condition = ins->flags == WINED3D_SHADER_CONDITIONAL_OP_NZ ? "bool" : "!bool"; shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &src_param); - shader_addline(ins->ctx->buffer, "if (%s(%s)) %s\n", condition, src_param.param_str, op); + shader_addline(ins->ctx->buffer, "if (%s(%s))\n", condition, src_param.param_str); } static void shader_glsl_if(const struct wined3d_shader_instruction *ins) { - shader_glsl_generate_conditional_op(ins, "{"); + shader_glsl_generate_condition(ins); + shader_addline(ins->ctx->buffer, "{\n"); } static void shader_glsl_ifc(const struct wined3d_shader_instruction *ins) @@ -5203,15 +5203,29 @@ static void shader_glsl_conditional_op(const struct wined3d_shader_instruction * switch (ins->handler_idx) { - case WINED3DSIH_BREAKP: op = "break;"; break; - case WINED3DSIH_CONTINUEP: op = "continue;"; break; - case WINED3DSIH_RETP: op = "return;"; break; + case WINED3DSIH_BREAKP: + op = "break;"; + break; + case WINED3DSIH_CONTINUEP: + op = "continue;"; + break; + case WINED3DSIH_RETP: + op = "return;"; + break; default: ERR("Unhandled opcode %#x.\n", ins->handler_idx); return; } - shader_glsl_generate_conditional_op(ins, op); + shader_glsl_generate_condition(ins); + if (ins->handler_idx == WINED3DSIH_RETP) + { + shader_addline(ins->ctx->buffer, "{\n"); + shader_glsl_generate_shader_epilogue(ins->ctx); + } + shader_addline(ins->ctx->buffer, " %s\n", op); + if (ins->handler_idx == WINED3DSIH_RETP) + shader_addline(ins->ctx->buffer, "}\n"); } static void shader_glsl_continue(const struct wined3d_shader_instruction *ins) @@ -6764,7 +6778,8 @@ static void shader_glsl_texkill(const struct wined3d_shader_instruction *ins) { if (ins->ctx->reg_maps->shader_version.major >= 4) { - shader_glsl_generate_conditional_op(ins, "discard;"); + shader_glsl_generate_condition(ins); + shader_addline(ins->ctx->buffer, " discard;\n"); } else { -- 2.16.1

June 12, 2018

[PATCH 2/2] schedsvc: Retry opening a .job file only in case of sharing violation. (v2)

by Dmitry Timoshkov

And turn loud ERR() into a TRACE() like it is in other places. v2: fix a copy/paste typo. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/schedsvc/atsvc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/schedsvc/atsvc.c b/dlls/schedsvc/atsvc.c index f6ea0f0e23..b8adc7279d 100644 --- a/dlls/schedsvc/atsvc.c +++ b/dlls/schedsvc/atsvc.c @@ -558,7 +558,7 @@ static BOOL load_job(const WCHAR *name, struct job_t *info) if (file == INVALID_HANDLE_VALUE) { TRACE("Failed to open %s, error %u\n", debugstr_w(name), GetLastError()); - if (try++ >= 3) break; + if (GetLastError() != ERROR_SHARING_VIOLATION || try++ >= 3) break; Sleep(100); continue; } @@ -872,9 +872,9 @@ static void update_job_status(struct job_t *job) hfile = CreateFileW(job->name, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); if (hfile != INVALID_HANDLE_VALUE) break; - if (try++ >= 3) + if (GetLastError() != ERROR_SHARING_VIOLATION || try++ >= 3) { - ERR("Failed to update %s, error %u\n", debugstr_w(job->name), GetLastError()); + TRACE("Failed to update %s, error %u\n", debugstr_w(job->name), GetLastError()); return; } Sleep(100); -- 2.16.3

June 12, 2018

[PATCH 1/2] mstask: Retry opening a .job file only in case of sharing violation.

by Dmitry Timoshkov

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 7499826937..69f1e5f95c 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -1444,7 +1444,7 @@ static HRESULT WINAPI MSTASK_IPersistFile_Load(IPersistFile *iface, LPCOLESTR fi file = CreateFileW(file_name, access, sharing, NULL, OPEN_EXISTING, 0, 0); if (file != INVALID_HANDLE_VALUE) break; - if (try++ >= 3) + if (GetLastError() != ERROR_SHARING_VIOLATION || try++ >= 3) { TRACE("Failed to open %s, error %u\n", debugstr_w(file_name), GetLastError()); return HRESULT_FROM_WIN32(GetLastError()); -- 2.16.3

June 12, 2018

[PATCH 2/2] schedsvc: Retry opening a .job file only in case of sharing violation.

by Dmitry Timoshkov

And turn loud ERR() into a TRACE() like it is in other places. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/schedsvc/atsvc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/schedsvc/atsvc.c b/dlls/schedsvc/atsvc.c index f6ea0f0e23..91a6af2e2f 100644 --- a/dlls/schedsvc/atsvc.c +++ b/dlls/schedsvc/atsvc.c @@ -558,7 +558,7 @@ static BOOL load_job(const WCHAR *name, struct job_t *info) if (file == INVALID_HANDLE_VALUE) { TRACE("Failed to open %s, error %u\n", debugstr_w(name), GetLastError()); - if (try++ >= 3) break; + if (GetLastError() != ERROR_SHARING_VIOLATION || try++ >= 3) Sleep(100); continue; } @@ -872,9 +872,9 @@ static void update_job_status(struct job_t *job) hfile = CreateFileW(job->name, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); if (hfile != INVALID_HANDLE_VALUE) break; - if (try++ >= 3) + if (GetLastError() != ERROR_SHARING_VIOLATION || try++ >= 3) { - ERR("Failed to update %s, error %u\n", debugstr_w(job->name), GetLastError()); + TRACE("Failed to update %s, error %u\n", debugstr_w(job->name), GetLastError()); return; } Sleep(100); -- 2.16.3

June 12, 2018

[PATCH 1/2] mstask: Retry opening a .job file only in case of sharing violation.

by Dmitry Timoshkov

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 7499826937..69f1e5f95c 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -1444,7 +1444,7 @@ static HRESULT WINAPI MSTASK_IPersistFile_Load(IPersistFile *iface, LPCOLESTR fi file = CreateFileW(file_name, access, sharing, NULL, OPEN_EXISTING, 0, 0); if (file != INVALID_HANDLE_VALUE) break; - if (try++ >= 3) + if (GetLastError() != ERROR_SHARING_VIOLATION || try++ >= 3) { TRACE("Failed to open %s, error %u\n", debugstr_w(file_name), GetLastError()); return HRESULT_FROM_WIN32(GetLastError()); -- 2.16.3

June 12, 2018

[PATCH] msvcr100: Fix lldiv implementation

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 9 ++++----- dlls/ucrtbase/tests/misc.c | 4 ++-- 2 files changed, 6 insertions(+), 7 deletions(-)

June 12, 2018

Re: [PATCH v2 2/2] msvcrt: Don't reimplement call_unwind_func().

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>

June 12, 2018

Re: [PATCH v2 1/2] msvcrt: Avoid using inline assembly in call_unwind_func().

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>

June 12, 2018

Re: [PATCH 3/3] msvcrt: Implement quick_exit and _crt_at_quick_exit

by Piotr Caban

On 06/12/18 09:43, Fabian Maurer wrote: > > Why don't you just call onexit functions instead of reimplementing it? > > > Note that you don't need to call MSVCRT__initialize_onexit_table when > > > quick_exit table is declared static. > > What do you mean? AFAIK the onquickexit functions are different > functions than the one registered onexit, no? So I need to have a second > function that uses a different table. Or put the shared functionality > into a shared function. atexit and at_quick_exit needs to manage similar table of functions. Because of that there's a set of helper functions that can be used to accomplish it (*_onexit_table functions). It's even documented that it's used internally: https://msdn.microsoft.com/en-us/library/mt670601.aspx Thanks, Piotr

June 12, 2018

Re: [PATCH 2/3] msvcrt: Add quick_exit

by Piotr Caban

On 06/12/18 09:40, Fabian Maurer wrote: > > quick_exit function should not call exit. I'm attaching a test that > > > shows that atexit callbacks should not be called. > > I know, and MSVCRT__exit only calls ExitProcess, not calling any callbacks. I've misread the patch, sorry for that (MSVCRT_exit / MSVCRT__exit). Thanks, Piotr

June 12, 2018