- Wine-Devel - list.winehq.org

[PATCH v2] server: Do not allow parenting non-empty job.
by Paul Gofman May 27, 2021

May 27, 2021

Fixes a regression introduced by 21f5597de417575d476a00b567d972a89903b4b6 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - don't allow even if the job had the processes in the past (the test is updated to reflect that). dlls/kernel32/tests/process.c | 60 +++++++++++++++++++++++++++++++++++ server/process.c | 5 +++ 2 files changed, 65 insertions(+) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 9b91b6f0998..10786c52e9e 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -4502,6 +4502,7 @@ done: static void test_nested_jobs(void) { + BOOL ret, already_in_job = TRUE, create_succeeded = FALSE; PROCESS_INFORMATION info[2]; char buffer[MAX_PATH + 26]; STARTUPINFOA si = {0}; @@ -4514,6 +4515,65 @@ static void test_nested_jobs(void) return; } + job1 = pCreateJobObjectW(NULL, NULL); + ok(!!job1, "CreateJobObjectW failed, error %u.\n", GetLastError()); + job2 = pCreateJobObjectW(NULL, NULL); + ok(!!job2, "CreateJobObjectW failed, error %u.\n", GetLastError()); + + create_succeeded = TRUE; + sprintf(buffer, "\"%s\" process wait", selfname); + for (i = 0; i < 2; ++i) + { + ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, CREATE_BREAKAWAY_FROM_JOB, NULL, NULL, &si, &info[i]); + if (!ret && GetLastError() == ERROR_ACCESS_DENIED) + { + create_succeeded = FALSE; + break; + } + ok(ret, "CreateProcessA error %u\n", GetLastError()); + } + + if (create_succeeded) + { + ret = pIsProcessInJob(info[0].hProcess, NULL, &already_in_job); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + + if (!already_in_job) + { + ret = pAssignProcessToJobObject(job2, info[1].hProcess); + ok(ret, "AssignProcessToJobObject error %u\n", GetLastError()); + + ret = pAssignProcessToJobObject(job1, info[0].hProcess); + ok(ret, "AssignProcessToJobObject error %u\n", GetLastError()); + + ret = pAssignProcessToJobObject(job2, info[0].hProcess); + ok(!ret, "AssignProcessToJobObject succeeded\n"); + ok(GetLastError() == ERROR_ACCESS_DENIED, "Got unexpected error %u.\n", GetLastError()); + + TerminateProcess(info[1].hProcess, 0); + wait_child_process(info[1].hProcess); + CloseHandle(info[1].hProcess); + CloseHandle(info[1].hThread); + + ret = pAssignProcessToJobObject(job2, info[0].hProcess); + ok(!ret, "AssignProcessToJobObject succeeded\n"); + ok(GetLastError() == ERROR_ACCESS_DENIED, "Got unexpected error %u.\n", GetLastError()); + } + + TerminateProcess(info[0].hProcess, 0); + wait_child_process(info[0].hProcess); + CloseHandle(info[0].hProcess); + CloseHandle(info[0].hThread); + } + + if (already_in_job) + { + win_skip("Test process is already in job, can't test parenting non-empty job.\n"); + } + + CloseHandle(job1); + CloseHandle(job2); + job1 = pCreateJobObjectW(NULL, L"test_nested_jobs_0"); ok(!!job1, "CreateJobObjectW failed, error %u.\n", GetLastError()); job2 = pCreateJobObjectW(NULL, L"test_nested_jobs_1"); diff --git a/server/process.c b/server/process.c index e8bbe0d3106..2887bb9d566 100644 --- a/server/process.c +++ b/server/process.c @@ -312,6 +312,11 @@ static void add_job_process( struct job *job, struct process *process ) } else { + if (job->total_processes) + { + set_error( STATUS_ACCESS_DENIED ); + return; + } /* transfer reference. */ job->parent = process->job; list_add_tail( &job->parent->child_job_list, &job->parent_job_entry ); -- 2.31.1

1 0

[PATCH] server: Do not allow parenting non-empty job.
by Paul Gofman May 27, 2021

May 27, 2021

Fixes a regression introduced by 21f5597de417575d476a00b567d972a89903b4b6 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/kernel32/tests/process.c | 54 +++++++++++++++++++++++++++++++++++ server/process.c | 5 ++++ 2 files changed, 59 insertions(+) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 9b91b6f0998..6b135e7f052 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -4502,6 +4502,7 @@ done: static void test_nested_jobs(void) { + BOOL ret, already_in_job = TRUE, create_succeeded = FALSE; PROCESS_INFORMATION info[2]; char buffer[MAX_PATH + 26]; STARTUPINFOA si = {0}; @@ -4514,6 +4515,59 @@ static void test_nested_jobs(void) return; } + job1 = pCreateJobObjectW(NULL, NULL); + ok(!!job1, "CreateJobObjectW failed, error %u.\n", GetLastError()); + job2 = pCreateJobObjectW(NULL, NULL); + ok(!!job2, "CreateJobObjectW failed, error %u.\n", GetLastError()); + + create_succeeded = TRUE; + sprintf(buffer, "\"%s\" process wait", selfname); + for (i = 0; i < 2; ++i) + { + ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, CREATE_BREAKAWAY_FROM_JOB, NULL, NULL, &si, &info[i]); + if (!ret && GetLastError() == ERROR_ACCESS_DENIED) + { + create_succeeded = FALSE; + break; + } + ok(ret, "CreateProcessA error %u\n", GetLastError()); + } + + if (create_succeeded) + { + ret = pIsProcessInJob(info[0].hProcess, NULL, &already_in_job); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + + if (!already_in_job) + { + ret = pAssignProcessToJobObject(job2, info[1].hProcess); + ok(ret, "AssignProcessToJobObject error %u\n", GetLastError()); + + ret = pAssignProcessToJobObject(job1, info[0].hProcess); + ok(ret, "AssignProcessToJobObject error %u\n", GetLastError()); + + ret = pAssignProcessToJobObject(job2, info[0].hProcess); + ok(!ret, "AssignProcessToJobObject succeeded\n"); + ok(GetLastError() == ERROR_ACCESS_DENIED, "Got unexpected error %u.\n", GetLastError()); + } + + for (i = 0; i < 2; ++i) + { + TerminateProcess(info[i].hProcess, 0); + wait_child_process(info[i].hProcess); + CloseHandle(info[i].hProcess); + CloseHandle(info[i].hThread); + } + } + + if (already_in_job) + { + win_skip("Test process is already in job, can't test parenting non-empty job.\n"); + } + + CloseHandle(job1); + CloseHandle(job2); + job1 = pCreateJobObjectW(NULL, L"test_nested_jobs_0"); ok(!!job1, "CreateJobObjectW failed, error %u.\n", GetLastError()); job2 = pCreateJobObjectW(NULL, L"test_nested_jobs_1"); diff --git a/server/process.c b/server/process.c index e8bbe0d3106..bd7c2c5cd8e 100644 --- a/server/process.c +++ b/server/process.c @@ -312,6 +312,11 @@ static void add_job_process( struct job *job, struct process *process ) } else { + if (job->num_processes) + { + set_error( STATUS_ACCESS_DENIED ); + return; + } /* transfer reference. */ job->parent = process->job; list_add_tail( &job->parent->child_job_list, &job->parent_job_entry ); -- 2.31.1

1 0

[PATCH] user32: Depend on SetWindowPos to refresh window manager hints in SetWindowRgn.
by Piotr Caban May 27, 2021

May 27, 2021

Without the patch, both on Linux and Mac, the window will not restore title bar when it becomes non-shaped until it's e.g. moved. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/user32/winpos.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

2 1

[PATCH 1/2] evr/mixer: Preserve output stream types order.
by Nikolay Sivov May 27, 2021

May 27, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/mixer.c | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 0d4bf8bc500..ba4624e0f51 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -642,13 +642,19 @@ done: return hr; } -static int __cdecl rt_formats_sort_compare(const void *left, const void *right) +static void video_mixer_append_rt_format(struct rt_format *rt_formats, unsigned int *count, + const GUID *device, D3DFORMAT format) { - const struct rt_format *format1 = left, *format2 = right; + unsigned int i; - if (format1->format < format2->format) return -1; - if (format1->format > format2->format) return 1; - return 0; + for (i = 0; i < *count; ++i) + { + if (rt_formats[i].format == format) return; + } + + rt_formats[*count].format = format; + rt_formats[*count].device = *device; + *count += 1; } static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const DXVA2_VideoDesc *video_desc, @@ -677,11 +683,7 @@ static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const rt_formats = ptr; for (j = 0; j < format_count; ++j) - { - rt_formats[count + j].format = formats[j]; - rt_formats[count + j].device = devices[i]; - } - count += format_count; + video_mixer_append_rt_format(rt_formats, &count, &devices[i], formats[j]); CoTaskMemFree(formats); } @@ -689,18 +691,6 @@ static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const if (count && !(flags & MFT_SET_TYPE_TEST_ONLY)) { - qsort(rt_formats, count, sizeof(*rt_formats), rt_formats_sort_compare); - - j = 0; - for (i = j + 1; i < count; ++i) - { - if (rt_formats[i].format != rt_formats[j].format) - { - rt_formats[++j] = rt_formats[i]; - } - } - count = j + 1; - memcpy(&subtype, &MFVideoFormat_Base, sizeof(subtype)); if ((mixer->output.rt_formats = calloc(count, sizeof(*mixer->output.rt_formats)))) { -- 2.30.2

1 1

[PATCH v2 1/8] wined3d: Set an array of constant buffers as a single CS operation.
by Zebediah Figura May 27, 2021

May 27, 2021

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d11/device.c | 38 +++++++++++++++++------- dlls/wined3d/cs.c | 53 ++++++++++++++++++++-------------- dlls/wined3d/device.c | 37 ++++++++++++++---------- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 5 ++-- include/wine/wined3d.h | 5 ++-- 6 files changed, 87 insertions(+), 53 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index b6e60050f4f..0ba195b73eb 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -552,20 +552,29 @@ static void d3d11_device_context_get_constant_buffers(ID3D11DeviceContext1 *ifac wined3d_mutex_unlock(); } -static void d3d11_device_context_set_constant_buffers(ID3D11DeviceContext1 *iface, - enum wined3d_shader_type type, UINT start_slot, UINT buffer_count, ID3D11Buffer *const *buffers) +static void d3d11_device_context_set_constant_buffers(ID3D11DeviceContext1 *iface, enum wined3d_shader_type type, + unsigned int start_slot, unsigned int buffer_count, ID3D11Buffer *const *buffers) { + struct wined3d_buffer *wined3d_buffers[D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT]; struct d3d11_device_context *context = impl_from_ID3D11DeviceContext1(iface); unsigned int i; - wined3d_mutex_lock(); + if (buffer_count > ARRAY_SIZE(wined3d_buffers)) + { + WARN("Buffer count %u exceeds limit; ignoring call.\n", buffer_count); + return; + } + for (i = 0; i < buffer_count; ++i) { struct d3d_buffer *buffer = unsafe_impl_from_ID3D11Buffer(buffers[i]); - wined3d_device_context_set_constant_buffer(context->wined3d_context, type, start_slot + i, - buffer ? buffer->wined3d_buffer : NULL); + wined3d_buffers[i] = buffer ? buffer->wined3d_buffer : NULL; } + + wined3d_mutex_lock(); + wined3d_device_context_set_constant_buffers(context->wined3d_context, + type, start_slot, buffer_count, wined3d_buffers); wined3d_mutex_unlock(); } @@ -4554,20 +4563,29 @@ static void d3d10_device_get_constant_buffers(ID3D10Device1 *iface, wined3d_mutex_unlock(); } -static void d3d10_device_set_constant_buffers(ID3D10Device1 *iface, - enum wined3d_shader_type type, UINT start_slot, UINT buffer_count, ID3D10Buffer *const *buffers) +static void d3d10_device_set_constant_buffers(ID3D10Device1 *iface, enum wined3d_shader_type type, + unsigned int start_slot, unsigned int buffer_count, ID3D10Buffer *const *buffers) { + struct wined3d_buffer *wined3d_buffers[D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT]; struct d3d_device *device = impl_from_ID3D10Device(iface); unsigned int i; - wined3d_mutex_lock(); + if (buffer_count > ARRAY_SIZE(wined3d_buffers)) + { + WARN("Buffer count %u exceeds limit; ignoring call.\n", buffer_count); + return; + } + for (i = 0; i < buffer_count; ++i) { struct d3d_buffer *buffer = unsafe_impl_from_ID3D10Buffer(buffers[i]); - wined3d_device_context_set_constant_buffer(device->immediate_context.wined3d_context, type, start_slot + i, - buffer ? buffer->wined3d_buffer : NULL); + wined3d_buffers[i] = buffer ? buffer->wined3d_buffer : NULL; } + + wined3d_mutex_lock(); + wined3d_device_context_set_constant_buffers(device->immediate_context.wined3d_context, + type, start_slot, buffer_count, wined3d_buffers); wined3d_mutex_unlock(); } diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index a7652380e16..712a20696a4 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -116,7 +116,7 @@ enum wined3d_cs_op WINED3D_CS_OP_SET_STREAM_SOURCE_FREQ, WINED3D_CS_OP_SET_STREAM_OUTPUT, WINED3D_CS_OP_SET_INDEX_BUFFER, - WINED3D_CS_OP_SET_CONSTANT_BUFFER, + WINED3D_CS_OP_SET_CONSTANT_BUFFERS, WINED3D_CS_OP_SET_TEXTURE, WINED3D_CS_OP_SET_SHADER_RESOURCE_VIEW, WINED3D_CS_OP_SET_UNORDERED_ACCESS_VIEW, @@ -282,12 +282,13 @@ struct wined3d_cs_set_index_buffer unsigned int offset; }; -struct wined3d_cs_set_constant_buffer +struct wined3d_cs_set_constant_buffers { enum wined3d_cs_op opcode; enum wined3d_shader_type type; - UINT cb_idx; - struct wined3d_buffer *buffer; + unsigned int start_idx; + unsigned int count; + struct wined3d_buffer *buffers[1]; }; struct wined3d_cs_set_texture @@ -603,7 +604,7 @@ static const char *debug_cs_op(enum wined3d_cs_op op) WINED3D_TO_STR(WINED3D_CS_OP_SET_STREAM_SOURCE_FREQ); WINED3D_TO_STR(WINED3D_CS_OP_SET_STREAM_OUTPUT); WINED3D_TO_STR(WINED3D_CS_OP_SET_INDEX_BUFFER); - WINED3D_TO_STR(WINED3D_CS_OP_SET_CONSTANT_BUFFER); + WINED3D_TO_STR(WINED3D_CS_OP_SET_CONSTANT_BUFFERS); WINED3D_TO_STR(WINED3D_CS_OP_SET_TEXTURE); WINED3D_TO_STR(WINED3D_CS_OP_SET_SHADER_RESOURCE_VIEW); WINED3D_TO_STR(WINED3D_CS_OP_SET_UNORDERED_ACCESS_VIEW); @@ -1535,32 +1536,40 @@ void wined3d_device_context_emit_set_index_buffer(struct wined3d_device_context wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } -static void wined3d_cs_exec_set_constant_buffer(struct wined3d_cs *cs, const void *data) +static void wined3d_cs_exec_set_constant_buffers(struct wined3d_cs *cs, const void *data) { - const struct wined3d_cs_set_constant_buffer *op = data; - struct wined3d_buffer *prev; + const struct wined3d_cs_set_constant_buffers *op = data; + unsigned int i; - prev = cs->state.cb[op->type][op->cb_idx]; - cs->state.cb[op->type][op->cb_idx] = op->buffer; + for (i = 0; i < op->count; ++i) + { + struct wined3d_buffer *prev = cs->state.cb[op->type][op->start_idx + i]; + struct wined3d_buffer *buffer = op->buffers[i]; - if (op->buffer) - InterlockedIncrement(&op->buffer->resource.bind_count); - if (prev) - InterlockedDecrement(&prev->resource.bind_count); + cs->state.cb[op->type][op->start_idx + i] = buffer; + + if (buffer) + InterlockedIncrement(&buffer->resource.bind_count); + if (prev) + InterlockedDecrement(&prev->resource.bind_count); + } device_invalidate_state(cs->c.device, STATE_CONSTANT_BUFFER(op->type)); } -void wined3d_device_context_emit_set_constant_buffer(struct wined3d_device_context *context, - enum wined3d_shader_type type, UINT cb_idx, struct wined3d_buffer *buffer) +void wined3d_device_context_emit_set_constant_buffers(struct wined3d_device_context *context, + enum wined3d_shader_type type, unsigned int start_idx, unsigned int count, + struct wined3d_buffer *const *buffers) { - struct wined3d_cs_set_constant_buffer *op; + struct wined3d_cs_set_constant_buffers *op; - op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); - op->opcode = WINED3D_CS_OP_SET_CONSTANT_BUFFER; + op = wined3d_device_context_require_space(context, offsetof(struct wined3d_cs_set_constant_buffers, buffers[count]), + WINED3D_CS_QUEUE_DEFAULT); + op->opcode = WINED3D_CS_OP_SET_CONSTANT_BUFFERS; op->type = type; - op->cb_idx = cb_idx; - op->buffer = buffer; + op->start_idx = start_idx; + op->count = count; + memcpy(op->buffers, buffers, count * sizeof(*buffers)); wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } @@ -2911,7 +2920,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_SET_STREAM_SOURCE_FREQ */ wined3d_cs_exec_set_stream_source_freq, /* WINED3D_CS_OP_SET_STREAM_OUTPUT */ wined3d_cs_exec_set_stream_output, /* WINED3D_CS_OP_SET_INDEX_BUFFER */ wined3d_cs_exec_set_index_buffer, - /* WINED3D_CS_OP_SET_CONSTANT_BUFFER */ wined3d_cs_exec_set_constant_buffer, + /* WINED3D_CS_OP_SET_CONSTANT_BUFFERS */ wined3d_cs_exec_set_constant_buffers, /* WINED3D_CS_OP_SET_TEXTURE */ wined3d_cs_exec_set_texture, /* WINED3D_CS_OP_SET_SHADER_RESOURCE_VIEW */ wined3d_cs_exec_set_shader_resource_view, /* WINED3D_CS_OP_SET_UNORDERED_ACCESS_VIEW */ wined3d_cs_exec_set_unordered_access_view, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c6b0c9f831e..f0aa9fbd250 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1696,8 +1696,7 @@ void CDECL wined3d_device_context_set_state(struct wined3d_device_context *conte for (i = 0; i < WINED3D_SHADER_TYPE_COUNT; ++i) { wined3d_device_context_emit_set_shader(context, i, state->shader[i]); - for (j = 0; j < MAX_CONSTANT_BUFFERS; ++j) - wined3d_device_context_emit_set_constant_buffer(context, i, j, state->cb[i][j]); + wined3d_device_context_emit_set_constant_buffers(context, i, 0, MAX_CONSTANT_BUFFERS, state->cb[i]); for (j = 0; j < MAX_SAMPLER_OBJECTS; ++j) { wined3d_device_context_emit_set_sampler(context, i, j, state->sampler[i][j]); @@ -1832,30 +1831,36 @@ struct wined3d_shader * CDECL wined3d_device_context_get_shader(const struct win return context->state->shader[type]; } -void CDECL wined3d_device_context_set_constant_buffer(struct wined3d_device_context *context, - enum wined3d_shader_type type, unsigned int idx, struct wined3d_buffer *buffer) +void CDECL wined3d_device_context_set_constant_buffers(struct wined3d_device_context *context, + enum wined3d_shader_type type, unsigned int start_idx, unsigned int count, + struct wined3d_buffer *const *buffers) { struct wined3d_state *state = context->state; - struct wined3d_buffer *prev; + unsigned int i; - TRACE("context %p, type %#x, idx %u, buffer %p.\n", context, type, idx, buffer); + TRACE("context %p, type %#x, start_idx %u, count %u, buffers %p.\n", context, type, start_idx, count, buffers); - if (idx >= MAX_CONSTANT_BUFFERS) + if (start_idx + count > MAX_CONSTANT_BUFFERS) { - WARN("Invalid constant buffer index %u.\n", idx); + WARN("Invalid constant buffer index %u, count %u.\n", start_idx, count); return; } - prev = state->cb[type][idx]; - if (buffer == prev) + if (!memcmp(buffers, &state->cb[type][start_idx], count * sizeof(*buffers))) return; - if (buffer) - wined3d_buffer_incref(buffer); - state->cb[type][idx] = buffer; - wined3d_device_context_emit_set_constant_buffer(context, type, idx, buffer); - if (prev) - wined3d_buffer_decref(prev); + wined3d_device_context_emit_set_constant_buffers(context, type, start_idx, count, buffers); + for (i = 0; i < count; ++i) + { + struct wined3d_buffer *prev = state->cb[type][start_idx + i]; + struct wined3d_buffer *buffer = buffers[i]; + + if (buffer) + wined3d_buffer_incref(buffer); + state->cb[type][start_idx + i] = buffer; + if (prev) + wined3d_buffer_decref(prev); + } } void CDECL wined3d_device_context_set_blend_state(struct wined3d_device_context *context, diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 1369fd4cf90..3f22af60689 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -122,7 +122,7 @@ @ cdecl wined3d_device_context_reset_state(ptr) @ cdecl wined3d_device_context_resolve_sub_resource(ptr ptr long ptr long long) @ cdecl wined3d_device_context_set_blend_state(ptr ptr ptr long) -@ cdecl wined3d_device_context_set_constant_buffer(ptr long long ptr) +@ cdecl wined3d_device_context_set_constant_buffers(ptr long long long ptr) @ cdecl wined3d_device_context_set_depth_stencil_state(ptr ptr long) @ cdecl wined3d_device_context_set_depth_stencil_view(ptr ptr) @ cdecl wined3d_device_context_set_index_buffer(ptr ptr long long) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 12f1d21e6a0..afdea25ded9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4788,8 +4788,9 @@ void wined3d_device_context_emit_set_blend_state(struct wined3d_device_context * unsigned int sample_mask) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_clip_plane(struct wined3d_device_context *context, unsigned int plane_idx, const struct wined3d_vec4 *plane) DECLSPEC_HIDDEN; -void wined3d_device_context_emit_set_constant_buffer(struct wined3d_device_context *context, - enum wined3d_shader_type type, UINT cb_idx, struct wined3d_buffer *buffer) DECLSPEC_HIDDEN; +void wined3d_device_context_emit_set_constant_buffers(struct wined3d_device_context *context, + enum wined3d_shader_type type, unsigned int start_idx, unsigned int count, + struct wined3d_buffer *const *buffers) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_depth_stencil_state(struct wined3d_device_context *context, struct wined3d_depth_stencil_state *state, unsigned int stencil_ref) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_depth_stencil_view(struct wined3d_device_context *context, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 7777e45ad21..2e01d27ed68 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2494,8 +2494,9 @@ void __cdecl wined3d_device_context_resolve_sub_resource(struct wined3d_device_c struct wined3d_resource *src_resource, unsigned int src_sub_resource_idx, enum wined3d_format_id format_id); void __cdecl wined3d_device_context_set_blend_state(struct wined3d_device_context *context, struct wined3d_blend_state *state, const struct wined3d_color *blend_factor, unsigned int sample_mask); -void __cdecl wined3d_device_context_set_constant_buffer(struct wined3d_device_context *context, - enum wined3d_shader_type type, unsigned int idx, struct wined3d_buffer *buffer); +void __cdecl wined3d_device_context_set_constant_buffers(struct wined3d_device_context *context, + enum wined3d_shader_type type, unsigned int start_idx, unsigned int count, + struct wined3d_buffer *const *buffers); void __cdecl wined3d_device_context_set_depth_stencil_state(struct wined3d_device_context *context, struct wined3d_depth_stencil_state *depth_stencil_state, unsigned int stencil_ref); HRESULT __cdecl wined3d_device_context_set_depth_stencil_view(struct wined3d_device_context *context, -- 2.30.2

2 16

[PATCH v3 1/8] wined3d: Store the framebuffer state inline in struct wined3d_cs_clear.
by Zebediah Figura May 27, 2021

May 27, 2021

Avoid storing pointers to the CS data inside individual ops, so that we can reallocate the queue when appending data to a deferred context, or copy the queue contents to a command list. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v3: actually identical to v2, but bumped to avoid the mess I just made. dlls/wined3d/cs.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 14076defaa9..8702ac08631 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -107,7 +107,7 @@ struct wined3d_cs_clear enum wined3d_cs_op opcode; DWORD flags; unsigned int rt_count; - struct wined3d_fb_state *fb; + struct wined3d_fb_state fb; RECT draw_rect; struct wined3d_color color; float depth; @@ -684,19 +684,19 @@ static void wined3d_cs_exec_clear(struct wined3d_cs *cs, const void *data) const struct wined3d_cs_clear *op = data; unsigned int i; - device->blitter->ops->blitter_clear(device->blitter, device, op->rt_count, op->fb, + device->blitter->ops->blitter_clear(device->blitter, device, op->rt_count, &op->fb, op->rect_count, op->rects, &op->draw_rect, op->flags, &op->color, op->depth, op->stencil); if (op->flags & WINED3DCLEAR_TARGET) { for (i = 0; i < op->rt_count; ++i) { - if (op->fb->render_targets[i]) - wined3d_resource_release(op->fb->render_targets[i]->resource); + if (op->fb.render_targets[i]) + wined3d_resource_release(op->fb.render_targets[i]->resource); } } if (op->flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) - wined3d_resource_release(op->fb->depth_stencil->resource); + wined3d_resource_release(op->fb.depth_stencil->resource); } void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT *rects, @@ -715,7 +715,7 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * op->opcode = WINED3D_CS_OP_CLEAR; op->flags = flags & (WINED3DCLEAR_TARGET | WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL); op->rt_count = rt_count; - op->fb = &cs->state.fb; + op->fb = state->fb; SetRect(&op->draw_rect, vp->x, vp->y, vp->x + vp->width, vp->y + vp->height); if (state->rasterizer_state && state->rasterizer_state->desc.scissor) IntersectRect(&op->draw_rect, &op->draw_rect, &state->scissor_rects[0]); @@ -746,24 +746,23 @@ void wined3d_device_context_emit_clear_rendertarget_view(struct wined3d_device_c struct wined3d_cs_clear *op; size_t size; - size = FIELD_OFFSET(struct wined3d_cs_clear, rects[1]) + sizeof(struct wined3d_fb_state); + size = FIELD_OFFSET(struct wined3d_cs_clear, rects[1]); op = wined3d_device_context_require_space(context, size, WINED3D_CS_QUEUE_DEFAULT); - op->fb = (void *)&op->rects[1]; op->opcode = WINED3D_CS_OP_CLEAR; op->flags = flags & (WINED3DCLEAR_TARGET | WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL); if (flags & WINED3DCLEAR_TARGET) { op->rt_count = 1; - op->fb->render_targets[0] = view; - op->fb->depth_stencil = NULL; + op->fb.render_targets[0] = view; + op->fb.depth_stencil = NULL; op->color = *color; } else { op->rt_count = 0; - op->fb->render_targets[0] = NULL; - op->fb->depth_stencil = view; + op->fb.render_targets[0] = NULL; + op->fb.depth_stencil = view; op->depth = depth; op->stencil = stencil; } -- 2.30.2

3 15

[PATCH] ntdll/tests: Don't consider zero 'AllFeatures' value in USD broken.
by Paul Gofman May 27, 2021

May 27, 2021

Both variants are observed on different computers with Win10. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/tests/virtual.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 22ee7f06ac7..e657a424fcd 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -957,8 +957,7 @@ static void test_user_shared_data(void) for (i = 0; i < ARRAY_SIZE(feature_sizes); ++i) { - ok(xstate.AllFeatures[i] == feature_sizes[i] - || broken(!xstate.AllFeatures[i]) /* win10 on Testbot VMs */, + ok(xstate.AllFeatures[i] == feature_sizes[i] || !xstate.AllFeatures[i], "Got unexpected AllFeatures[%u] %u, expected %u.\n", i, xstate.AllFeatures[i], feature_sizes[i]); ok(xstate.Features[i].Size == feature_sizes[i], "Got unexpected Features[%u].Size %u, expected %u.\n", i, -- 2.31.1

1 0

[PATCH v3] msxml3: Null check new child in insertBefore.
by Jefferson Carpenter May 27, 2021

May 27, 2021

1 1

[PATCH v3 1/3] server: Update system regs from set_thread_context handler only.
by Paul Gofman May 27, 2021

May 27, 2021

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Supersedes 206374-206376. v3: - replaced patch. server/thread.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/server/thread.c b/server/thread.c index 0c7f11c0da1..6de36d817c1 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1659,12 +1659,7 @@ DECL_HANDLER(select) current->context && current->suspend_cookie == req->cookie) { if (current->context->regs.flags) - { - unsigned int system_flags = get_context_system_regs(current->process->machine) & - current->context->regs.flags; - if (system_flags) set_thread_context( current, &current->context->regs, system_flags ); set_reply_data( &current->context->regs, sizeof(context_t) ); - } release_object( current->context ); current->context = NULL; } @@ -1870,7 +1865,7 @@ DECL_HANDLER(set_thread_context) unsigned int system_flags = get_context_system_regs( context->machine ) & context->flags; if (thread != current) stop_thread( thread ); - else if (system_flags) set_thread_context( thread, context, system_flags ); + if (system_flags) set_thread_context( thread, context, system_flags ); if (thread->context && !get_error()) { copy_context( &thread->context->regs, context, context->flags ); -- 2.31.1

1 2

[PATCH] shell32: Increase {cmd,parameter} buffer size to 2048.
by Haoyang Chen May 27, 2021

May 27, 2021

Avoid crashes caused by very long URLs. Signed-off-by: Haoyang Chen <chenhaoyang(a)uniontech.com> --- dlls/shell32/shlexec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index ce0b8f6d2be..e0b38a854d5 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -448,7 +448,7 @@ static BOOL SHELL_TryAppPathW( LPCWSTR szName, LPWSTR lpResult, WCHAR **env) '\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','A','p','p',' ','P','a','t','h','s','\\',0}; static const WCHAR wPath[] = {'P','a','t','h',0}; HKEY hkApp = 0; - WCHAR buffer[1024]; + WCHAR buffer[2048]; LONG len; LONG res; BOOL found = FALSE; @@ -991,7 +991,7 @@ static UINT_PTR execute_from_key(LPCWSTR key, LPCWSTR lpFile, WCHAR *env, LPCWST { static const WCHAR wCommand[] = {'c','o','m','m','a','n','d',0}; static const WCHAR wDdeexec[] = {'d','d','e','e','x','e','c',0}; - WCHAR cmd[256], param[1024], ddeexec[256]; + WCHAR cmd[256], param[2048], ddeexec[256]; LONG cmdlen = sizeof(cmd), ddeexeclen = sizeof(ddeexec); UINT_PTR retval = SE_ERR_NOASSOC; DWORD resultLen; @@ -1588,7 +1588,7 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) SEE_MASK_CONNECTNETDRV | SEE_MASK_FLAG_DDEWAIT | SEE_MASK_UNICODE | SEE_MASK_ASYNCOK | SEE_MASK_HMONITOR; - WCHAR parametersBuffer[1024], dirBuffer[MAX_PATH], wcmdBuffer[1024]; + WCHAR parametersBuffer[2048], dirBuffer[MAX_PATH], wcmdBuffer[2048]; WCHAR *wszApplicationName, *wszParameters, *wszDir, *wcmd = NULL; DWORD dwApplicationNameLen = MAX_PATH+2; DWORD parametersLen = ARRAY_SIZE(parametersBuffer); -- 2.20.1

1 0