- Wine-Devel - list.winehq.org

[PATCH v2 1/6] wined3d: Introduce wined3d_device_context_set_stream_output().
by Zebediah Figura March 26, 2021

March 26, 2021

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/device.c | 46 +++++++++++++++++++++++---------------- dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 30 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9766dfada2d..4041a7c0d7f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1224,27 +1224,9 @@ UINT CDECL wined3d_device_get_available_texture_mem(const struct wined3d_device void CDECL wined3d_device_set_stream_output(struct wined3d_device *device, UINT idx, struct wined3d_buffer *buffer, UINT offset) { - struct wined3d_stream_output *stream; - struct wined3d_buffer *prev_buffer; - TRACE("device %p, idx %u, buffer %p, offset %u.\n", device, idx, buffer, offset); - if (idx >= WINED3D_MAX_STREAM_OUTPUT_BUFFERS) - { - WARN("Invalid stream output %u.\n", idx); - return; - } - - stream = &device->cs->c.state->stream_output[idx]; - prev_buffer = stream->buffer; - - if (buffer) - wined3d_buffer_incref(buffer); - stream->buffer = buffer; - stream->offset = offset; - wined3d_device_context_emit_set_stream_output(&device->cs->c, idx, buffer, offset); - if (prev_buffer) - wined3d_buffer_decref(prev_buffer); + wined3d_device_context_set_stream_output(&device->cs->c, idx, buffer, offset); } struct wined3d_buffer * CDECL wined3d_device_get_stream_output(struct wined3d_device *device, @@ -2389,6 +2371,32 @@ void CDECL wined3d_device_context_set_vertex_declaration(struct wined3d_device_c wined3d_vertex_declaration_decref(prev); } +void CDECL wined3d_device_context_set_stream_output(struct wined3d_device_context *context, unsigned int idx, + struct wined3d_buffer *buffer, unsigned int offset) +{ + struct wined3d_stream_output *stream; + struct wined3d_buffer *prev_buffer; + + TRACE("context %p, idx %u, buffer %p, offset %u.\n", context, idx, buffer, offset); + + if (idx >= WINED3D_MAX_STREAM_OUTPUT_BUFFERS) + { + WARN("Invalid stream output %u.\n", idx); + return; + } + + stream = &context->state->stream_output[idx]; + prev_buffer = stream->buffer; + + if (buffer) + wined3d_buffer_incref(buffer); + stream->buffer = buffer; + stream->offset = offset; + wined3d_device_context_emit_set_stream_output(context, idx, buffer, offset); + if (prev_buffer) + wined3d_buffer_decref(prev_buffer); +} + void CDECL wined3d_device_set_vertex_shader(struct wined3d_device *device, struct wined3d_shader *shader) { TRACE("device %p, shader %p.\n", device, shader); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index fb9973354a0..289716d1ae2 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -178,6 +178,7 @@ @ cdecl wined3d_device_context_set_scissor_rects(ptr long ptr) @ cdecl wined3d_device_context_set_shader(ptr long ptr) @ cdecl wined3d_device_context_set_shader_resource_view(ptr long long ptr) +@ cdecl wined3d_device_context_set_stream_output(ptr long ptr long) @ cdecl wined3d_device_context_set_stream_source(ptr long ptr long long) @ cdecl wined3d_device_context_set_unordered_access_view(ptr long long ptr long) @ cdecl wined3d_device_context_set_vertex_declaration(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 1f8b4a89648..385ac7a8a07 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2579,6 +2579,8 @@ void __cdecl wined3d_device_context_set_shader(struct wined3d_device_context *co enum wined3d_shader_type type, struct wined3d_shader *shader); void __cdecl wined3d_device_context_set_shader_resource_view(struct wined3d_device_context *context, enum wined3d_shader_type type, unsigned int idx, struct wined3d_shader_resource_view *view); +void __cdecl wined3d_device_context_set_stream_output(struct wined3d_device_context *context, unsigned int idx, + struct wined3d_buffer *buffer, unsigned int offset); HRESULT __cdecl wined3d_device_context_set_stream_source(struct wined3d_device_context *context, unsigned int stream_idx, struct wined3d_buffer *buffer, unsigned int offset, unsigned int stride); void __cdecl wined3d_device_context_set_unordered_access_view(struct wined3d_device_context *context, -- 2.30.2

2 11

[PATCH 5/7] mshtml: Report user agent matching current compat mode.
by Jacek Caban March 26, 2021

March 26, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/omnavigator.c | 25 +++++++++++++++++++++++-- dlls/mshtml/tests/documentmode.js | 12 ++++++++++++ dlls/mshtml/tests/dom.c | 12 ++---------- 3 files changed, 37 insertions(+), 12 deletions(-)

2 1

[PATCH] dinput: Wait for the hook thread to exit when stopping it.
by Rémi Bernon March 26, 2021

March 26, 2021

FlatOut2 demo calls FreeLibrary on the dinput8 module more times than it has loaded it, and the module reference that the internal thread has is getting decremented before its exit. Having an internal window to destroy also makes it more likely to crash as it takes more time to exit calls the window procedure function. Waiting for the thread to complete when all the dinput instances are destroyed ensures that the thread isn't alive when the game frees the DLL, and prevents the thread from crashing. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50673 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This could be nicer by using two critical sections instead (one for the acquired devices and one for the hooks / dinput instance list), so the hook thread never enters dinput_hook_crit, and we could wait here inside it, but it's probably more future proof this way. dlls/dinput/dinput_main.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 45023fc104a..5da60cf1f7c 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -1861,6 +1861,7 @@ static BOOL check_hook_thread(void) { static HANDLE hook_thread; HMODULE module; + HANDLE wait_handle = NULL; EnterCriticalSection(&dinput_hook_crit); @@ -1884,11 +1885,17 @@ static BOOL check_hook_thread(void) hook_thread_id = 0; PostThreadMessageW(tid, WM_USER+0x10, 0, 0); - CloseHandle(hook_thread); + wait_handle = hook_thread; hook_thread = NULL; } LeaveCriticalSection(&dinput_hook_crit); + + if (wait_handle) + { + WaitForSingleObject(wait_handle, INFINITE); + CloseHandle(wait_handle); + } return hook_thread_id != 0; } -- 2.30.2

1 0

[PATCH 2/7] mshtml/tests: Allow typeof(localStorage) to be unknown.
by Jacek Caban March 26, 2021

March 26, 2021

Fixes tests on some win10 versions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/tests/dom.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

2 1

[PATCH resend2 1/3] kernel32: Print processor group in Get(Active|Maximum)ProcessorCount
by Alex Henrie March 26, 2021

March 26, 2021

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/kernel32/process.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 41a5b34af19..46ccb04b133 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -620,7 +620,7 @@ DWORD WINAPI GetActiveProcessorCount(WORD group) { DWORD cpus = system_info.NumberOfProcessors; - FIXME("semi-stub, returning %u\n", cpus); + FIXME("(0x%x): semi-stub, returning %u\n", group, cpus); return cpus; } @@ -631,7 +631,7 @@ DWORD WINAPI GetMaximumProcessorCount(WORD group) { DWORD cpus = system_info.NumberOfProcessors; - FIXME("semi-stub, returning %u\n", cpus); + FIXME("(0x%x): semi-stub, returning %u\n", group, cpus); return cpus; } -- 2.31.0

1 3

[PATCH 1/7] mshtml/tests: Allow error when loading an image in events.html.
by Jacek Caban March 26, 2021

March 26, 2021

Fixes tests on win8. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/tests/events.html | 4 ++++ 1 file changed, 4 insertions(+)

2 1

[PATCH 1/2] ntdll/tests: Add a test for segment register contents in x86_64 exception handlers.
by Zebediah Figura March 26, 2021

March 26, 2021

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/tests/exception.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index da88ca449fb..e2a8071168d 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -2812,7 +2812,7 @@ static void test___C_specific_handler(void) /* This is heavily based on the i386 exception tests. */ static const struct exception { - BYTE code[18]; /* asm code */ + BYTE code[24]; /* asm code */ BYTE offset; /* offset of faulting instruction */ BYTE length; /* length of faulting instruction */ NTSTATUS status; /* expected status code */ @@ -2921,6 +2921,14 @@ static const struct exception /* 35 */ { { 0xa3, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc3 }, /* movl %eax,0xffffffffffffffff; ret */ 0, 9, STATUS_ACCESS_VIOLATION, 2, { 1, 0xffffffffffffffff } }, + + /* test exception with cleared %ds and %es */ + { { 0x8c, 0xd8, 0x50, 0x8c, 0xc0, 0x50, 0x31, 0xc0, 0x8e, 0xd8, 0x8e, 0xc0, + 0xfa, 0x58, 0x8e, 0xc0, 0x58, 0x8e, 0xd8, 0xc3 }, + /* mov %ds,%eax; pushq %rax; mov %es,%eax; pushq %rax; xorl %eax,%eax; mov %eax,%ds; mov %eax,%es; + * cli; popq %rax; mov %eax,%es; popq %rax; mov %eax,%ds; ret */ + 12, 1, STATUS_PRIVILEGED_INSTRUCTION, 0 }, + { { 0xf1, 0x90, 0xc3 }, /* icebp; nop; ret */ 1, 1, STATUS_SINGLE_STEP, 0 }, { { 0xcd, 0x2c, 0xc3 }, @@ -2992,6 +3000,9 @@ static DWORD WINAPI handler( EXCEPTION_RECORD *rec, ULONG64 frame, "%u: Unexpected exception address %p/%p\n", entry, rec->ExceptionAddress, (char*)context->Rip ); + todo_wine ok( context->SegDs == context->SegSs, + "%u: ds %#x does not match ss %#x\n", entry, context->SegDs, context->SegSs ); + if (except->status == STATUS_BREAKPOINT && is_wow64) parameter_count = 1; else if (except->alt_status == 0 || rec->ExceptionCode != except->alt_status) -- 2.30.2

4 6

[tools] testbot/TestLauncher: Fix the spelling of an error message.
by Francois Gouget March 26, 2021

March 26, 2021

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/src/TestLauncher/TestLauncher.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/src/TestLauncher/TestLauncher.c b/testbot/src/TestLauncher/TestLauncher.c index cfd74ef7e..b024714ac 100644 --- a/testbot/src/TestLauncher/TestLauncher.c +++ b/testbot/src/TestLauncher/TestLauncher.c @@ -267,7 +267,7 @@ int main(int argc, char *argv[]) { if (GetFullPathNameA(argv[Arg], ARRAY_SIZE(TestExeFullName), TestExeFullName, &TestExeFileName) == 0) { - Error("Cauld not get the test executable full path %s (error %lu)\n", + Error("Could not get the test executable full path %s (error %lu)\n", argv[Arg], GetLastError()); return 1; } -- 2.20.1

1 0

[tools] testbot/TestWTBS: Fix a couple of typos in the documentation.
by Francois Gouget March 26, 2021

March 26, 2021

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/tests/TestWTBS | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 81b56c470..dcdd6ccee 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -675,8 +675,8 @@ there is no error one would declare an empty group such as below, though a g 0 tests.report.kernel32 Finally, note that while the error directives are inherited by subcategories, -they are not merged. So if if both win and win32 have error-matching -directives, win32 will not inherit anything from the win category. +they are not merged. So if both win and win32 have error-matching directives, +win32 will not inherit anything from the win category. =item <tasks.(report|log|testbot).Errors> @@ -873,8 +873,8 @@ Checks that the TestBot applied the patch and did not find it necessary to run make_requests and make_opengl. Finally, note that while the Grep* directives are inherited by subcategories, -they are not merged. So if if both win and win32 have Grep directives, win32 -will not inherit anything from the win category. +they are not merged. So if both win and win32 have Grep directives, win32 will +not inherit anything from the win category. =cut -- 2.20.1

1 0

[PATCH] ieframe/tests: Allow non-zero initial session counter value.
by Jacek Caban March 26, 2021

March 26, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ieframe/tests/webbrowser.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-)

1 0