July 2021 - Wine-devel - list.winehq.org

[PATCH 10/15] gdi32: Handle metafiles directly in Arc implementation.
by Jacek Caban 18 Jul '21

18 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 5 +++++ dlls/gdi32/mfdrv/graphics.c | 20 +++++++++++++++----- dlls/gdi32/mfdrv/init.c | 4 ++-- dlls/gdi32/mfdrv/metafiledrv.h | 4 ++-- dlls/gdi32/tests/metafile.c | 3 +++ 6 files changed, 29 insertions(+), 9 deletions(-)

2 1

[PATCH 15/15] gdi32: Handle EMFs directly in arc functions.
by Jacek Caban 17 Jul '21

17 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/dc.c | 60 ++--------------------------- dlls/gdi32/enhmfdrv/graphics.c | 70 +++++++--------------------------- dlls/gdi32/enhmfdrv/init.c | 8 ++-- dlls/gdi32/gdi_private.h | 3 ++ dlls/gdi32/gdidc.c | 28 ++++++++++++++ 5 files changed, 53 insertions(+), 116 deletions(-)

1 0

[PATCH 14/15] gdi32: Store graphics mode in DC_ATTR.
by Jacek Caban 17 Jul '21

17 Jul '21

1 0

[PATCH 13/15] gdi32: Handle EMFs directly in MoveToEx.
by Jacek Caban 17 Jul '21

17 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/dc.c | 13 +------------ dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/graphics.c | 7 ++++--- dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 4 ++++ 6 files changed, 11 insertions(+), 17 deletions(-)

1 0

[PATCH 08/15] gdi32: Handle metafiles directly in MoveToEx implementation.
by Jacek Caban 17 Jul '21

17 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 2 ++ dlls/gdi32/mfdrv/graphics.c | 6 +++--- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - dlls/gdi32/tests/metafile.c | 10 +++------- 6 files changed, 10 insertions(+), 12 deletions(-)

1 0

[PATCH v4 2/2] dbghelp: Initialize new structure members
by Alistair Leslie-Hughes 16 Jul '21

16 Jul '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dbghelp/module.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index cadb285accb..247aadcef0e 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -207,6 +207,8 @@ struct module* module_new(struct process* pcs, const WCHAR* name, module->module.TypeInfo = FALSE; module->module.SourceIndexed = FALSE; module->module.Publics = FALSE; + module->module.MachineType = 0; + module->module.Reserved = 0; module->reloc_delta = 0; module->type = type; @@ -1201,6 +1203,8 @@ BOOL WINAPI SymGetModuleInfo64(HANDLE hProcess, DWORD64 dwAddr, mi64.TypeInfo = miw64.TypeInfo; mi64.SourceIndexed = miw64.SourceIndexed; mi64.Publics = miw64.Publics; + mi64.MachineType = miw64.MachineType; + mi64.Reserved = miw64.Reserved; memcpy(ModuleInfo, &mi64, ModuleInfo->SizeOfStruct); -- 2.30.2

1 0

[PATCH v4 1/2] include: Updated _IMAGEHLP_MODULEW64 stucture
by Alistair Leslie-Hughes 16 Jul '21

16 Jul '21

This aligns the structure to the be the same found in the 10.0.19041.0 SDK. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/dbghelp.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/dbghelp.h b/include/dbghelp.h index 1b234899195..303c0109d1f 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -280,6 +280,8 @@ typedef struct _IMAGEHLP_MODULE64 BOOL TypeInfo; BOOL SourceIndexed; BOOL Publics; + DWORD MachineType; + DWORD Reserved; } IMAGEHLP_MODULE64, *PIMAGEHLP_MODULE64; typedef struct _IMAGEHLP_MODULEW64 @@ -307,6 +309,8 @@ typedef struct _IMAGEHLP_MODULEW64 BOOL TypeInfo; BOOL SourceIndexed; BOOL Publics; + DWORD MachineType; + DWORD Reserved; } IMAGEHLP_MODULEW64, *PIMAGEHLP_MODULEW64; #if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) -- 2.30.2

1 0

[PATCH 1/2] api-ms-win-core-console-l3-2-0: Add stub dll.
by Esdras Tarsis 16 Jul '21

16 Jul '21

Needed for Pickup Basketball VR. Signed-off-by: Esdras Tarsis <esdrastarsis(a)gmail.com> --- configure | 2 ++ configure.ac | 1 + .../Makefile.in | 1 + .../api-ms-win-core-console-l3-2-0.spec | 32 +++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 37 insertions(+) create mode 100644 dlls/api-ms-win-core-console-l3-2-0/Makefile.in create mode 100644 dlls/api-ms-win-core-console-l3-2-0/api-ms-win-core-console-l3-2-0.spec diff --git a/configure b/configure index 27a33234eb7..bf5c5b71992 100755 --- a/configure +++ b/configure @@ -936,6 +936,7 @@ enable_api_ms_win_core_comm_l1_1_0 enable_api_ms_win_core_console_l1_1_0 enable_api_ms_win_core_console_l1_2_0 enable_api_ms_win_core_console_l2_1_0 +enable_api_ms_win_core_console_l3_2_0 enable_api_ms_win_core_crt_l1_1_0 enable_api_ms_win_core_crt_l2_1_0 enable_api_ms_win_core_datetime_l1_1_0 @@ -20085,6 +20086,7 @@ wine_fn_config_makefile dlls/api-ms-win-core-comm-l1-1-0 enable_api_ms_win_core_ wine_fn_config_makefile dlls/api-ms-win-core-console-l1-1-0 enable_api_ms_win_core_console_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-console-l1-2-0 enable_api_ms_win_core_console_l1_2_0 wine_fn_config_makefile dlls/api-ms-win-core-console-l2-1-0 enable_api_ms_win_core_console_l2_1_0 +wine_fn_config_makefile dlls/api-ms-win-core-console-l3-2-0 enable_api_ms_win_core_console_l3_2_0 wine_fn_config_makefile dlls/api-ms-win-core-crt-l1-1-0 enable_api_ms_win_core_crt_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-crt-l2-1-0 enable_api_ms_win_core_crt_l2_1_0 wine_fn_config_makefile dlls/api-ms-win-core-datetime-l1-1-0 enable_api_ms_win_core_datetime_l1_1_0 diff --git a/configure.ac b/configure.ac index b889947b65b..084990c0cd6 100644 --- a/configure.ac +++ b/configure.ac @@ -2756,6 +2756,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-comm-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-console-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-console-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-console-l2-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-console-l3-2-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-crt-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-crt-l2-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-datetime-l1-1-0) diff --git a/dlls/api-ms-win-core-console-l3-2-0/Makefile.in b/dlls/api-ms-win-core-console-l3-2-0/Makefile.in new file mode 100644 index 00000000000..74f49d62710 --- /dev/null +++ b/dlls/api-ms-win-core-console-l3-2-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-console-l3-2-0.dll diff --git a/dlls/api-ms-win-core-console-l3-2-0/api-ms-win-core-console-l3-2-0.spec b/dlls/api-ms-win-core-console-l3-2-0/api-ms-win-core-console-l3-2-0.spec new file mode 100644 index 00000000000..a9923150866 --- /dev/null +++ b/dlls/api-ms-win-core-console-l3-2-0/api-ms-win-core-console-l3-2-0.spec @@ -0,0 +1,32 @@ +@ stdcall AddConsoleAliasA(str str str) kernel32.AddConsoleAliasA +@ stdcall AddConsoleAliasW(wstr wstr wstr) kernel32.AddConsoleAliasW +@ stdcall ExpungeConsoleCommandHistoryA(str) kernel32.ExpungeConsoleCommandHistoryA +@ stdcall ExpungeConsoleCommandHistoryW(wstr) kernel32.ExpungeConsoleCommandHistoryW +@ stub GetConsoleAliasA +@ stub GetConsoleAliasExesA +@ stdcall GetConsoleAliasExesLengthA() kernel32.GetConsoleAliasExesLengthA +@ stdcall GetConsoleAliasExesLengthW() kernel32.GetConsoleAliasExesLengthW +@ stub GetConsoleAliasExesW +@ stdcall GetConsoleAliasW(wstr ptr long wstr) kernel32.GetConsoleAliasW +@ stub GetConsoleAliasesA +@ stdcall GetConsoleAliasesLengthA(str) kernel32.GetConsoleAliasesLengthA +@ stdcall GetConsoleAliasesLengthW(wstr) kernel32.GetConsoleAliasesLengthW +@ stub GetConsoleAliasesW +@ stdcall GetConsoleCommandHistoryA(long long long) kernel32.GetConsoleCommandHistoryA +@ stdcall GetConsoleCommandHistoryLengthA(str) kernel32.GetConsoleCommandHistoryLengthA +@ stdcall GetConsoleCommandHistoryLengthW(wstr) kernel32.GetConsoleCommandHistoryLengthW +@ stdcall GetConsoleCommandHistoryW(long long long) kernel32.GetConsoleCommandHistoryW +@ stdcall GetConsoleDisplayMode(ptr) kernel32.GetConsoleDisplayMode +@ stdcall GetConsoleFontSize(long long) kernel32.GetConsoleFontSize +@ stub GetConsoleHistoryInfo +@ stdcall GetConsoleProcessList(ptr long) kernel32.GetConsoleProcessList +@ stub GetConsoleSelectionInfo +@ stdcall GetConsoleWindow() kernel32.GetConsoleWindow +@ stdcall GetCurrentConsoleFont(long long ptr) kernel32.GetCurrentConsoleFont +@ stdcall GetCurrentConsoleFontEx(long long ptr) kernel32.GetCurrentConsoleFontEx +@ stdcall GetNumberOfConsoleMouseButtons(ptr) kernel32.GetNumberOfConsoleMouseButtons +@ stdcall SetConsoleDisplayMode(long long ptr) kernel32.SetConsoleDisplayMode +@ stub SetConsoleHistoryInfo +@ stub SetConsoleNumberOfCommandsA +@ stub SetConsoleNumberOfCommandsW +@ stdcall SetCurrentConsoleFontEx(long long ptr) kernel32.SetCurrentConsoleFontEx diff --git a/tools/make_specfiles b/tools/make_specfiles index d782beb27d7..50d848b4ce8 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -232,6 +232,7 @@ my @dll_groups = "api-ms-win-core-console-l1-1-0", "api-ms-win-core-console-l1-2-0", "api-ms-win-core-console-l2-1-0", + "api-ms-win-core-console-l3-2-0", "api-ms-win-core-file-l1-1-0", "api-ms-win-core-file-l1-2-1", "api-ms-win-core-file-l1-2-0", -- 2.32.0

3 3

[PATCH v3 1/8] wined3d: Set the entire stream output state as a single CS operation.
by Zebediah Figura 16 Jul '21

16 Jul '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3d11/device.c | 29 +++++++++----------- dlls/wined3d/cs.c | 49 ++++++++++++++++------------------ dlls/wined3d/device.c | 40 +++++++++++---------------- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 10 ++----- include/wine/wined3d.h | 10 +++++-- 6 files changed, 63 insertions(+), 77 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 93df97e59ae..46e2c8ba67f 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1181,24 +1181,23 @@ static void STDMETHODCALLTYPE d3d11_device_context_OMSetDepthStencilState(ID3D11 static void STDMETHODCALLTYPE d3d11_device_context_SOSetTargets(ID3D11DeviceContext1 *iface, UINT buffer_count, ID3D11Buffer *const *buffers, const UINT *offsets) { + struct wined3d_stream_output outputs[WINED3D_MAX_STREAM_OUTPUT_BUFFERS] = {0}; struct d3d11_device_context *context = impl_from_ID3D11DeviceContext1(iface); unsigned int count, i; TRACE("iface %p, buffer_count %u, buffers %p, offsets %p.\n", iface, buffer_count, buffers, offsets); - count = min(buffer_count, D3D11_SO_BUFFER_SLOT_COUNT); - wined3d_mutex_lock(); + count = min(buffer_count, ARRAY_SIZE(outputs)); for (i = 0; i < count; ++i) { struct d3d_buffer *buffer = unsafe_impl_from_ID3D11Buffer(buffers[i]); - wined3d_device_context_set_stream_output(context->wined3d_context, i, - buffer ? buffer->wined3d_buffer : NULL, offsets ? offsets[i] : 0); - } - for (; i < D3D11_SO_BUFFER_SLOT_COUNT; ++i) - { - wined3d_device_context_set_stream_output(context->wined3d_context, i, NULL, 0); + outputs[i].buffer = buffer ? buffer->wined3d_buffer : NULL; + outputs[i].offset = offsets ? offsets[i] : 0; } + + wined3d_mutex_lock(); + wined3d_device_context_set_stream_outputs(context->wined3d_context, outputs); wined3d_mutex_unlock(); } @@ -4909,25 +4908,23 @@ static void STDMETHODCALLTYPE d3d10_device_OMSetDepthStencilState(ID3D10Device1 static void STDMETHODCALLTYPE d3d10_device_SOSetTargets(ID3D10Device1 *iface, UINT target_count, ID3D10Buffer *const *targets, const UINT *offsets) { + struct wined3d_stream_output outputs[WINED3D_MAX_STREAM_OUTPUT_BUFFERS] = {0}; struct d3d_device *device = impl_from_ID3D10Device(iface); unsigned int count, i; TRACE("iface %p, target_count %u, targets %p, offsets %p.\n", iface, target_count, targets, offsets); - count = min(target_count, D3D10_SO_BUFFER_SLOT_COUNT); - wined3d_mutex_lock(); + count = min(target_count, ARRAY_SIZE(outputs)); for (i = 0; i < count; ++i) { struct d3d_buffer *buffer = unsafe_impl_from_ID3D10Buffer(targets[i]); - wined3d_device_context_set_stream_output(device->immediate_context.wined3d_context, i, - buffer ? buffer->wined3d_buffer : NULL, offsets[i]); + outputs[i].buffer = buffer ? buffer->wined3d_buffer : NULL; + outputs[i].offset = offsets ? offsets[i] : 0; } - for (i = count; i < D3D10_SO_BUFFER_SLOT_COUNT; ++i) - { - wined3d_device_context_set_stream_output(device->immediate_context.wined3d_context, i, NULL, 0); - } + wined3d_mutex_lock(); + wined3d_device_context_set_stream_outputs(device->immediate_context.wined3d_context, outputs); wined3d_mutex_unlock(); } diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 3593e5bfb48..3ed814093c8 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -122,7 +122,7 @@ enum wined3d_cs_op WINED3D_CS_OP_SET_VERTEX_DECLARATION, WINED3D_CS_OP_SET_STREAM_SOURCE, WINED3D_CS_OP_SET_STREAM_SOURCE_FREQ, - WINED3D_CS_OP_SET_STREAM_OUTPUT, + WINED3D_CS_OP_SET_STREAM_OUTPUTS, WINED3D_CS_OP_SET_INDEX_BUFFER, WINED3D_CS_OP_SET_CONSTANT_BUFFERS, WINED3D_CS_OP_SET_TEXTURE, @@ -273,12 +273,10 @@ struct wined3d_cs_set_stream_source_freq UINT flags; }; -struct wined3d_cs_set_stream_output +struct wined3d_cs_set_stream_outputs { enum wined3d_cs_op opcode; - UINT stream_idx; - struct wined3d_buffer *buffer; - UINT offset; + struct wined3d_stream_output outputs[WINED3D_MAX_STREAM_OUTPUT_BUFFERS]; }; struct wined3d_cs_set_index_buffer @@ -607,7 +605,7 @@ static const char *debug_cs_op(enum wined3d_cs_op op) WINED3D_TO_STR(WINED3D_CS_OP_SET_VERTEX_DECLARATION); WINED3D_TO_STR(WINED3D_CS_OP_SET_STREAM_SOURCE); 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_STREAM_OUTPUTS); WINED3D_TO_STR(WINED3D_CS_OP_SET_INDEX_BUFFER); WINED3D_TO_STR(WINED3D_CS_OP_SET_CONSTANT_BUFFERS); WINED3D_TO_STR(WINED3D_CS_OP_SET_TEXTURE); @@ -1475,35 +1473,34 @@ void wined3d_cs_emit_set_stream_source_freq(struct wined3d_cs *cs, UINT stream_i wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); } -static void wined3d_cs_exec_set_stream_output(struct wined3d_cs *cs, const void *data) +static void wined3d_cs_exec_set_stream_outputs(struct wined3d_cs *cs, const void *data) { - const struct wined3d_cs_set_stream_output *op = data; - struct wined3d_stream_output *stream; - struct wined3d_buffer *prev; + const struct wined3d_cs_set_stream_outputs *op = data; + unsigned int i; - stream = &cs->state.stream_output[op->stream_idx]; - prev = stream->buffer; - stream->buffer = op->buffer; - stream->offset = op->offset; + for (i = 0; i < WINED3D_MAX_STREAM_OUTPUT_BUFFERS; ++i) + { + struct wined3d_buffer *prev = cs->state.stream_output[i].buffer; + struct wined3d_buffer *buffer = op->outputs[i].buffer; - if (op->buffer) - InterlockedIncrement(&op->buffer->resource.bind_count); - if (prev) - InterlockedDecrement(&prev->resource.bind_count); + if (buffer) + InterlockedIncrement(&buffer->resource.bind_count); + if (prev) + InterlockedDecrement(&prev->resource.bind_count); + } + memcpy(cs->state.stream_output, op->outputs, sizeof(op->outputs)); device_invalidate_state(cs->c.device, STATE_STREAM_OUTPUT); } -void wined3d_device_context_emit_set_stream_output(struct wined3d_device_context *context, unsigned int stream_idx, - struct wined3d_buffer *buffer, unsigned int offset) +void wined3d_device_context_emit_set_stream_outputs(struct wined3d_device_context *context, + const struct wined3d_stream_output outputs[WINED3D_MAX_STREAM_OUTPUT_BUFFERS]) { - struct wined3d_cs_set_stream_output *op; + struct wined3d_cs_set_stream_outputs *op; op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); - op->opcode = WINED3D_CS_OP_SET_STREAM_OUTPUT; - op->stream_idx = stream_idx; - op->buffer = buffer; - op->offset = offset; + op->opcode = WINED3D_CS_OP_SET_STREAM_OUTPUTS; + memcpy(op->outputs, outputs, sizeof(op->outputs)); wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } @@ -2932,7 +2929,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_SET_VERTEX_DECLARATION */ wined3d_cs_exec_set_vertex_declaration, /* WINED3D_CS_OP_SET_STREAM_SOURCE */ wined3d_cs_exec_set_stream_source, /* 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_STREAM_OUTPUTS */ wined3d_cs_exec_set_stream_outputs, /* WINED3D_CS_OP_SET_INDEX_BUFFER */ wined3d_cs_exec_set_index_buffer, /* WINED3D_CS_OP_SET_CONSTANT_BUFFERS */ wined3d_cs_exec_set_constant_buffers, /* WINED3D_CS_OP_SET_TEXTURE */ wined3d_cs_exec_set_texture, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index bb37f6aff51..7a78a271aa1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1676,11 +1676,7 @@ void CDECL wined3d_device_context_set_state(struct wined3d_device_context *conte wined3d_device_context_emit_set_depth_stencil_view(context, state->fb.depth_stencil); wined3d_device_context_emit_set_vertex_declaration(context, state->vertex_declaration); - for (i = 0; i < WINED3D_MAX_STREAM_OUTPUT_BUFFERS; ++i) - { - wined3d_device_context_emit_set_stream_output(context, i, - state->stream_output[i].buffer, state->stream_output[i].offset); - } + wined3d_device_context_emit_set_stream_outputs(context, state->stream_output); for (i = 0; i < WINED3D_MAX_STREAMS; ++i) { @@ -2334,30 +2330,26 @@ 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) +void CDECL wined3d_device_context_set_stream_outputs(struct wined3d_device_context *context, + const struct wined3d_stream_output outputs[WINED3D_MAX_STREAM_OUTPUT_BUFFERS]) { - struct wined3d_stream_output *stream; - struct wined3d_buffer *prev_buffer; + struct wined3d_state *state = context->state; + unsigned int i; - TRACE("context %p, idx %u, buffer %p, offset %u.\n", context, idx, buffer, offset); + TRACE("context %p, outputs %p.\n", context, outputs); - if (idx >= WINED3D_MAX_STREAM_OUTPUT_BUFFERS) + wined3d_device_context_emit_set_stream_outputs(context, outputs); + for (i = 0; i < WINED3D_MAX_STREAM_OUTPUT_BUFFERS; ++i) { - WARN("Invalid stream output %u.\n", idx); - return; + struct wined3d_buffer *prev_buffer = state->stream_output[i].buffer; + struct wined3d_buffer *buffer = outputs[i].buffer; + + if (buffer) + wined3d_buffer_incref(buffer); + state->stream_output[i] = outputs[i]; + if (prev_buffer) + wined3d_buffer_decref(prev_buffer); } - - 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_context_draw(struct wined3d_device_context *context, unsigned int start_vertex, diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 13c8b218b65..ccd941af7a7 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -136,7 +136,7 @@ @ cdecl wined3d_device_context_set_shader(ptr long ptr) @ cdecl wined3d_device_context_set_shader_resource_views(ptr long long long ptr) @ cdecl wined3d_device_context_set_state(ptr ptr) -@ cdecl wined3d_device_context_set_stream_output(ptr long ptr long) +@ cdecl wined3d_device_context_set_stream_outputs(ptr ptr) @ cdecl wined3d_device_context_set_stream_source(ptr long ptr long long) @ cdecl wined3d_device_context_set_unordered_access_views(ptr long long long ptr ptr) @ cdecl wined3d_device_context_set_vertex_declaration(ptr ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 36fdf56a73c..2708d5c7f32 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3660,12 +3660,6 @@ struct wined3d_rasterizer_state struct wine_rb_entry entry; }; -struct wined3d_stream_output -{ - struct wined3d_buffer *buffer; - UINT offset; -}; - #define LIGHTMAP_SIZE 43 #define LIGHTMAP_HASHFUNC(x) ((x) % LIGHTMAP_SIZE) @@ -4846,8 +4840,8 @@ void wined3d_device_context_emit_set_shader(struct wined3d_device_context *conte void wined3d_device_context_emit_set_shader_resource_views(struct wined3d_device_context *context, enum wined3d_shader_type type, unsigned int start_idx, unsigned int count, struct wined3d_shader_resource_view *const *views) DECLSPEC_HIDDEN; -void wined3d_device_context_emit_set_stream_output(struct wined3d_device_context *context, unsigned int stream_idx, - struct wined3d_buffer *buffer, unsigned int offset) DECLSPEC_HIDDEN; +void wined3d_device_context_emit_set_stream_outputs(struct wined3d_device_context *context, + const struct wined3d_stream_output outputs[WINED3D_MAX_STREAM_OUTPUT_BUFFERS]) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_stream_source(struct wined3d_device_context *context, unsigned int stream_idx, struct wined3d_buffer *buffer, unsigned int offset, unsigned int stride) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_texture(struct wined3d_device_context *context, unsigned int stage, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 21b9e01efd0..1369fffddf3 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2212,6 +2212,12 @@ struct wined3d_stateblock_state struct wined3d_light_state *light_state; }; +struct wined3d_stream_output +{ + struct wined3d_buffer *buffer; + unsigned int offset; +}; + struct wined3d_parent_ops { void (__stdcall *wined3d_object_destroyed)(void *parent); @@ -2523,8 +2529,8 @@ void __cdecl wined3d_device_context_set_shader_resource_views(struct wined3d_dev enum wined3d_shader_type type, unsigned int start_idx, unsigned int count, struct wined3d_shader_resource_view *const *views); void __cdecl wined3d_device_context_set_state(struct wined3d_device_context *context, struct wined3d_state *state); -void __cdecl wined3d_device_context_set_stream_output(struct wined3d_device_context *context, unsigned int idx, - struct wined3d_buffer *buffer, unsigned int offset); +void __cdecl wined3d_device_context_set_stream_outputs(struct wined3d_device_context *context, + const struct wined3d_stream_output outputs[WINED3D_MAX_STREAM_OUTPUT_BUFFERS]); 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_views(struct wined3d_device_context *context, -- 2.30.2

4 19

[PATCH] ntdll: Use a separate +unwind debug channel for unwinding on x86-64.
by Zebediah Figura 16 Jul '21

16 Jul '21

Constant spam from unwinding routines makes +seh logs hard to read, especially for programs that throw a lot of exceptions as part of normal execution. Since unwind information is rarely useful, don't display it unless specifically requested. Make +unwind the default channel in these files, though, since there are more unwind messages than exception messages. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntdll/signal_x86_64.c | 72 +++++++++++++++++---------------- dlls/ntdll/unix/signal_x86_64.c | 41 ++++++++++--------- 2 files changed, 58 insertions(+), 55 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 19146aea40b..de0eca6c11c 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -34,7 +34,8 @@ #include "ntdll_misc.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(seh); +WINE_DEFAULT_DEBUG_CHANNEL(unwind); +WINE_DECLARE_DEBUG_CHANNEL(seh); typedef struct _SCOPE_TABLE { @@ -366,10 +367,10 @@ static DWORD call_handler( EXCEPTION_RECORD *rec, CONTEXT *context, DISPATCHER_C frame.Handler = nested_exception_handler; __wine_push_frame( &frame ); - TRACE( "calling handler %p (rec=%p, frame=%p context=%p, dispatch=%p)\n", - dispatch->LanguageHandler, rec, (void *)dispatch->EstablisherFrame, dispatch->ContextRecord, dispatch ); + TRACE_(seh)( "calling handler %p (rec=%p, frame=%p context=%p, dispatch=%p)\n", + dispatch->LanguageHandler, rec, (void *)dispatch->EstablisherFrame, dispatch->ContextRecord, dispatch ); res = dispatch->LanguageHandler( rec, (void *)dispatch->EstablisherFrame, context, dispatch ); - TRACE( "handler at %p returned %u\n", dispatch->LanguageHandler, res ); + TRACE_(seh)( "handler at %p returned %u\n", dispatch->LanguageHandler, res ); rec->ExceptionFlags &= EH_NONCONTINUABLE; __wine_pop_frame( &frame ); @@ -388,10 +389,10 @@ static DWORD call_teb_handler( EXCEPTION_RECORD *rec, CONTEXT *context, DISPATCH { DWORD res; - TRACE( "calling TEB handler %p (rec=%p, frame=%p context=%p, dispatch=%p)\n", - teb_frame->Handler, rec, teb_frame, dispatch->ContextRecord, dispatch ); + TRACE_(seh)( "calling TEB handler %p (rec=%p, frame=%p context=%p, dispatch=%p)\n", + teb_frame->Handler, rec, teb_frame, dispatch->ContextRecord, dispatch ); res = teb_frame->Handler( rec, teb_frame, context, (EXCEPTION_REGISTRATION_RECORD**)dispatch ); - TRACE( "handler at %p returned %u\n", teb_frame->Handler, res ); + TRACE_(seh)( "handler at %p returned %u\n", teb_frame->Handler, res ); return res; } @@ -427,8 +428,8 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_contex dispatch.EstablisherFrame < (ULONG64)NtCurrentTeb()->Tib.StackLimit || dispatch.EstablisherFrame > (ULONG64)NtCurrentTeb()->Tib.StackBase) { - ERR( "invalid frame %p (%p-%p)\n", (void *)dispatch.EstablisherFrame, - NtCurrentTeb()->Tib.StackLimit, NtCurrentTeb()->Tib.StackBase ); + ERR_(seh)( "invalid frame %p (%p-%p)\n", (void *)dispatch.EstablisherFrame, + NtCurrentTeb()->Tib.StackLimit, NtCurrentTeb()->Tib.StackBase ); rec->ExceptionFlags |= EH_STACK_INVALID; break; } @@ -443,7 +444,7 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_contex case ExceptionContinueSearch: break; case ExceptionNestedException: - FIXME( "nested exception\n" ); + FIXME_(seh)( "nested exception\n" ); break; case ExceptionCollidedUnwind: { ULONG64 frame; @@ -462,8 +463,8 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_contex /* hack: call wine handlers registered in the tib list */ else while ((ULONG64)teb_frame < context.Rsp) { - TRACE( "found wine frame %p rsp %p handler %p\n", - teb_frame, (void *)context.Rsp, teb_frame->Handler ); + TRACE_(seh)( "found wine frame %p rsp %p handler %p\n", + teb_frame, (void *)context.Rsp, teb_frame->Handler ); dispatch.EstablisherFrame = (ULONG64)teb_frame; switch (call_teb_handler( rec, orig_context, &dispatch, teb_frame )) { @@ -473,7 +474,7 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_contex case ExceptionContinueSearch: break; case ExceptionNestedException: - FIXME( "nested exception\n" ); + FIXME_(seh)( "nested exception\n" ); break; case ExceptionCollidedUnwind: { ULONG64 frame; @@ -503,9 +504,9 @@ NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) NTSTATUS status; DWORD c; - TRACE( "code=%x flags=%x addr=%p ip=%p tid=%04x\n", - rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, - (void *)context->Rip, GetCurrentThreadId() ); + TRACE_(seh)( "code=%x flags=%x addr=%p ip=%p tid=%04x\n", + rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, + (void *)context->Rip, GetCurrentThreadId() ); for (c = 0; c < min( EXCEPTION_MAXIMUM_PARAMETERS, rec->NumberParameters ); c++) TRACE( " info[%d]=%016I64x\n", c, rec->ExceptionInformation[c] ); @@ -522,31 +523,32 @@ NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) } else if (rec->ExceptionCode == EXCEPTION_WINE_NAME_THREAD && rec->ExceptionInformation[0] == 0x1000) { - WARN( "Thread %04x renamed to %s\n", (DWORD)rec->ExceptionInformation[2], debugstr_a((char *)rec->ExceptionInformation[1]) ); + WARN_(seh)( "Thread %04x renamed to %s\n", (DWORD)rec->ExceptionInformation[2], + debugstr_a((char *)rec->ExceptionInformation[1]) ); } else if (rec->ExceptionCode == DBG_PRINTEXCEPTION_C) { - WARN( "%s\n", debugstr_an((char *)rec->ExceptionInformation[1], rec->ExceptionInformation[0] - 1) ); + WARN_(seh)( "%s\n", debugstr_an((char *)rec->ExceptionInformation[1], rec->ExceptionInformation[0] - 1) ); } else if (rec->ExceptionCode == DBG_PRINTEXCEPTION_WIDE_C) { - WARN( "%s\n", debugstr_wn((WCHAR *)rec->ExceptionInformation[1], rec->ExceptionInformation[0] - 1) ); + WARN_(seh)( "%s\n", debugstr_wn((WCHAR *)rec->ExceptionInformation[1], rec->ExceptionInformation[0] - 1) ); } else { if (rec->ExceptionCode == STATUS_ASSERTION_FAILURE) - ERR( "%s exception (code=%x) raised\n", debugstr_exception_code(rec->ExceptionCode), rec->ExceptionCode ); + ERR_(seh)( "%s exception (code=%x) raised\n", debugstr_exception_code(rec->ExceptionCode), rec->ExceptionCode ); else - WARN( "%s exception (code=%x) raised\n", debugstr_exception_code(rec->ExceptionCode), rec->ExceptionCode ); + WARN_(seh)( "%s exception (code=%x) raised\n", debugstr_exception_code(rec->ExceptionCode), rec->ExceptionCode ); - TRACE(" rax=%016I64x rbx=%016I64x rcx=%016I64x rdx=%016I64x\n", - context->Rax, context->Rbx, context->Rcx, context->Rdx ); - TRACE(" rsi=%016I64x rdi=%016I64x rbp=%016I64x rsp=%016I64x\n", - context->Rsi, context->Rdi, context->Rbp, context->Rsp ); - TRACE(" r8=%016I64x r9=%016I64x r10=%016I64x r11=%016I64x\n", - context->R8, context->R9, context->R10, context->R11 ); - TRACE(" r12=%016I64x r13=%016I64x r14=%016I64x r15=%016I64x\n", - context->R12, context->R13, context->R14, context->R15 ); + TRACE_(seh)( " rax=%016I64x rbx=%016I64x rcx=%016I64x rdx=%016I64x\n", + context->Rax, context->Rbx, context->Rcx, context->Rdx ); + TRACE_(seh)( " rsi=%016I64x rdi=%016I64x rbp=%016I64x rsp=%016I64x\n", + context->Rsi, context->Rdi, context->Rbp, context->Rsp ); + TRACE_(seh)( " r8=%016I64x r9=%016I64x r10=%016I64x r11=%016I64x\n", + context->R8, context->R9, context->R10, context->R11 ); + TRACE_(seh)( " r12=%016I64x r13=%016I64x r14=%016I64x r15=%016I64x\n", + context->R12, context->R13, context->R14, context->R15 ); } /* Legends of Runeterra depends on having SegDs == SegSs in an exception @@ -1184,18 +1186,18 @@ void CDECL RtlRestoreContext( CONTEXT *context, EXCEPTION_RECORD *rec ) else if (rec && rec->ExceptionCode == STATUS_UNWIND_CONSOLIDATE && rec->NumberParameters >= 1) { PVOID (CALLBACK *consolidate)(EXCEPTION_RECORD *) = (void *)rec->ExceptionInformation[0]; - TRACE( "calling consolidate callback %p (rec=%p)\n", consolidate, rec ); + TRACE_(seh)( "calling consolidate callback %p (rec=%p)\n", consolidate, rec ); context->Rip = (ULONG64)call_consolidate_callback( context, consolidate, rec ); } /* hack: remove no longer accessible TEB frames */ while ((ULONG64)teb_frame < context->Rsp) { - TRACE( "removing TEB frame: %p\n", teb_frame ); + TRACE_(seh)( "removing TEB frame: %p\n", teb_frame ); teb_frame = __wine_pop_frame( teb_frame ); } - TRACE( "returning to %p stack %p\n", (void *)context->Rip, (void *)context->Rsp ); + TRACE_(seh)( "returning to %p stack %p\n", (void *)context->Rip, (void *)context->Rsp ); NtContinue( context, FALSE ); } @@ -1358,7 +1360,7 @@ EXCEPTION_DISPOSITION WINAPI __C_specific_handler( EXCEPTION_RECORD *rec, SCOPE_TABLE *table = dispatch->HandlerData; ULONG i; - TRACE( "%p %p %p %p\n", rec, frame, context, dispatch ); + TRACE_(seh)( "%p %p %p %p\n", rec, frame, context, dispatch ); if (TRACE_ON(seh)) dump_scope_table( dispatch->ImageBase, table ); if (rec->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND)) @@ -1382,7 +1384,7 @@ EXCEPTION_DISPOSITION WINAPI __C_specific_handler( EXCEPTION_RECORD *rec, handler = (PTERMINATION_HANDLER)(dispatch->ImageBase + table->ScopeRecord[i].HandlerAddress); dispatch->ScopeIndex = i+1; - TRACE( "calling __finally %p frame %p\n", handler, frame ); + TRACE_(seh)( "calling __finally %p frame %p\n", handler, frame ); handler( TRUE, frame ); } } @@ -1403,7 +1405,7 @@ EXCEPTION_DISPOSITION WINAPI __C_specific_handler( EXCEPTION_RECORD *rec, filter = (PEXCEPTION_FILTER)(dispatch->ImageBase + table->ScopeRecord[i].HandlerAddress); ptrs.ExceptionRecord = rec; ptrs.ContextRecord = context; - TRACE( "calling filter %p ptrs %p frame %p\n", filter, &ptrs, frame ); + TRACE_(seh)( "calling filter %p ptrs %p frame %p\n", filter, &ptrs, frame ); switch (filter( &ptrs, frame )) { case EXCEPTION_EXECUTE_HANDLER: diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 6b668508d80..2769ebf24d6 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -81,7 +81,8 @@ #include "unix_private.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(seh); +WINE_DEFAULT_DEBUG_CHANNEL(unwind); +WINE_DECLARE_DEBUG_CHANNEL(seh); /*********************************************************************** * signal context platform-specific definitions @@ -2404,23 +2405,23 @@ static BOOL handle_syscall_fault( ucontext_t *sigcontext, EXCEPTION_RECORD *rec, if (!is_inside_syscall( sigcontext )) return FALSE; - TRACE( "code=%x flags=%x addr=%p ip=%lx tid=%04x\n", - rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, - context->Rip, GetCurrentThreadId() ); + TRACE_(seh)( "code=%x flags=%x addr=%p ip=%lx tid=%04x\n", + rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, + context->Rip, GetCurrentThreadId() ); for (i = 0; i < rec->NumberParameters; i++) - TRACE( " info[%d]=%016lx\n", i, rec->ExceptionInformation[i] ); - TRACE(" rax=%016lx rbx=%016lx rcx=%016lx rdx=%016lx\n", - context->Rax, context->Rbx, context->Rcx, context->Rdx ); - TRACE(" rsi=%016lx rdi=%016lx rbp=%016lx rsp=%016lx\n", - context->Rsi, context->Rdi, context->Rbp, context->Rsp ); - TRACE(" r8=%016lx r9=%016lx r10=%016lx r11=%016lx\n", - context->R8, context->R9, context->R10, context->R11 ); - TRACE(" r12=%016lx r13=%016lx r14=%016lx r15=%016lx\n", - context->R12, context->R13, context->R14, context->R15 ); + TRACE_(seh)( " info[%d]=%016lx\n", i, rec->ExceptionInformation[i] ); + TRACE_(seh)( " rax=%016lx rbx=%016lx rcx=%016lx rdx=%016lx\n", + context->Rax, context->Rbx, context->Rcx, context->Rdx ); + TRACE_(seh)( " rsi=%016lx rdi=%016lx rbp=%016lx rsp=%016lx\n", + context->Rsi, context->Rdi, context->Rbp, context->Rsp ); + TRACE_(seh)( " r8=%016lx r9=%016lx r10=%016lx r11=%016lx\n", + context->R8, context->R9, context->R10, context->R11 ); + TRACE_(seh)( " r12=%016lx r13=%016lx r14=%016lx r15=%016lx\n", + context->R12, context->R13, context->R14, context->R15 ); if (ntdll_get_thread_data()->jmp_buf) { - TRACE( "returning to handler\n" ); + TRACE_(seh)( "returning to handler\n" ); RCX_sig(sigcontext) = (ULONG_PTR)ntdll_get_thread_data()->jmp_buf; RDX_sig(sigcontext) = 1; RIP_sig(sigcontext) = (ULONG_PTR)__wine_longjmp; @@ -2428,7 +2429,7 @@ static BOOL handle_syscall_fault( ucontext_t *sigcontext, EXCEPTION_RECORD *rec, } else { - TRACE( "returning to user mode ip=%016lx ret=%08x\n", frame->rip, rec->ExceptionCode ); + TRACE_(seh)( "returning to user mode ip=%016lx ret=%08x\n", frame->rip, rec->ExceptionCode ); RCX_sig(sigcontext) = (ULONG_PTR)frame; RDX_sig(sigcontext) = rec->ExceptionCode; RIP_sig(sigcontext) = (ULONG_PTR)__wine_syscall_dispatcher_return; @@ -2451,8 +2452,8 @@ static BOOL handle_syscall_trap( ucontext_t *sigcontext ) if ((void *)RIP_sig( sigcontext ) != __wine_syscall_dispatcher) return FALSE; - TRACE( "ignoring trap in syscall rip=%p eflags=%08x\n", - (void *)RIP_sig(sigcontext), (ULONG)EFL_sig(sigcontext) ); + TRACE_(seh)( "ignoring trap in syscall rip=%p eflags=%08x\n", + (void *)RIP_sig(sigcontext), (ULONG)EFL_sig(sigcontext) ); frame->rip = *(ULONG64 *)RSP_sig( sigcontext ); frame->eflags = EFL_sig(sigcontext); @@ -2528,7 +2529,7 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec.ExceptionCode = EXCEPTION_DATATYPE_MISALIGNMENT; break; default: - ERR( "Got unexpected trap %ld\n", (ULONG_PTR)TRAP_sig(ucontext) ); + ERR_(seh)( "Got unexpected trap %ld\n", (ULONG_PTR)TRAP_sig(ucontext) ); /* fall through */ case TRAP_x86_NMI: /* NMI interrupt */ case TRAP_x86_DNA: /* Device not available exception */ @@ -2832,7 +2833,7 @@ void signal_init_thread( TEB *teb ) #ifdef __GNUC__ __asm__ volatile ("fninit; fldcw %0" : : "m" (fpu_cw)); #else - FIXME("FPU setup not implemented for this platform.\n"); + FIXME_(seh)("FPU setup not implemented for this platform.\n"); #endif } @@ -2868,7 +2869,7 @@ void signal_init_process(void) __wine_syscall_flags |= SYSCALL_HAVE_PTHREAD_TEB; if (getauxval( AT_HWCAP2 ) & 2) __wine_syscall_flags |= SYSCALL_HAVE_WRFSGSBASE; } - else ERR( "failed to allocate %%fs selector\n" ); + else ERR_(seh)( "failed to allocate %%fs selector\n" ); } #endif -- 2.30.2

1 0