June 2020 - Wine-devel - list.winehq.org

[PATCH 1/6] winedbg: Remove support for PPC32
by André Hentschel 17 Jun '20

17 Jun '20

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- programs/winedbg/Makefile.in | 1 - programs/winedbg/be_ppc.c | 305 ---------------------------------- programs/winedbg/gdbproxy.c | 4 - programs/winedbg/tgt_active.c | 2 - programs/winedbg/winedbg.c | 4 - 5 files changed, 316 deletions(-) delete mode 100644 programs/winedbg/be_ppc.c diff --git a/programs/winedbg/Makefile.in b/programs/winedbg/Makefile.in index 22c4cd23e85..ca60d566288 100644 --- a/programs/winedbg/Makefile.in +++ b/programs/winedbg/Makefile.in @@ -8,7 +8,6 @@ C_SRCS = \ be_arm.c \ be_arm64.c \ be_i386.c \ - be_ppc.c \ be_x86_64.c \ break.c \ crashdlg.c \ diff --git a/programs/winedbg/be_ppc.c b/programs/winedbg/be_ppc.c deleted file mode 100644 index 2057590d94e..00000000000 --- a/programs/winedbg/be_ppc.c +++ /dev/null @@ -1,305 +0,0 @@ -/* - * Debugger Power PC specific functions - * - * Copyright 2000-2003 Marcus Meissner - * 2004 Eric Pouech - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "debugger.h" - -#if defined(__powerpc__) - -static BOOL be_ppc_get_addr(HANDLE hThread, const dbg_ctx_t *ctx, - enum be_cpu_addr bca, ADDRESS64* addr) -{ - switch (bca) - { - case be_cpu_addr_pc: - return be_cpu_build_addr(hThread, ctx, addr, 0, ctx->ctx.Iar); - default: - case be_cpu_addr_stack: - case be_cpu_addr_frame: - dbg_printf("not done\n"); - } - return FALSE; -} - -static BOOL be_ppc_get_register_info(int regno, enum be_cpu_addr* kind) -{ - dbg_printf("not done\n"); - return FALSE; -} - -static void be_ppc_single_step(dbg_ctx_t *ctx, BOOL enable) -{ -#ifndef MSR_SE -# define MSR_SE (1<<10) -#endif - if (enable) ctx->ctx.Msr |= MSR_SE; - else ctx->ctx.Msr &= ~MSR_SE; -} - -static void be_ppc_print_context(HANDLE hThread, const dbg_ctx_t *ctx, int all_regs) -{ - dbg_printf("Context printing for PPC not done yet\n"); -} - -static void be_ppc_print_segment_info(HANDLE hThread, const dbg_ctx_t *ctx) -{ -} - -static struct dbg_internal_var be_ppc_ctx[] = -{ - {0, NULL, 0, dbg_itype_none} -}; - -static BOOL be_ppc_is_step_over_insn(const void* insn) -{ - dbg_printf("not done\n"); - return FALSE; -} - -static BOOL be_ppc_is_function_return(const void* insn) -{ - dbg_printf("not done\n"); - return FALSE; -} - -static BOOL be_ppc_is_break_insn(const void* insn) -{ - dbg_printf("not done\n"); - return FALSE; -} - -static BOOL be_ppc_is_func_call(const void* insn, ADDRESS64* callee) -{ - return FALSE; -} - -static BOOL be_ppc_is_jump(const void* insn, ADDRESS64* jumpee) -{ - return FALSE; -} - -static void be_ppc_disasm_one_insn(ADDRESS64* addr, int display) - -{ - dbg_printf("Disasm NIY\n"); -} - -static BOOL be_ppc_insert_Xpoint(HANDLE hProcess, const struct be_process_io* pio, - dbg_ctx_t *ctx, enum be_xpoint_type type, - void* addr, unsigned long* val, unsigned size) -{ - unsigned long xbp; - SIZE_T sz; - - switch (type) - { - case be_xpoint_break: - if (!size) return FALSE; - if (!pio->read(hProcess, addr, val, 4, &sz) || sz != 4) return FALSE; - xbp = 0x7d821008; /* 7d 82 10 08 ... in big endian */ - if (!pio->write(hProcess, addr, &xbp, 4, &sz) || sz != 4) return FALSE; - break; - default: - dbg_printf("Unknown/unsupported bp type %c\n", type); - return FALSE; - } - return TRUE; -} - -static BOOL be_ppc_remove_Xpoint(HANDLE hProcess, const struct be_process_io* pio, - dbg_ctx_t *ctx, enum be_xpoint_type type, - void* addr, unsigned long val, unsigned size) -{ - SIZE_T sz; - - switch (type) - { - case be_xpoint_break: - if (!size) return FALSE; - if (!pio->write(hProcess, addr, &val, 4, &sz) || sz == 4) return FALSE; - break; - default: - dbg_printf("Unknown/unsupported bp type %c\n", type); - return FALSE; - } - return TRUE; -} - -static BOOL be_ppc_is_watchpoint_set(const dbg_ctx_t *ctx, unsigned idx) -{ - dbg_printf("not done\n"); - return FALSE; -} - -static void be_ppc_clear_watchpoint(dbg_ctx_t *ctx, unsigned idx) -{ - dbg_printf("not done\n"); -} - -static int be_ppc_adjust_pc_for_break(dbg_ctx_t *ctx, BOOL way) -{ - dbg_printf("not done\n"); - return 0; -} - -static BOOL be_ppc_fetch_integer(const struct dbg_lvalue* lvalue, unsigned size, - BOOL is_signed, LONGLONG* ret) -{ - dbg_printf("not done\n"); - return FALSE; -} - -static BOOL be_ppc_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, - long double* ret) -{ - dbg_printf("not done\n"); - return FALSE; -} - -static BOOL be_ppc_store_integer(const struct dbg_lvalue* lvalue, unsigned size, - BOOL is_signed, LONGLONG val) -{ - dbg_printf("be_ppc_store_integer: not done\n"); - return FALSE; -} - -static BOOL be_ppc_get_context(HANDLE thread, dbg_ctx_t *ctx) -{ - ctx->ctx.ContextFlags = CONTEXT_ALL; - return GetThreadContext(thread, &ctx->ctx); -} - -static BOOL be_ppc_set_context(HANDLE thread, const dbg_ctx_t *ctx) -{ - return SetThreadContext(thread, &ctx->ctx); -} - -#define REG(f,n,t,r) {f, n, t, FIELD_OFFSET(CONTEXT, r), sizeof(((CONTEXT*)NULL)->r)} - -static struct gdb_register be_ppc_gdb_register_map[] = { - REG("core", "r0", NULL, Gpr0), - REG(NULL, "r1", NULL, Gpr1), - REG(NULL, "r2", NULL, Gpr2), - REG(NULL, "r3", NULL, Gpr3), - REG(NULL, "r4", NULL, Gpr4), - REG(NULL, "r5", NULL, Gpr5), - REG(NULL, "r6", NULL, Gpr6), - REG(NULL, "r7", NULL, Gpr7), - REG(NULL, "r8", NULL, Gpr8), - REG(NULL, "r9", NULL, Gpr9), - REG(NULL, "r10", NULL, Gpr10), - REG(NULL, "r11", NULL, Gpr11), - REG(NULL, "r12", NULL, Gpr12), - REG(NULL, "r13", NULL, Gpr13), - REG(NULL, "r14", NULL, Gpr14), - REG(NULL, "r15", NULL, Gpr15), - REG(NULL, "r16", NULL, Gpr16), - REG(NULL, "r17", NULL, Gpr17), - REG(NULL, "r18", NULL, Gpr18), - REG(NULL, "r19", NULL, Gpr19), - REG(NULL, "r20", NULL, Gpr20), - REG(NULL, "r21", NULL, Gpr21), - REG(NULL, "r22", NULL, Gpr22), - REG(NULL, "r23", NULL, Gpr23), - REG(NULL, "r24", NULL, Gpr24), - REG(NULL, "r25", NULL, Gpr25), - REG(NULL, "r26", NULL, Gpr26), - REG(NULL, "r27", NULL, Gpr27), - REG(NULL, "r28", NULL, Gpr28), - REG(NULL, "r29", NULL, Gpr29), - REG(NULL, "r30", NULL, Gpr30), - REG(NULL, "r31", NULL, Gpr31), - REG(NULL, "pc", "code_ptr", Iar), - REG(NULL, "msr", NULL, Msr), - REG(NULL, "cr", NULL, Cr), - REG(NULL, "lr", "code_ptr", Lr), - REG(NULL, "ctr", NULL, Ctr), - REG(NULL, "xer", NULL, Xer), - - REG("fpu", "f0", "ieee_single", Fpr0, 4), - REG(NULL, "f1", "ieee_single", Fpr1, 4), - REG(NULL, "f2", "ieee_single", Fpr2, 4), - REG(NULL, "f3", "ieee_single", Fpr3, 4), - REG(NULL, "f4", "ieee_single", Fpr4, 4), - REG(NULL, "f5", "ieee_single", Fpr5, 4), - REG(NULL, "f6", "ieee_single", Fpr6, 4), - REG(NULL, "f7", "ieee_single", Fpr7, 4), - REG(NULL, "f8", "ieee_single", Fpr8, 4), - REG(NULL, "f9", "ieee_single", Fpr9, 4), - REG(NULL, "f10", "ieee_single", Fpr10, 4), - REG(NULL, "f11", "ieee_single", Fpr11, 4), - REG(NULL, "f12", "ieee_single", Fpr12, 4), - REG(NULL, "f13", "ieee_single", Fpr13, 4), - REG(NULL, "f14", "ieee_single", Fpr14, 4), - REG(NULL, "f15", "ieee_single", Fpr15, 4), - REG(NULL, "f16", "ieee_single", Fpr16, 4), - REG(NULL, "f17", "ieee_single", Fpr17, 4), - REG(NULL, "f18", "ieee_single", Fpr18, 4), - REG(NULL, "f19", "ieee_single", Fpr19, 4), - REG(NULL, "f20", "ieee_single", Fpr20, 4), - REG(NULL, "f21", "ieee_single", Fpr21, 4), - REG(NULL, "f22", "ieee_single", Fpr22, 4), - REG(NULL, "f23", "ieee_single", Fpr23, 4), - REG(NULL, "f24", "ieee_single", Fpr24, 4), - REG(NULL, "f25", "ieee_single", Fpr25, 4), - REG(NULL, "f26", "ieee_single", Fpr26, 4), - REG(NULL, "f27", "ieee_single", Fpr27, 4), - REG(NULL, "f28", "ieee_single", Fpr28, 4), - REG(NULL, "f29", "ieee_single", Fpr29, 4), - REG(NULL, "f30", "ieee_single", Fpr30, 4), - REG(NULL, "f31", "ieee_single", Fpr31, 4), - REG(NULL, "fpscr", NULL, Fpscr, 4), - - /* FIXME: MQ is missing? FIELD_OFFSET(CONTEXT, Mq), */ - /* see gdb/nlm/ppc.c */ -}; - -struct backend_cpu be_ppc = -{ - IMAGE_FILE_MACHINE_POWERPC, - 4, - be_cpu_linearize, - be_cpu_build_addr, - be_ppc_get_addr, - be_ppc_get_register_info, - be_ppc_single_step, - be_ppc_print_context, - be_ppc_print_segment_info, - be_ppc_ctx, - be_ppc_is_step_over_insn, - be_ppc_is_function_return, - be_ppc_is_break_insn, - be_ppc_is_func_call, - be_ppc_is_jump, - be_ppc_disasm_one_insn, - be_ppc_insert_Xpoint, - be_ppc_remove_Xpoint, - be_ppc_is_watchpoint_set, - be_ppc_clear_watchpoint, - be_ppc_adjust_pc_for_break, - be_ppc_fetch_integer, - be_ppc_fetch_float, - be_ppc_store_integer, - be_ppc_get_context, - be_ppc_set_context, - be_ppc_gdb_register_map, - ARRAY_SIZE(be_ppc_gdb_register_map), -}; -#endif diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 332fb0c9d3b..c51fd342496 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -1650,10 +1650,6 @@ static void packet_query_target_xml(struct gdb_context* gdbctx, struct backend_c packet_reply_add(gdbctx, "<architecture>i386</architecture>"); feature_prefix = "org.gnu.gdb.i386."; break; - case IMAGE_FILE_MACHINE_POWERPC: - packet_reply_add(gdbctx, "<architecture>powerpc:common</architecture>"); - feature_prefix = "org.gnu.gdb.power."; - break; case IMAGE_FILE_MACHINE_ARMNT: packet_reply_add(gdbctx, "<architecture>arm</architecture>"); feature_prefix = "org.gnu.gdb.arm."; diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 91dea2f9d88..d4e2d7d6347 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -756,8 +756,6 @@ static void output_system_info(void) static const char platform[] = "i386"; #elif defined(__x86_64__) static const char platform[] = "x86_64"; -#elif defined(__powerpc__) - static const char platform[] = "powerpc"; #elif defined(__arm__) static const char platform[] = "arm"; #elif defined(__aarch64__) diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 19f30f04e5d..abad9ef9984 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -281,8 +281,6 @@ struct dbg_process* dbg_get_process_h(HANDLE h) #ifdef __i386__ extern struct backend_cpu be_i386; -#elif defined(__powerpc__) -extern struct backend_cpu be_ppc; #elif defined(__x86_64__) extern struct backend_cpu be_i386; extern struct backend_cpu be_x86_64; @@ -330,8 +328,6 @@ struct dbg_process* dbg_add_process(const struct be_process_io* pio, DWORD pid, #ifdef __i386__ p->be_cpu = &be_i386; -#elif defined(__powerpc__) - p->be_cpu = &be_ppc; #elif defined(__x86_64__) p->be_cpu = wow64 ? &be_i386 : &be_x86_64; #elif defined(__arm__) && !defined(__ARMEB__) -- 2.17.1

2 8

[PATCH vkd3d 5/5] vkd3d-compiler: vkd3d_shader_compile_dxbc() returns an int.
by Henri Verbeet 17 Jun '20

17 Jun '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- programs/vkd3d-compiler/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 047abcd..dd94374 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -150,7 +150,7 @@ int main(int argc, char **argv) { struct vkd3d_shader_code dxbc, spirv; struct options options; - HRESULT hr; + int ret; if (!parse_command_line(argc, argv, &options)) { @@ -164,11 +164,11 @@ int main(int argc, char **argv) return 1; } - hr = vkd3d_shader_compile_dxbc(&dxbc, &spirv, options.compiler_options, NULL, NULL); + ret = vkd3d_shader_compile_dxbc(&dxbc, &spirv, options.compiler_options, NULL, NULL); vkd3d_shader_free_shader_code(&dxbc); - if (FAILED(hr)) + if (ret < 0) { - fprintf(stderr, "Failed to compile DXBC shader, hr %#x.\n", hr); + fprintf(stderr, "Failed to compile DXBC shader, ret %d.\n", ret); return 1; } -- 2.11.0

2 1

[PATCH v4 3/3] msado15: Implement IConnectionPoint::Advise/Unadvise.
by Aaro Altonen 17 Jun '20

17 Jun '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49388 Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> --- v4: release sinks when connection is destroyed (thanks Nikolay) --- dlls/msado15/connection.c | 65 +++++++++++++++++++++++++++++++++--- dlls/msado15/tests/msado15.c | 5 +-- 2 files changed, 62 insertions(+), 8 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index 35202d14aa..808ec28bb9 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -40,6 +40,8 @@ struct connection_point IConnectionPoint IConnectionPoint_iface; struct connection *conn; const IID *riid; + IUnknown **sinks; + ULONG sinks_size; }; struct connection @@ -84,9 +86,16 @@ static ULONG WINAPI connection_Release( _Connection *iface ) { struct connection *connection = impl_from_Connection( iface ); LONG refs = InterlockedDecrement( &connection->refs ); + ULONG i; if (!refs) { TRACE( "destroying %p\n", connection ); + for (i = 0; i < connection->cp_connev.sinks_size; ++i) + { + if (connection->cp_connev.sinks[i]) + IUnknown_Release( connection->cp_connev.sinks[i] ); + } + heap_free( connection->cp_connev.sinks ); heap_free( connection->datasource ); heap_free( connection ); } @@ -548,15 +557,61 @@ static HRESULT WINAPI connpoint_Advise( IConnectionPoint *iface, IUnknown *unk_s DWORD *cookie ) { struct connection_point *connpoint = impl_from_IConnectionPoint( iface ); - FIXME( "%p, %p, %p\n", connpoint, unk_sink, cookie ); - return E_NOTIMPL; + IUnknown *sink, **tmp; + ULONG new_size; + HRESULT hr; + DWORD i; + + TRACE( "%p, %p, %u\n", iface, unk_sink, cookie ); + + if (!unk_sink || !cookie) return E_FAIL; + + if (FAILED(hr = IUnknown_QueryInterface( unk_sink, &IID_ConnectionEventsVt, (void**)&sink ))) + { + *cookie = 0; + return E_FAIL; + } + + if (connpoint->sinks) + { + for (i = 0; i < connpoint->sinks_size; ++i) + { + if (!connpoint->sinks[i]) + break; + } + + if (i == connpoint->sinks_size) + { + new_size = connpoint->sinks_size * 2; + if (!(tmp = heap_realloc_zero( connpoint->sinks, new_size * sizeof(*connpoint->sinks) ))) + return E_OUTOFMEMORY; + connpoint->sinks = tmp; + connpoint->sinks_size = new_size; + } + } + else + { + if (!(connpoint->sinks = heap_alloc_zero( sizeof(*connpoint->sinks) ))) return E_OUTOFMEMORY; + connpoint->sinks_size = 1; + i = 0; + } + + connpoint->sinks[i] = sink; + *cookie = i + 1; + return S_OK; } static HRESULT WINAPI connpoint_Unadvise( IConnectionPoint *iface, DWORD cookie ) { struct connection_point *connpoint = impl_from_IConnectionPoint( iface ); - FIXME( "%p, %d\n", connpoint, cookie ); - return E_NOTIMPL; + TRACE( "%p, %u\n", connpoint, cookie ); + + if (!cookie || cookie > connpoint->sinks_size || !connpoint->sinks || !connpoint->sinks[cookie - 1]) + return E_FAIL; + + IUnknown_Release( connpoint->sinks[cookie - 1] ); + connpoint->sinks[cookie - 1] = NULL; + return S_OK; } static HRESULT WINAPI connpoint_EnumConnections( IConnectionPoint *iface, @@ -595,6 +650,8 @@ HRESULT Connection_create( void **obj ) connection->cp_connev.conn = connection; connection->cp_connev.riid = &DIID_ConnectionEvents; connection->cp_connev.IConnectionPoint_iface.lpVtbl = &connpoint_vtbl; + connection->cp_connev.sinks = NULL; + connection->cp_connev.sinks_size = 0; *obj = &connection->Connection_iface; TRACE( "returning iface %p\n", *obj ); diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index e072ed022f..1629fe15be 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -996,7 +996,6 @@ static void test_ConnectionPoint(void) hr = IConnectionPointContainer_FindConnectionPoint( pointcontainer, &DIID_ConnectionEvents, &point ); ok( hr == S_OK, "got %08x\n", hr ); -todo_wine { /* nothing advised yet */ hr = IConnectionPoint_Unadvise( point, 3 ); ok( hr == E_FAIL, "got %08x\n", hr ); @@ -1010,10 +1009,8 @@ todo_wine { cookie = 0xdeadbeef; hr = IConnectionPoint_Advise( point, NULL, &cookie ); ok( hr == E_FAIL, "got %08x\n", hr ); -} ok( cookie == 0xdeadbeef, "got %08x\n", cookie ); -todo_wine { /* unsupported sink */ cookie = 0xdeadbeef; hr = IConnectionPoint_Advise( point, (void*)&support_err_sink, &cookie ); @@ -1042,7 +1039,7 @@ todo_wine { ok( hr == S_OK, "got %08x\n", hr ); ok( cookie, "got %08x\n", cookie ); ok( conn_event.refs == 1, "got %d\n", conn_event.refs ); -} + refs = IConnectionPoint_Release( point ); ok( refs == 1, "got %u", refs ); -- 2.27.0

1 0

[PATCH v4 2/3] msado15/tests: Add tests for IConnectionPoint::Advise/Unadvise.
by Aaro Altonen 17 Jun '20

17 Jun '20

Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> --- v4: add test to confirm that sinks are released when the connection is destroyed (thanks Nikolay) --- dlls/msado15/tests/msado15.c | 189 +++++++++++++++++++++++++++++++++++ 1 file changed, 189 insertions(+) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 59c00948c8..e072ed022f 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -837,12 +837,152 @@ static void test_Command(void) _Command_Release( command ); } +struct conn_event { + ConnectionEventsVt conn_event_sink; + LONG refs; +}; + +static HRESULT WINAPI conneventvt_QueryInterface( ConnectionEventsVt *iface, REFIID riid, void **obj ) +{ + struct conn_event *conn_event = CONTAINING_RECORD( iface, struct conn_event, conn_event_sink ); + + if (IsEqualGUID( &IID_ConnectionEventsVt, riid )) + { + InterlockedIncrement( &conn_event->refs ); + *obj = iface; + return S_OK; + } + + ok( 0, "unexpected call\n" ); + return E_NOINTERFACE; +} + +static ULONG WINAPI conneventvt_AddRef( ConnectionEventsVt *iface ) +{ + struct conn_event *conn_event = CONTAINING_RECORD( iface, struct conn_event, conn_event_sink ); + return InterlockedIncrement( &conn_event->refs ); +} + +static ULONG WINAPI conneventvt_Release( ConnectionEventsVt *iface ) +{ + struct conn_event *conn_event = CONTAINING_RECORD( iface, struct conn_event, conn_event_sink ); + return InterlockedDecrement( &conn_event->refs ); +} + +static HRESULT WINAPI conneventvt_InfoMessage( ConnectionEventsVt *iface, Error *error, + EventStatusEnum *status, _Connection *Connection ) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI conneventvt_BeginTransComplete( ConnectionEventsVt *iface, LONG TransactionLevel, + Error *error, EventStatusEnum *status, _Connection *connection ) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI conneventvt_CommitTransComplete( ConnectionEventsVt *iface, Error *error, + EventStatusEnum *status, _Connection *connection ) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI conneventvt_RollbackTransComplete( ConnectionEventsVt *iface, Error *error, + EventStatusEnum *status, _Connection *connection ) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI conneventvt_WillExecute( ConnectionEventsVt *iface, BSTR *source, + CursorTypeEnum *cursor_type, LockTypeEnum *lock_type, LONG *options, EventStatusEnum *status, + _Command *command, _Recordset *record_set, _Connection *connection ) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI conneventvt_ExecuteComplete( ConnectionEventsVt *iface, LONG records_affected, + Error *error, EventStatusEnum *status, _Command *command, _Recordset *record_set, + _Connection *connection ) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI conneventvt_WillConnect( ConnectionEventsVt *iface, BSTR *string, BSTR *userid, + BSTR *password, LONG *options, EventStatusEnum *status, _Connection *connection ) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI conneventvt_ConnectComplete( ConnectionEventsVt *iface, Error *error, + EventStatusEnum *status, _Connection *connection ) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI conneventvt_Disconnect( ConnectionEventsVt *iface, EventStatusEnum *status, + _Connection *connection ) +{ + return E_NOTIMPL; +} + +static const ConnectionEventsVtVtbl conneventvt_vtbl = { + conneventvt_QueryInterface, + conneventvt_AddRef, + conneventvt_Release, + conneventvt_InfoMessage, + conneventvt_BeginTransComplete, + conneventvt_CommitTransComplete, + conneventvt_RollbackTransComplete, + conneventvt_WillExecute, + conneventvt_ExecuteComplete, + conneventvt_WillConnect, + conneventvt_ConnectComplete, + conneventvt_Disconnect +}; + +static HRESULT WINAPI supporterror_QueryInterface( ISupportErrorInfo *iface, REFIID riid, void **obj ) +{ + if (IsEqualGUID( &IID_ISupportErrorInfo, riid )) + { + *obj = iface; + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI supporterror_AddRef( ISupportErrorInfo *iface ) +{ + return 2; +} + +static ULONG WINAPI supporterror_Release( ISupportErrorInfo *iface ) +{ + return 1; +} + +static HRESULT WINAPI supporterror_InterfaceSupportsErrorInfo( ISupportErrorInfo *iface, REFIID riid ) +{ + return E_NOTIMPL; +} + +static const struct ISupportErrorInfoVtbl support_error_vtbl = +{ + supporterror_QueryInterface, + supporterror_AddRef, + supporterror_Release, + supporterror_InterfaceSupportsErrorInfo +}; + static void test_ConnectionPoint(void) { HRESULT hr; ULONG refs; + DWORD cookie; IConnectionPoint *point; IConnectionPointContainer *pointcontainer; + struct conn_event conn_event = { { &conneventvt_vtbl }, 0 }; + ISupportErrorInfo support_err_sink = { &support_error_vtbl }; hr = CoCreateInstance( &CLSID_Connection, NULL, CLSCTX_INPROC_SERVER, &IID_IConnectionPointContainer, (void**)&pointcontainer ); @@ -856,10 +996,59 @@ static void test_ConnectionPoint(void) hr = IConnectionPointContainer_FindConnectionPoint( pointcontainer, &DIID_ConnectionEvents, &point ); ok( hr == S_OK, "got %08x\n", hr ); +todo_wine { + /* nothing advised yet */ + hr = IConnectionPoint_Unadvise( point, 3 ); + ok( hr == E_FAIL, "got %08x\n", hr ); + + hr = IConnectionPoint_Advise( point, NULL, NULL ); + ok( hr == E_FAIL, "got %08x\n", hr ); + + hr = IConnectionPoint_Advise( point, (void*)&conn_event.conn_event_sink, NULL ); + ok( hr == E_FAIL, "got %08x\n", hr ); + + cookie = 0xdeadbeef; + hr = IConnectionPoint_Advise( point, NULL, &cookie ); + ok( hr == E_FAIL, "got %08x\n", hr ); +} + ok( cookie == 0xdeadbeef, "got %08x\n", cookie ); + +todo_wine { + /* unsupported sink */ + cookie = 0xdeadbeef; + hr = IConnectionPoint_Advise( point, (void*)&support_err_sink, &cookie ); + ok( hr == E_FAIL, "got %08x\n", hr ); + ok( !cookie, "got %08x\n", cookie ); + + cookie = 0; + hr = IConnectionPoint_Advise( point, (void*)&conn_event.conn_event_sink, &cookie ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( cookie, "got %08x\n", cookie ); + + /* invalid cookie */ + hr = IConnectionPoint_Unadvise( point, 0 ); + ok( hr == E_FAIL, "got %08x\n", hr ); + + /* wrong cookie */ + hr = IConnectionPoint_Unadvise( point, cookie + 1 ); + ok( hr == E_FAIL, "got %08x\n", hr ); + + hr = IConnectionPoint_Unadvise( point, cookie ); + ok( hr == S_OK, "got %08x\n", hr ); + + /* sinks are released when the connection is destroyed */ + cookie = 0; + hr = IConnectionPoint_Advise( point, (void*)&conn_event.conn_event_sink, &cookie ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( cookie, "got %08x\n", cookie ); + ok( conn_event.refs == 1, "got %d\n", conn_event.refs ); +} refs = IConnectionPoint_Release( point ); ok( refs == 1, "got %u", refs ); IConnectionPointContainer_Release( pointcontainer ); + + ok( !conn_event.refs, "got %d\n", conn_event.refs ); } START_TEST(msado15) -- 2.27.0

1 0

[PATCH v4 1/3] include: Add ConnectionEventsVt definition.
by Aaro Altonen 17 Jun '20

17 Jun '20

Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> --- include/msado15_backcompat.idl | 65 ++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/include/msado15_backcompat.idl b/include/msado15_backcompat.idl index 5ea9f51c1f..e5d0f5ecfe 100644 --- a/include/msado15_backcompat.idl +++ b/include/msado15_backcompat.idl @@ -47,6 +47,7 @@ interface Property; interface Recordset15; interface Recordset20; interface Recordset21; +interface ConnectionEventsVt; dispinterface ConnectionEvents; dispinterface RecordsetEvents; @@ -1581,6 +1582,70 @@ interface _Command : Command25 [out, retval] VARIANT_BOOL *named_parameters); }; +[ + uuid(00000402-0000-0010-8000-00aa006d2ea4), + odl, + hidden +] +interface ConnectionEventsVt : IUnknown +{ + HRESULT InfoMessage( + [in] Error *error, + [in, out] EventStatusEnum *status, + [in] _Connection *connection); + + HRESULT BeginTransComplete( + [in] LONG TransactionLevel, + [in] Error *error, + [in, out] EventStatusEnum *status, + [in] _Connection *connection); + + HRESULT CommitTransComplete( + [in] Error *error, + [in, out] EventStatusEnum *status, + [in] _Connection *connection); + + HRESULT RollbackTransComplete( + [in] Error *error, + [in, out] EventStatusEnum *status, + [in] _Connection *connection); + + HRESULT WillExecute( + [in, out] BSTR *source, + [in, out] CursorTypeEnum *cursor_type, + [in, out] LockTypeEnum *lock_type, + [in, out] LONG *options, + [in, out] EventStatusEnum *status, + [in] _Command *command, + [in] _Recordset *record_set, + [in] _Connection *connection); + + HRESULT ExecuteComplete( + [in] LONG records_affected, + [in] Error *error, + [in, out] EventStatusEnum *status, + [in] _Command *command, + [in] _Recordset *record_set, + [in] _Connection *connection); + + HRESULT WillConnect( + [in, out] BSTR *string, + [in, out] BSTR *userid, + [in, out] BSTR *password, + [in, out] LONG *options, + [in, out] EventStatusEnum *status, + [in] _Connection *connection); + + HRESULT ConnectComplete( + [in] Error *error, + [in, out] EventStatusEnum *status, + [in] _Connection *connection); + + HRESULT Disconnect( + [in, out] EventStatusEnum *status, + [in] _Connection *connection); +}; + [ uuid(00000400-0000-0010-8000-00aa006d2ea4) ] -- 2.27.0

1 0

[PATCH vkd3d 4/5] vkd3d: Also match the UAV counter register space in d3d12_command_list_update_descriptor_table().
by Henri Verbeet 17 Jun '20

17 Jun '20

From: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d/command.c | 3 ++- libs/vkd3d/state.c | 1 + libs/vkd3d/vkd3d_private.h | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 7ff3c87..647431a 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2682,7 +2682,8 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list { for (k = 0; k < state->uav_counter_count; ++k) { - if (state->uav_counters[k].register_index == register_idx) + if (state->uav_counters[k].register_space == range->register_space + && state->uav_counters[k].register_index == register_idx) { VkBufferView vk_counter_view = descriptor->magic == VKD3D_DESCRIPTOR_MAGIC_UAV ? descriptor->u.view->vk_counter_view : VK_NULL_HANDLE; diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 44891a1..11db8b5 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -646,6 +646,7 @@ static HRESULT d3d12_root_signature_init_root_descriptor_tables(struct d3d12_roo table->ranges[j].descriptor_count = range->NumDescriptors; table->ranges[j].binding = vk_binding; table->ranges[j].descriptor_magic = vkd3d_descriptor_magic_from_d3d12(range->RangeType); + table->ranges[j].register_space = range->RegisterSpace; table->ranges[j].base_register_idx = range->BaseShaderRegister; } } diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index cf7c796..bfdc7b4 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -658,6 +658,7 @@ struct d3d12_root_descriptor_table_range uint32_t binding; uint32_t descriptor_magic; + unsigned int register_space; unsigned int base_register_idx; }; -- 2.11.0

1 0

[PATCH vkd3d 3/5] vkd3d: Store a count of used UAV counters instead of a mask.
by Henri Verbeet 17 Jun '20

17 Jun '20

From: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d/command.c | 6 +++--- libs/vkd3d/state.c | 8 ++++---- libs/vkd3d/vkd3d_private.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index b7e680e..7ff3c87 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1862,7 +1862,7 @@ static void d3d12_command_list_invalidate_current_render_pass(struct d3d12_comma static void d3d12_command_list_invalidate_bindings(struct d3d12_command_list *list, struct d3d12_pipeline_state *state) { - if (state && state->uav_counter_mask) + if (state && state->uav_counter_count) { enum vkd3d_pipeline_bind_point bind_point = (enum vkd3d_pipeline_bind_point)state->vk_bind_point; list->pipeline_bindings[bind_point].uav_counters_dirty = true; @@ -2680,7 +2680,7 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list /* Track UAV counters. */ if (range->descriptor_magic == VKD3D_DESCRIPTOR_MAGIC_UAV) { - for (k = 0; k < vkd3d_popcount(state->uav_counter_mask); ++k) + for (k = 0; k < state->uav_counter_count; ++k) { if (state->uav_counters[k].register_index == register_idx) { @@ -2835,7 +2835,7 @@ static void d3d12_command_list_update_uav_counter_descriptors(struct d3d12_comma if (!state || !bindings->uav_counters_dirty) return; - uav_counter_count = vkd3d_popcount(state->uav_counter_mask); + uav_counter_count = state->uav_counter_count; assert(uav_counter_count <= ARRAY_SIZE(vk_descriptor_writes)); vk_descriptor_set = d3d12_command_allocator_allocate_descriptor_set(list->allocator, state->vk_set_layout); diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index a7b6251..44891a1 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1418,7 +1418,7 @@ static HRESULT d3d12_pipeline_state_init_compute_uav_counters(struct d3d12_pipel vkd3d_free(binding_desc); return E_OUTOFMEMORY; } - state->uav_counter_mask = shader_info->uav_counter_mask; + state->uav_counter_count = uav_counter_count; memset(&context, 0, sizeof(context)); if (root_signature->vk_push_set_layout) @@ -1495,7 +1495,7 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st state->vk_pipeline_layout = VK_NULL_HANDLE; state->vk_set_layout = VK_NULL_HANDLE; state->uav_counters = NULL; - state->uav_counter_mask = 0; + state->uav_counter_count = 0; if (!(root_signature = unsafe_impl_from_ID3D12RootSignature(desc->pRootSignature))) { @@ -1529,7 +1529,7 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st shader_interface.combined_samplers = NULL; shader_interface.combined_sampler_count = 0; shader_interface.uav_counters = state->uav_counters; - shader_interface.uav_counter_count = vkd3d_popcount(state->uav_counter_mask); + shader_interface.uav_counter_count = state->uav_counter_count; vk_pipeline_layout = state->vk_pipeline_layout ? state->vk_pipeline_layout : root_signature->vk_pipeline_layout; @@ -2041,7 +2041,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s state->vk_pipeline_layout = VK_NULL_HANDLE; state->vk_set_layout = VK_NULL_HANDLE; state->uav_counters = NULL; - state->uav_counter_mask = 0; + state->uav_counter_count = 0; graphics->stage_count = 0; memset(&input_signature, 0, sizeof(input_signature)); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index a4d73a9..cf7c796 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -797,7 +797,7 @@ struct d3d12_pipeline_state uint32_t set_index; struct vkd3d_shader_uav_counter_binding *uav_counters; - uint8_t uav_counter_mask; + unsigned int uav_counter_count; struct d3d12_device *device; -- 2.11.0

1 0

[PATCH vkd3d 2/5] vkd3d: Index the "vk_uav_counter_views" array to match the "uav_counters" array.
by Henri Verbeet 17 Jun '20

17 Jun '20

From: Zebediah Figura <zfigura(a)codeweavers.com> That is, index elements of vk_uav_counter_views by their index in uav_counters, rather than by their register index. This is necessary because multiple UAVs can share the same register index but differ in register space. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d/command.c | 33 ++++++++++++++++++++------------- libs/vkd3d/vkd3d_private.h | 2 +- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 217fcf3..b7e680e 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1865,7 +1865,7 @@ static void d3d12_command_list_invalidate_bindings(struct d3d12_command_list *li if (state && state->uav_counter_mask) { enum vkd3d_pipeline_bind_point bind_point = (enum vkd3d_pipeline_bind_point)state->vk_bind_point; - list->pipeline_bindings[bind_point].uav_counter_dirty_mask = ~(uint8_t)0; + list->pipeline_bindings[bind_point].uav_counters_dirty = true; } } @@ -2652,9 +2652,10 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; struct VkDescriptorImageInfo image_infos[24], *current_image_info; const struct d3d12_root_descriptor_table *descriptor_table; + const struct d3d12_pipeline_state *state = list->state; const struct d3d12_root_descriptor_table_range *range; VkDevice vk_device = list->device->vk_device; - unsigned int i, j, descriptor_count; + unsigned int i, j, k, descriptor_count; struct d3d12_desc *descriptor; descriptor_table = root_signature_get_descriptor_table(root_signature, index); @@ -2677,14 +2678,20 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list unsigned int register_idx = range->base_register_idx + j; /* Track UAV counters. */ - if (range->descriptor_magic == VKD3D_DESCRIPTOR_MAGIC_UAV - && register_idx < ARRAY_SIZE(bindings->vk_uav_counter_views)) + if (range->descriptor_magic == VKD3D_DESCRIPTOR_MAGIC_UAV) { - VkBufferView vk_counter_view = descriptor->magic == VKD3D_DESCRIPTOR_MAGIC_UAV - ? descriptor->u.view->vk_counter_view : VK_NULL_HANDLE; - if (bindings->vk_uav_counter_views[register_idx] != vk_counter_view) - bindings->uav_counter_dirty_mask |= 1u << register_idx; - bindings->vk_uav_counter_views[register_idx] = vk_counter_view; + for (k = 0; k < vkd3d_popcount(state->uav_counter_mask); ++k) + { + if (state->uav_counters[k].register_index == register_idx) + { + VkBufferView vk_counter_view = descriptor->magic == VKD3D_DESCRIPTOR_MAGIC_UAV + ? descriptor->u.view->vk_counter_view : VK_NULL_HANDLE; + if (bindings->vk_uav_counter_views[k] != vk_counter_view) + bindings->uav_counters_dirty = true; + bindings->vk_uav_counter_views[k] = vk_counter_view; + break; + } + } } if (!vk_write_descriptor_set_from_d3d12_desc(current_descriptor_write, @@ -2825,7 +2832,7 @@ static void d3d12_command_list_update_uav_counter_descriptors(struct d3d12_comma unsigned int uav_counter_count; unsigned int i; - if (!state || !(state->uav_counter_mask & bindings->uav_counter_dirty_mask)) + if (!state || !bindings->uav_counters_dirty) return; uav_counter_count = vkd3d_popcount(state->uav_counter_mask); @@ -2840,7 +2847,7 @@ static void d3d12_command_list_update_uav_counter_descriptors(struct d3d12_comma const struct vkd3d_shader_uav_counter_binding *uav_counter = &state->uav_counters[i]; const VkBufferView *vk_uav_counter_views = bindings->vk_uav_counter_views; - assert(vk_uav_counter_views[uav_counter->register_index]); + assert(vk_uav_counter_views[i]); vk_descriptor_writes[i].sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET; vk_descriptor_writes[i].pNext = NULL; @@ -2851,7 +2858,7 @@ static void d3d12_command_list_update_uav_counter_descriptors(struct d3d12_comma vk_descriptor_writes[i].descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER; vk_descriptor_writes[i].pImageInfo = NULL; vk_descriptor_writes[i].pBufferInfo = NULL; - vk_descriptor_writes[i].pTexelBufferView = &vk_uav_counter_views[uav_counter->register_index]; + vk_descriptor_writes[i].pTexelBufferView = &vk_uav_counter_views[i]; } VK_CALL(vkUpdateDescriptorSets(vk_device, uav_counter_count, vk_descriptor_writes, 0, NULL)); @@ -2859,7 +2866,7 @@ static void d3d12_command_list_update_uav_counter_descriptors(struct d3d12_comma VK_CALL(vkCmdBindDescriptorSets(list->vk_command_buffer, bindings->vk_bind_point, state->vk_pipeline_layout, state->set_index, 1, &vk_descriptor_set, 0, NULL)); - bindings->uav_counter_dirty_mask = 0; + bindings->uav_counters_dirty = false; } static void d3d12_command_list_update_descriptors(struct d3d12_command_list *list, diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index fbffee5..a4d73a9 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -921,7 +921,7 @@ struct vkd3d_pipeline_bindings uint64_t descriptor_table_active_mask; VkBufferView vk_uav_counter_views[VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS]; - uint8_t uav_counter_dirty_mask; + bool uav_counters_dirty; /* Needed when VK_KHR_push_descriptor is not available. */ struct vkd3d_push_descriptor push_descriptors[D3D12_MAX_ROOT_COST / 2]; -- 2.11.0

1 0

[PATCH vkd3d 1/5] vkd3d: Introduce our own pipeline bind point enumeration.
by Henri Verbeet 17 Jun '20

17 Jun '20

The VK_PIPELINE_BIND_POINT_RANGE_SIZE enumeration value was removed in Vulkan-Headers release 1.2.140. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- Not terribly impressed with Khronos' commitment to Vulkan API stability; this is not the first time this kind of thing happens either, e.g. VK_ERROR_INVALID_DEVICE_ADDRESS_EXT was removed/renamed as well. libs/vkd3d/command.c | 49 +++++++++++++++++++++++----------------------- libs/vkd3d/vkd3d_private.h | 10 +++++++++- 2 files changed, 33 insertions(+), 26 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 8a7ff66..217fcf3 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1862,18 +1862,15 @@ static void d3d12_command_list_invalidate_current_render_pass(struct d3d12_comma static void d3d12_command_list_invalidate_bindings(struct d3d12_command_list *list, struct d3d12_pipeline_state *state) { - if (!state) - return; - - if (state->uav_counter_mask) + if (state && state->uav_counter_mask) { - struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[state->vk_bind_point]; - bindings->uav_counter_dirty_mask = ~(uint8_t)0; + enum vkd3d_pipeline_bind_point bind_point = (enum vkd3d_pipeline_bind_point)state->vk_bind_point; + list->pipeline_bindings[bind_point].uav_counter_dirty_mask = ~(uint8_t)0; } } static void d3d12_command_list_invalidate_root_parameters(struct d3d12_command_list *list, - VkPipelineBindPoint bind_point) + enum vkd3d_pipeline_bind_point bind_point) { struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point]; @@ -2345,6 +2342,8 @@ static void d3d12_command_list_reset_state(struct d3d12_command_list *list, list->current_render_pass = VK_NULL_HANDLE; memset(list->pipeline_bindings, 0, sizeof(list->pipeline_bindings)); + list->pipeline_bindings[VKD3D_PIPELINE_BIND_POINT_GRAPHICS].vk_bind_point = VK_PIPELINE_BIND_POINT_GRAPHICS; + list->pipeline_bindings[VKD3D_PIPELINE_BIND_POINT_COMPUTE].vk_bind_point = VK_PIPELINE_BIND_POINT_COMPUTE; list->state = NULL; @@ -2548,7 +2547,7 @@ static bool d3d12_command_list_update_graphics_pipeline(struct d3d12_command_lis } static void d3d12_command_list_prepare_descriptors(struct d3d12_command_list *list, - VkPipelineBindPoint bind_point) + enum vkd3d_pipeline_bind_point bind_point) { struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point]; const struct d3d12_root_signature *root_signature = bindings->root_signature; @@ -2645,7 +2644,7 @@ static bool vk_write_descriptor_set_from_d3d12_desc(VkWriteDescriptorSet *vk_des } static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list *list, - VkPipelineBindPoint bind_point, unsigned int index, struct d3d12_desc *base_descriptor) + enum vkd3d_pipeline_bind_point bind_point, unsigned int index, struct d3d12_desc *base_descriptor) { struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point]; struct VkWriteDescriptorSet descriptor_writes[24], *current_descriptor_write; @@ -2748,7 +2747,7 @@ static bool vk_write_descriptor_set_from_root_descriptor(VkWriteDescriptorSet *v } static void d3d12_command_list_update_push_descriptors(struct d3d12_command_list *list, - VkPipelineBindPoint bind_point) + enum vkd3d_pipeline_bind_point bind_point) { struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point]; const struct d3d12_root_signature *root_signature = bindings->root_signature; @@ -2815,7 +2814,7 @@ done: } static void d3d12_command_list_update_uav_counter_descriptors(struct d3d12_command_list *list, - VkPipelineBindPoint bind_point) + enum vkd3d_pipeline_bind_point bind_point) { VkWriteDescriptorSet vk_descriptor_writes[VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS]; struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point]; @@ -2857,14 +2856,14 @@ static void d3d12_command_list_update_uav_counter_descriptors(struct d3d12_comma VK_CALL(vkUpdateDescriptorSets(vk_device, uav_counter_count, vk_descriptor_writes, 0, NULL)); - VK_CALL(vkCmdBindDescriptorSets(list->vk_command_buffer, bind_point, + VK_CALL(vkCmdBindDescriptorSets(list->vk_command_buffer, bindings->vk_bind_point, state->vk_pipeline_layout, state->set_index, 1, &vk_descriptor_set, 0, NULL)); bindings->uav_counter_dirty_mask = 0; } static void d3d12_command_list_update_descriptors(struct d3d12_command_list *list, - VkPipelineBindPoint bind_point) + enum vkd3d_pipeline_bind_point bind_point) { struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point]; const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; @@ -2894,7 +2893,7 @@ static void d3d12_command_list_update_descriptors(struct d3d12_command_list *lis if (bindings->descriptor_set) { - VK_CALL(vkCmdBindDescriptorSets(list->vk_command_buffer, bind_point, + VK_CALL(vkCmdBindDescriptorSets(list->vk_command_buffer, bindings->vk_bind_point, rs->vk_pipeline_layout, rs->main_set, 1, &bindings->descriptor_set, 0, NULL)); bindings->in_use = true; } @@ -4045,7 +4044,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetDescriptorHeaps(ID3D12Graphi } static void d3d12_command_list_set_root_signature(struct d3d12_command_list *list, - VkPipelineBindPoint bind_point, const struct d3d12_root_signature *root_signature) + enum vkd3d_pipeline_bind_point bind_point, const struct d3d12_root_signature *root_signature) { struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point]; @@ -4080,7 +4079,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetGraphicsRootSignature(ID3D12 } static void d3d12_command_list_set_descriptor_table(struct d3d12_command_list *list, - VkPipelineBindPoint bind_point, unsigned int index, D3D12_GPU_DESCRIPTOR_HANDLE base_descriptor) + enum vkd3d_pipeline_bind_point bind_point, unsigned int index, D3D12_GPU_DESCRIPTOR_HANDLE base_descriptor) { struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point]; const struct d3d12_root_signature *root_signature = bindings->root_signature; @@ -4118,7 +4117,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetGraphicsRootDescriptorTable( } static void d3d12_command_list_set_root_constants(struct d3d12_command_list *list, - VkPipelineBindPoint bind_point, unsigned int index, unsigned int offset, + enum vkd3d_pipeline_bind_point bind_point, unsigned int index, unsigned int offset, unsigned int count, const void *data) { const struct d3d12_root_signature *root_signature = list->pipeline_bindings[bind_point].root_signature; @@ -4179,7 +4178,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetGraphicsRoot32BitConstants(I } static void d3d12_command_list_set_root_cbv(struct d3d12_command_list *list, - VkPipelineBindPoint bind_point, unsigned int index, D3D12_GPU_VIRTUAL_ADDRESS gpu_address) + enum vkd3d_pipeline_bind_point bind_point, unsigned int index, D3D12_GPU_VIRTUAL_ADDRESS gpu_address) { struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point]; const struct d3d12_root_signature *root_signature = bindings->root_signature; @@ -4203,7 +4202,7 @@ static void d3d12_command_list_set_root_cbv(struct d3d12_command_list *list, { vk_write_descriptor_set_from_root_descriptor(&descriptor_write, root_parameter, VK_NULL_HANDLE, NULL, &buffer_info); - VK_CALL(vkCmdPushDescriptorSetKHR(list->vk_command_buffer, bind_point, + VK_CALL(vkCmdPushDescriptorSetKHR(list->vk_command_buffer, bindings->vk_bind_point, root_signature->vk_pipeline_layout, 0, 1, &descriptor_write)); } else @@ -4244,7 +4243,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetGraphicsRootConstantBufferVi } static void d3d12_command_list_set_root_descriptor(struct d3d12_command_list *list, - VkPipelineBindPoint bind_point, unsigned int index, D3D12_GPU_VIRTUAL_ADDRESS gpu_address) + enum vkd3d_pipeline_bind_point bind_point, unsigned int index, D3D12_GPU_VIRTUAL_ADDRESS gpu_address) { struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point]; const struct d3d12_root_signature *root_signature = bindings->root_signature; @@ -4276,7 +4275,7 @@ static void d3d12_command_list_set_root_descriptor(struct d3d12_command_list *li { vk_write_descriptor_set_from_root_descriptor(&descriptor_write, root_parameter, VK_NULL_HANDLE, &vk_buffer_view, NULL); - VK_CALL(vkCmdPushDescriptorSetKHR(list->vk_command_buffer, bind_point, + VK_CALL(vkCmdPushDescriptorSetKHR(list->vk_command_buffer, bindings->vk_bind_point, root_signature->vk_pipeline_layout, 0, 1, &descriptor_write)); } else @@ -4301,7 +4300,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRootShaderResourceVie TRACE("iface %p, root_parameter_index %u, address %#"PRIx64".\n", iface, root_parameter_index, address); - d3d12_command_list_set_root_descriptor(list, VK_PIPELINE_BIND_POINT_COMPUTE, + d3d12_command_list_set_root_descriptor(list, VKD3D_PIPELINE_BIND_POINT_COMPUTE, root_parameter_index, address); } @@ -4313,7 +4312,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetGraphicsRootShaderResourceVi TRACE("iface %p, root_parameter_index %u, address %#"PRIx64".\n", iface, root_parameter_index, address); - d3d12_command_list_set_root_descriptor(list, VK_PIPELINE_BIND_POINT_GRAPHICS, + d3d12_command_list_set_root_descriptor(list, VKD3D_PIPELINE_BIND_POINT_GRAPHICS, root_parameter_index, address); } @@ -4325,7 +4324,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRootUnorderedAccessVi TRACE("iface %p, root_parameter_index %u, address %#"PRIx64".\n", iface, root_parameter_index, address); - d3d12_command_list_set_root_descriptor(list, VK_PIPELINE_BIND_POINT_COMPUTE, + d3d12_command_list_set_root_descriptor(list, VKD3D_PIPELINE_BIND_POINT_COMPUTE, root_parameter_index, address); } @@ -4337,7 +4336,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetGraphicsRootUnorderedAccessV TRACE("iface %p, root_parameter_index %u, address %#"PRIx64".\n", iface, root_parameter_index, address); - d3d12_command_list_set_root_descriptor(list, VK_PIPELINE_BIND_POINT_GRAPHICS, + d3d12_command_list_set_root_descriptor(list, VKD3D_PIPELINE_BIND_POINT_GRAPHICS, root_parameter_index, address); } diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 1cc7864..fbffee5 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -912,6 +912,7 @@ struct vkd3d_pipeline_bindings { const struct d3d12_root_signature *root_signature; + VkPipelineBindPoint vk_bind_point; VkDescriptorSet descriptor_set; bool in_use; @@ -928,6 +929,13 @@ struct vkd3d_pipeline_bindings uint32_t push_descriptor_active_mask; }; +enum vkd3d_pipeline_bind_point +{ + VKD3D_PIPELINE_BIND_POINT_GRAPHICS = 0x0, + VKD3D_PIPELINE_BIND_POINT_COMPUTE = 0x1, + VKD3D_PIPELINE_BIND_POINT_COUNT = 0x2, +}; + /* ID3D12CommandList */ struct d3d12_command_list { @@ -961,7 +969,7 @@ struct d3d12_command_list VkPipeline current_pipeline; VkRenderPass pso_render_pass; VkRenderPass current_render_pass; - struct vkd3d_pipeline_bindings pipeline_bindings[VK_PIPELINE_BIND_POINT_RANGE_SIZE]; + struct vkd3d_pipeline_bindings pipeline_bindings[VKD3D_PIPELINE_BIND_POINT_COUNT]; struct d3d12_pipeline_state *state; -- 2.11.0

1 0

[PATCH v2 3/3] winevulkan: Fill Vulkan device LUID property.
by Zhiyi Zhang 17 Jun '20

17 Jun '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/vulkan-1/tests/vulkan.c | 4 +- dlls/winevulkan/Makefile.in | 2 +- dlls/winevulkan/vulkan.c | 79 ++++++++++++++++++++++++++++++++++++ 3 files changed, 83 insertions(+), 2 deletions(-) diff --git a/dlls/vulkan-1/tests/vulkan.c b/dlls/vulkan-1/tests/vulkan.c index 63fd48b33d3..e993692861e 100644 --- a/dlls/vulkan-1/tests/vulkan.c +++ b/dlls/vulkan-1/tests/vulkan.c @@ -212,7 +212,9 @@ static void test_enumerate_physical_device2(void) trace("Device '%s', device UUID: %s, driver UUID: %s, device LUID: %08x:%08x.\n", properties2.properties.deviceName, wine_dbgstr_guid((const GUID *)id.deviceUUID), wine_dbgstr_guid((const GUID *)id.driverUUID), luid->HighPart, luid->LowPart); - todo_wine ok(id.deviceLUIDValid == VK_TRUE, "Expected valid device LUID.\n"); + ok(id.deviceLUIDValid == VK_TRUE, "Expected valid device LUID.\n"); + ok(id.deviceNodeMask && !(id.deviceNodeMask & (id.deviceNodeMask - 1)), + "Expect deviceNodeMask to have only bit set, got %#x.\n", id.deviceNodeMask); } } diff --git a/dlls/winevulkan/Makefile.in b/dlls/winevulkan/Makefile.in index 251de5c68e5..f95a1e3113a 100644 --- a/dlls/winevulkan/Makefile.in +++ b/dlls/winevulkan/Makefile.in @@ -1,6 +1,6 @@ MODULE = winevulkan.dll IMPORTLIB = winevulkan -IMPORTS = user32 gdi32 advapi32 +IMPORTS = user32 gdi32 advapi32 setupapi C_SRCS = \ vulkan.c \ diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index e67c398f604..95d1b7ac8e9 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -23,11 +23,17 @@ #include "winbase.h" #include "winreg.h" #include "winuser.h" +#include "initguid.h" +#include "devguid.h" +#include "setupapi.h" #include "vulkan_private.h" WINE_DEFAULT_DEBUG_CHANNEL(vulkan); +DEFINE_DEVPROPKEY(DEVPROPKEY_GPU_LUID, 0x60b193cb, 0x5276, 0x4d0f, 0x96, 0xfc, 0xf1, 0x73, 0xab, 0xad, 0x3e, 0xc6, 2); +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_GPU_VULKAN_UUID, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5c, 2); + /* For now default to 4 as it felt like a reasonable version feature wise to support. * Don't support the optional vk_icdGetPhysicalDeviceProcAddr introduced in this version * as it is unlikely we will implement physical device extensions, which the loader is not @@ -1245,12 +1251,84 @@ VkResult WINAPI wine_vkGetPhysicalDeviceImageFormatProperties2KHR(VkPhysicalDevi return res; } +static HANDLE get_display_device_init_mutex(void) +{ + static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; + HANDLE mutex = CreateMutexW(NULL, FALSE, init_mutexW); + + WaitForSingleObject(mutex, INFINITE); + return mutex; +} + +static void release_display_device_init_mutex(HANDLE mutex) +{ + ReleaseMutex(mutex); + CloseHandle(mutex); +} + +/* Wait until graphics driver is loaded by explorer */ +static void wait_graphics_driver_ready(void) +{ + static BOOL ready = FALSE; + + if (!ready) + { + SendMessageW(GetDesktopWindow(), WM_NULL, 0, 0); + ready = TRUE; + } +} + +static void fill_luid_property(VkPhysicalDeviceProperties2 *properties2) +{ + static const WCHAR pci[] = {'P','C','I',0}; + VkPhysicalDeviceIDProperties *id; + SP_DEVINFO_DATA device_data; + DWORD type, device_idx = 0; + HDEVINFO devinfo; + HANDLE mutex; + GUID uuid; + LUID luid; + + if (!(id = wine_vk_find_struct(properties2, PHYSICAL_DEVICE_ID_PROPERTIES))) + return; + + wait_graphics_driver_ready(); + mutex = get_display_device_init_mutex(); + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_DISPLAY, pci, NULL, 0); + device_data.cbSize = sizeof(device_data); + while (SetupDiEnumDeviceInfo(devinfo, device_idx++, &device_data)) + { + if (!SetupDiGetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_GPU_VULKAN_UUID, + &type, (BYTE *)&uuid, sizeof(uuid), NULL, 0)) + continue; + + if (!IsEqualGUID(&uuid, id->deviceUUID)) + continue; + + if (SetupDiGetDevicePropertyW(devinfo, &device_data, &DEVPROPKEY_GPU_LUID, &type, + (BYTE *)&luid, sizeof(luid), NULL, 0)) + { + memcpy(&id->deviceLUID, &luid, sizeof(luid)); + id->deviceLUIDValid = VK_TRUE; + id->deviceNodeMask = 1; + break; + } + } + SetupDiDestroyDeviceInfoList(devinfo); + release_display_device_init_mutex(mutex); + + TRACE("deviceName:%s deviceLUIDValid:%d LUID:%08x:%08x deviceNodeMask:%#x.\n", + properties2->properties.deviceName, id->deviceLUIDValid, luid.HighPart, luid.LowPart, + id->deviceNodeMask); +} + void WINAPI wine_vkGetPhysicalDeviceProperties2(VkPhysicalDevice phys_dev, VkPhysicalDeviceProperties2 *properties2) { TRACE("%p, %p\n", phys_dev, properties2); thunk_vkGetPhysicalDeviceProperties2(phys_dev, properties2); + fill_luid_property(properties2); } void WINAPI wine_vkGetPhysicalDeviceProperties2KHR(VkPhysicalDevice phys_dev, @@ -1259,6 +1337,7 @@ void WINAPI wine_vkGetPhysicalDeviceProperties2KHR(VkPhysicalDevice phys_dev, TRACE("%p, %p\n", phys_dev, properties2); thunk_vkGetPhysicalDeviceProperties2KHR(phys_dev, properties2); + fill_luid_property(properties2); } void WINAPI wine_vkGetPhysicalDeviceExternalSemaphoreProperties(VkPhysicalDevice phys_dev, -- 2.25.1

2 2