April 2022 - Wine-Commits - list.winehq.org

Connor McAdams : webservices: Don't advance binary encoding reader if record type doesn't match.
by Alexandre Julliard April 20, 2022

April 20, 2022

Module: wine Branch: master Commit: 9eb26280f3a9354477d0cd2b3ca5159792e96b7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=9eb26280f3a9354477d0cd2b… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Apr 20 11:56:10 2022 +0200 webservices: Don't advance binary encoding reader if record type doesn't match. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 18 ++++++++++++------ dlls/webservices/tests/reader.c | 15 ++++++--------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 7da0c8335ea..b22bcbd51b1 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1486,8 +1486,9 @@ static HRESULT read_attribute_value_bin( struct reader *reader, WS_XML_ATTRIBUTE GUID guid; HRESULT hr; - if ((hr = read_byte( reader, &type )) != S_OK) return hr; + if ((hr = read_peek( reader, &type, 1 )) != S_OK) return hr; if (!is_text_type( type )) return WS_E_INVALID_FORMAT; + read_skip( reader, 1 ); switch (type) { @@ -1771,9 +1772,10 @@ static HRESULT read_attribute_bin( struct reader *reader, WS_XML_ATTRIBUTE **ret unsigned char type = 0; HRESULT hr; - if ((hr = read_byte( reader, &type )) != S_OK) return hr; + if ((hr = read_peek( reader, &type, 1 )) != S_OK) return hr; if (!is_attribute_type( type )) return WS_E_INVALID_FORMAT; if (!(attr = calloc( 1, sizeof(*attr) ))) return E_OUTOFMEMORY; + read_skip( reader, 1 ); if (type >= RECORD_PREFIX_ATTRIBUTE_A && type <= RECORD_PREFIX_ATTRIBUTE_Z) { @@ -2068,8 +2070,9 @@ static HRESULT read_element_bin( struct reader *reader ) unsigned char type; HRESULT hr; - if ((hr = read_byte( reader, &type )) != S_OK) return hr; + if ((hr = read_peek( reader, &type, 1 )) != S_OK) return hr; if (!is_element_type( type )) return WS_E_INVALID_FORMAT; + read_skip( reader, 1 ); if (!(elem = alloc_element_pair())) return E_OUTOFMEMORY; node = (struct node *)elem; @@ -2480,8 +2483,9 @@ static HRESULT read_text_bin( struct reader *reader ) GUID uuid; HRESULT hr; - if ((hr = read_byte( reader, &type )) != S_OK) return hr; + if ((hr = read_peek( reader, &type, 1 )) != S_OK) return hr; if (!is_text_type( type ) || !(parent = find_parent( reader ))) return WS_E_INVALID_FORMAT; + read_skip( reader, 1 ); switch (type) { @@ -2835,8 +2839,9 @@ static HRESULT read_endelement_bin( struct reader *reader ) if (!(reader->current->flags & NODE_FLAG_TEXT_WITH_IMPLICIT_END_ELEMENT)) { - if ((hr = read_byte( reader, &type )) != S_OK) return hr; + if ((hr = read_peek( reader, &type, 1 )) != S_OK) return hr; if (type != RECORD_ENDELEMENT) return WS_E_INVALID_FORMAT; + read_skip( reader, 1 ); } if (!(parent = find_parent( reader ))) return WS_E_INVALID_FORMAT; @@ -2917,8 +2922,9 @@ static HRESULT read_comment_bin( struct reader *reader ) ULONG len; HRESULT hr; - if ((hr = read_byte( reader, &type )) != S_OK) return hr; + if ((hr = read_peek( reader, &type, 1 )) != S_OK) return hr; if (type != RECORD_COMMENT) return WS_E_INVALID_FORMAT; + read_skip( reader, 1 ); if ((hr = read_int31( reader, &len )) != S_OK) return hr; if (!(parent = find_parent( reader ))) return WS_E_INVALID_FORMAT; diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 1a2cd1fe420..f62697b9662 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -5764,15 +5764,12 @@ static void test_binary_encoding(void) hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_READ_REQUIRED_POINTER, heap, &test_struct, sizeof(test_struct), NULL ); - todo_wine ok( hr == S_OK, "got %#lx\n", hr ); - if (SUCCEEDED(hr)) - { - ok( test_struct->a == 1, "got %d\n", test_struct->a ); - ok( !!test_struct->s, "s is not set\n" ); - ok( test_struct->s->s_a == 1, "got %d\n", test_struct->s->s_a ); - ok( test_struct->s->s_b == 0, "got %d\n", test_struct->s->s_b ); - ok( test_struct->b == 1, "got %d\n", test_struct->b ); - } + ok( hr == S_OK, "got %#lx\n", hr ); + ok( test_struct->a == 1, "got %d\n", test_struct->a ); + ok( !!test_struct->s, "s is not set\n" ); + ok( test_struct->s->s_a == 1, "got %d\n", test_struct->s->s_a ); + ok( test_struct->s->s_b == 0, "got %d\n", test_struct->s->s_b ); + ok( test_struct->b == 1, "got %d\n", test_struct->b ); WsFreeHeap( heap ); WsFreeReader( reader );

1 0

Jacek Caban : win32u: Move NtUserSetMenuContextHelpId implementation from user32.
by Alexandre Julliard April 20, 2022

April 20, 2022

Module: wine Branch: master Commit: d275253f5db5532f4778ae14344fe28ab2b88c54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d275253f5db5532f4778ae14… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 20 15:56:50 2022 +0200 win32u: Move NtUserSetMenuContextHelpId implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 19 ------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/menu.c | 15 +++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 8 ++++++++ include/ntuser.h | 1 + 8 files changed, 28 insertions(+), 21 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index b1fdacefc9c..8df665c9132 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -5255,25 +5255,6 @@ BOOL WINAPI GetMenuInfo (HMENU hMenu, LPMENUINFO lpmi) } -/********************************************************************** - * SetMenuContextHelpId (USER32.@) - */ -BOOL WINAPI SetMenuContextHelpId( HMENU hMenu, DWORD dwContextHelpID) -{ - POPUPMENU *menu; - - TRACE("(%p 0x%08x)\n", hMenu, dwContextHelpID); - - if ((menu = grab_menu_ptr(hMenu))) - { - menu->dwContextHelpID = dwContextHelpID; - release_menu_ptr(menu); - return TRUE; - } - return FALSE; -} - - /********************************************************************** * GetMenuContextHelpId (USER32.@) */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 783684e8cc7..8af07c49e98 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -679,7 +679,7 @@ @ stdcall SetLayeredWindowAttributes(ptr long long long) NtUserSetLayeredWindowAttributes @ stdcall SetLogonNotifyWindow(long long) @ stdcall SetMenu(long long) -@ stdcall SetMenuContextHelpId(long long) +@ stdcall SetMenuContextHelpId(long long) NtUserSetMenuContextHelpId @ stdcall SetMenuDefaultItem(long long long) @ stdcall SetMenuInfo(long ptr) @ stdcall SetMenuItemBitmaps(long long long long long) diff --git a/dlls/win32u/menu.c b/dlls/win32u/menu.c index b107bd7e8e0..fcb6b83b2e8 100644 --- a/dlls/win32u/menu.c +++ b/dlls/win32u/menu.c @@ -347,3 +347,18 @@ BOOL draw_menu_bar( HWND hwnd ) return NtUserSetWindowPos( hwnd, 0, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER | SWP_FRAMECHANGED ); } + +/********************************************************************** + * NtUserSetMenuContextHelpId (win32u.@) + */ +BOOL WINAPI NtUserSetMenuContextHelpId( HMENU handle, DWORD id ) +{ + POPUPMENU *menu; + + TRACE( "(%p 0x%08x)\n", handle, id ); + + if (!(menu = grab_menu_ptr( handle ))) return FALSE; + menu->dwContextHelpID = id; + release_menu_ptr( menu ); + return TRUE; +} diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index f88b8fa30da..18204a34379 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -155,6 +155,7 @@ static void * const syscalls[] = NtUserRemoveClipboardFormatListener, NtUserRemoveProp, NtUserSetKeyboardState, + NtUserSetMenuContextHelpId, NtUserSetObjectInformation, NtUserSetProcessDpiAwarenessContext, NtUserSetProcessWindowStation, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 98bfbb33a2d..4acb1dae455 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1207,7 +1207,7 @@ @ stub NtUserSetMagnificationDesktopMagnifierOffsetsDWMUpdated @ stub NtUserSetManipulationInputTarget @ stub NtUserSetMenu -@ stub NtUserSetMenuContextHelpId +@ stdcall -syscall NtUserSetMenuContextHelpId(long long) @ stub NtUserSetMenuDefaultItem @ stub NtUserSetMenuFlagRtoL @ stub NtUserSetMirrorRendering diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index c1d41c2be43..fe1b2a2e2e1 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -142,6 +142,7 @@ SYSCALL_ENTRY( NtUserRemoveClipboardFormatListener ) \ SYSCALL_ENTRY( NtUserRemoveProp ) \ SYSCALL_ENTRY( NtUserSetKeyboardState ) \ + SYSCALL_ENTRY( NtUserSetMenuContextHelpId ) \ SYSCALL_ENTRY( NtUserSetObjectInformation ) \ SYSCALL_ENTRY( NtUserSetProcessDpiAwarenessContext ) \ SYSCALL_ENTRY( NtUserSetProcessWindowStation ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index d916680660a..08c65e8a3df 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -641,3 +641,11 @@ NTSTATUS WINAPI wow64_NtUserCheckMenuItem( UINT *args ) return NtUserCheckMenuItem( handle, id, flags ); } + +NTSTATUS WINAPI wow64_NtUserSetMenuContextHelpId( UINT *args ) +{ + HMENU menu = get_handle( &args ); + DWORD id = get_ulong( &args ); + + return NtUserSetMenuContextHelpId( menu, id ); +} diff --git a/include/ntuser.h b/include/ntuser.h index 879eed4bf79..7084dec19eb 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -553,6 +553,7 @@ BOOL WINAPI NtUserSetCursorPos( INT x, INT y ); HWND WINAPI NtUserSetFocus( HWND hwnd ); BOOL WINAPI NtUserSetKeyboardState( BYTE *state ); BOOL WINAPI NtUserSetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alpha, DWORD flags ); +BOOL WINAPI NtUserSetMenuContextHelpId( HMENU handle, DWORD id ); HWND WINAPI NtUserSetParent( HWND hwnd, HWND parent ); BOOL WINAPI NtUserSetProcessDpiAwarenessContext( ULONG awareness, ULONG unknown ); BOOL WINAPI NtUserSetProcessWindowStation( HWINSTA handle );

1 0

Connor McAdams : webservices: Check for channel state in WsReceiveMessage.
by Alexandre Julliard April 20, 2022

April 20, 2022

Module: wine Branch: master Commit: dc849b0a6d1c418e09f8508a869e5ae3985abb10 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc849b0a6d1c418e09f8508a… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Apr 20 11:56:11 2022 +0200 webservices: Check for channel state in WsReceiveMessage. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 5 +++++ dlls/webservices/tests/channel.c | 28 +++++++++++++++++++++------- 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 1148744346c..cfb6566921d 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -2415,6 +2415,11 @@ HRESULT WINAPI WsReceiveMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_M LeaveCriticalSection( &channel->cs ); return E_INVALIDARG; } + if (channel->state != WS_CHANNEL_STATE_OPEN) + { + LeaveCriticalSection( &channel->cs ); + return WS_E_INVALID_OPERATION; + } if (!ctx) async_init( &async, &ctx_local ); hr = queue_receive_message( channel, msg, desc, count, option, read_option, heap, value, size, index, diff --git a/dlls/webservices/tests/channel.c b/dlls/webservices/tests/channel.c index e3cadc7d344..f70eafaecc8 100644 --- a/dlls/webservices/tests/channel.c +++ b/dlls/webservices/tests/channel.c @@ -626,6 +626,7 @@ static void server_duplex_session( WS_CHANNEL *channel ) static void client_duplex_session( const struct listener_info *info ) { WS_XML_STRING action = {6, (BYTE *)"action"}, localname = {9, (BYTE *)"localname"}, ns = {2, (BYTE *)"ns"}; + const WS_MESSAGE_DESCRIPTION *descs[1]; WS_ELEMENT_DESCRIPTION desc_body; WS_MESSAGE_DESCRIPTION desc; WS_ENDPOINT_ADDRESS addr; @@ -645,6 +646,26 @@ static void client_duplex_session( const struct listener_info *info ) hr = WsShutdownSessionChannel( channel, NULL, NULL ); ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); + desc_body.elementLocalName = &localname; + desc_body.elementNs = &ns; + desc_body.type = WS_INT32_TYPE; + desc_body.typeDescription = NULL; + desc.action = &action; + desc.bodyElementDescription = &desc_body; + descs[0] = &desc; + + hr = WsCreateMessageForChannel( channel, NULL, 0, &msg, NULL ); + ok( hr == S_OK, "got %#lx\n", hr ); + + hr = WsReceiveMessage( channel, msg, descs, 1, WS_RECEIVE_REQUIRED_MESSAGE, WS_READ_REQUIRED_VALUE, + NULL, &val, sizeof(val), NULL, NULL, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr); + + hr = WsSendMessage( channel, msg, &desc, WS_WRITE_REQUIRED_VALUE, &val, sizeof(val), NULL, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); + + WsFreeMessage( msg ); + memset( &addr, 0, sizeof(addr) ); addr.url.length = wsprintfW( buf, L"net.tcp://localhost:%u", info->port ); addr.url.chars = buf; @@ -654,13 +675,6 @@ static void client_duplex_session( const struct listener_info *info ) hr = WsCreateMessageForChannel( channel, NULL, 0, &msg, NULL ); ok( hr == S_OK, "got %#lx\n", hr ); - desc_body.elementLocalName = &localname; - desc_body.elementNs = &ns; - desc_body.type = WS_INT32_TYPE; - desc_body.typeDescription = NULL; - desc.action = &action; - desc.bodyElementDescription = &desc_body; - hr = WsSendMessage( channel, msg, &desc, WS_WRITE_REQUIRED_VALUE, &val, sizeof(val), NULL, NULL ); ok( hr == S_OK, "got %#lx\n", hr );

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Split matrix copies.
by Alexandre Julliard April 20, 2022

April 20, 2022

Module: vkd3d Branch: master Commit: e38ee49e995a8a2436b393976ce0d514d4b4661d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e38ee49e995a8a2436b3939… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Apr 18 08:34:02 2022 +0200 vkd3d-shader/hlsl: Split matrix copies. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_codegen.c | 52 ++++++++++++++++++++++++++++++++++ tests/hlsl-matrix-indexing.shader_test | 17 +++++++++++ 2 files changed, 69 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 72c00430..73e3b73f 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -672,6 +672,57 @@ static bool split_struct_copies(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr return true; } +static unsigned int minor_size(const struct hlsl_type *type) +{ + if (type->type == HLSL_CLASS_VECTOR || type->modifiers & HLSL_MODIFIER_ROW_MAJOR) + return type->dimx; + else + return type->dimy; +} + +static unsigned int major_size(const struct hlsl_type *type) +{ + if (type->type == HLSL_CLASS_VECTOR || type->modifiers & HLSL_MODIFIER_ROW_MAJOR) + return type->dimy; + else + return type->dimx; +} + +static bool split_matrix_copies(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) +{ + const struct hlsl_ir_node *rhs; + struct hlsl_type *element_type; + const struct hlsl_type *type; + unsigned int i; + struct hlsl_ir_store *store; + + if (instr->type != HLSL_IR_STORE) + return false; + + store = hlsl_ir_store(instr); + rhs = store->rhs.node; + type = rhs->data_type; + if (type->type != HLSL_CLASS_MATRIX) + return false; + element_type = hlsl_get_vector_type(ctx, type->base_type, minor_size(type)); + + if (rhs->type != HLSL_IR_LOAD) + { + hlsl_fixme(ctx, &instr->loc, "Copying from unsupported node type.\n"); + return false; + } + + for (i = 0; i < major_size(type); ++i) + { + if (!split_copy(ctx, store, hlsl_ir_load(rhs), 4 * i, element_type)) + return false; + } + + list_remove(&store->node.entry); + hlsl_free_instr(&store->node); + return true; +} + static bool lower_narrowing_casts(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { const struct hlsl_type *src_type, *dst_type; @@ -1685,6 +1736,7 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry progress |= transform_ir(ctx, split_struct_copies, body, NULL); } while (progress); + transform_ir(ctx, split_matrix_copies, body, NULL); transform_ir(ctx, lower_narrowing_casts, body, NULL); transform_ir(ctx, lower_casts_to_bool, body, NULL); do diff --git a/tests/hlsl-matrix-indexing.shader_test b/tests/hlsl-matrix-indexing.shader_test index 1d444ffa..e2103fe2 100644 --- a/tests/hlsl-matrix-indexing.shader_test +++ b/tests/hlsl-matrix-indexing.shader_test @@ -45,3 +45,20 @@ uniform 8 float4 9.0 10.0 11.0 12.0 uniform 12 float4 13.0 14.0 15.0 16.0 todo draw quad probe all rgba (1.0, 5.0, 7.0, 12.0) + +[pixel shader] +uniform float4x4 m; + +float4 main() : SV_TARGET +{ + float4x4 m2 = m; + return float4(m2[0][0], m2[1][0], m2[1][2], m2[2][3]); +} + +[test] +uniform 0 float4 1.0 2.0 3.0 4.0 +uniform 4 float4 5.0 6.0 7.0 8.0 +uniform 8 float4 9.0 10.0 11.0 12.0 +uniform 12 float4 13.0 14.0 15.0 16.0 +todo draw quad +probe all rgba (1.0, 2.0, 10.0, 15.0)

1 0

Zebediah Figura : vkd3d-shader/hlsl: Return bool from add_record_load() and add_array_load().
by Alexandre Julliard April 20, 2022

April 20, 2022

Module: vkd3d Branch: master Commit: aaa743033a5ede8b8c946c91e942b7853315aa9a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=aaa743033a5ede8b8c946c9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Apr 18 08:34:00 2022 +0200 vkd3d-shader/hlsl: Return bool from add_record_load() and add_array_load(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 58d71ff6..fd808648 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -569,19 +569,19 @@ static struct hlsl_ir_load *add_load(struct hlsl_ctx *ctx, struct list *instrs, return load; } -static struct hlsl_ir_load *add_record_load(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_node *record, +static bool add_record_load(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_node *record, const struct hlsl_struct_field *field, const struct vkd3d_shader_location loc) { struct hlsl_ir_constant *c; if (!(c = hlsl_new_uint_constant(ctx, field->reg_offset, &loc))) - return NULL; + return false; list_add_tail(instrs, &c->node.entry); - return add_load(ctx, instrs, record, &c->node, field->type, loc); + return !!add_load(ctx, instrs, record, &c->node, field->type, loc); } -static struct hlsl_ir_load *add_array_load(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_node *array, +static bool add_array_load(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_node *array, struct hlsl_ir_node *index, const struct vkd3d_shader_location loc) { const struct hlsl_type *expr_type = array->data_type; @@ -597,7 +597,7 @@ static struct hlsl_ir_load *add_array_load(struct hlsl_ctx *ctx, struct list *in { /* This needs to be lowered now, while we still have type information. */ FIXME("Index of matrix or vector type.\n"); - return NULL; + return false; } else { @@ -605,18 +605,18 @@ static struct hlsl_ir_load *add_array_load(struct hlsl_ctx *ctx, struct list *in hlsl_error(ctx, &loc, VKD3D_SHADER_ERROR_HLSL_INVALID_INDEX, "Scalar expressions cannot be array-indexed."); else hlsl_error(ctx, &loc, VKD3D_SHADER_ERROR_HLSL_INVALID_INDEX, "Expression cannot be array-indexed."); - return NULL; + return false; } if (!(c = hlsl_new_uint_constant(ctx, hlsl_type_get_array_element_reg_size(data_type), &loc))) - return NULL; + return false; list_add_tail(instrs, &c->node.entry); if (!(mul = hlsl_new_binary_expr(ctx, HLSL_OP2_MUL, index, &c->node))) - return NULL; + return false; list_add_tail(instrs, &mul->entry); index = mul; - return add_load(ctx, instrs, array, index, data_type, loc); + return !!add_load(ctx, instrs, array, index, data_type, loc); } static struct hlsl_struct_field *get_struct_field(struct list *fields, const char *name)

1 0

Zebediah Figura : tests: Load libvulkan dynamically in shader_runner_vulkan.c.
by Alexandre Julliard April 20, 2022

April 20, 2022

Module: vkd3d Branch: master Commit: beffe5f3674088d175c77dca439fc4cceaf84cb9 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=beffe5f3674088d175c77dc… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Apr 18 20:28:45 2022 -0500 tests: Load libvulkan dynamically in shader_runner_vulkan.c. We would like to allow overriding the soname of libvulkan, in which case the tests and demos should respect that override. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 +- tests/shader_runner_vulkan.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 3079a0df..44c80373 100644 --- a/Makefile.am +++ b/Makefile.am @@ -309,7 +309,7 @@ TESTS = $(vkd3d_tests) $(vkd3d_cross_tests) $(vkd3d_shader_tests) tests_d3d12_LDADD = $(LDADD) @PTHREAD_LIBS@ @VULKAN_LIBS@ tests_d3d12_invalid_usage_LDADD = $(LDADD) @VULKAN_LIBS@ tests_hlsl_d3d12_LDADD = $(LDADD) @VULKAN_LIBS@ -tests_shader_runner_LDADD = $(LDADD) @VULKAN_LIBS@ +tests_shader_runner_LDADD = $(LDADD) @VULKAN_LIBS@ @DL_LIBS@ tests_shader_runner_SOURCES = \ tests/shader_runner.c \ tests/shader_runner_d3d12.c \ diff --git a/tests/shader_runner_vulkan.c b/tests/shader_runner_vulkan.c index 4a30ea85..5d4b65cf 100644 --- a/tests/shader_runner_vulkan.c +++ b/tests/shader_runner_vulkan.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define VK_NO_PROTOTYPES #include "config.h" #include "vulkan/vulkan.h" #include "vkd3d_shader.h" @@ -45,6 +46,8 @@ static struct vulkan_resource *vulkan_resource(struct resource *r) #define DECLARE_VK_PFN(name) PFN_##name name; +DECLARE_VK_PFN(vkGetInstanceProcAddr) + struct vulkan_shader_runner { struct shader_runner r; @@ -984,8 +987,16 @@ static bool init_vulkan_runner(struct vulkan_shader_runner *runner) VkFormatProperties format_props; uint32_t count, graphics_index; VkDevice device; + void *libvulkan; VkResult vr; + if (!(libvulkan = vkd3d_dlopen(SONAME_LIBVULKAN))) + { + skip("Failed to load %s: %s.\n", SONAME_LIBVULKAN, vkd3d_dlerror()); + return false; + } + vkGetInstanceProcAddr = vkd3d_dlsym(libvulkan, "vkGetInstanceProcAddr"); + runner->vkCreateInstance = (void *)vkGetInstanceProcAddr(NULL, "vkCreateInstance"); if ((vr = VK_CALL(vkCreateInstance(&instance_desc, NULL, &runner->instance))) < 0)

1 0

Zebediah Figura : tests: Load libvulkan dynamically in d3d12_crosstest.h.
by Alexandre Julliard April 20, 2022

April 20, 2022

Module: vkd3d Branch: master Commit: 0929ec7462fc778007b8fb555eca86db48e997ee URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0929ec7462fc778007b8fb5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Apr 18 20:28:46 2022 -0500 tests: Load libvulkan dynamically in d3d12_crosstest.h. We would like to allow overriding the soname of libvulkan, in which case the tests and demos should respect that override. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 8 ++++---- tests/d3d12_crosstest.h | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 44c80373..894f1e63 100644 --- a/Makefile.am +++ b/Makefile.am @@ -306,10 +306,10 @@ TEST_EXTENSIONS = .shader_test if BUILD_TESTS check_PROGRAMS = $(vkd3d_tests) $(vkd3d_cross_tests) tests/shader_runner TESTS = $(vkd3d_tests) $(vkd3d_cross_tests) $(vkd3d_shader_tests) -tests_d3d12_LDADD = $(LDADD) @PTHREAD_LIBS@ @VULKAN_LIBS@ -tests_d3d12_invalid_usage_LDADD = $(LDADD) @VULKAN_LIBS@ -tests_hlsl_d3d12_LDADD = $(LDADD) @VULKAN_LIBS@ -tests_shader_runner_LDADD = $(LDADD) @VULKAN_LIBS@ @DL_LIBS@ +tests_d3d12_LDADD = $(LDADD) @PTHREAD_LIBS@ @DL_LIBS@ +tests_d3d12_invalid_usage_LDADD = $(LDADD) @DL_LIBS@ +tests_hlsl_d3d12_LDADD = $(LDADD) @DL_LIBS@ +tests_shader_runner_LDADD = $(LDADD) @DL_LIBS@ tests_shader_runner_SOURCES = \ tests/shader_runner.c \ tests/shader_runner_d3d12.c \ diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index fc761809..e6dc7a6c 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -39,6 +39,7 @@ typedef int HRESULT; #endif +#define VK_NO_PROTOTYPES #define COBJMACROS #define CONST_VTABLE #define INITGUID @@ -419,6 +420,11 @@ static inline bool is_depth_clip_enable_supported(ID3D12Device *device) #else +#define DECLARE_VK_PFN(name) static PFN_##name name; +DECLARE_VK_PFN(vkGetInstanceProcAddr) +#define VK_INSTANCE_PFN DECLARE_VK_PFN +#include "vulkan_procs.h" + static bool check_device_extension(VkPhysicalDevice vk_physical_device, const char *name) { VkExtensionProperties *properties; @@ -585,8 +591,20 @@ static void init_adapter_info(void) VkPhysicalDeviceDriverPropertiesKHR driver_properties; struct vkd3d_instance *instance; ID3D12Device *device; + void *libvulkan; HRESULT hr; + if (!(libvulkan = vkd3d_dlopen(SONAME_LIBVULKAN))) + { + skip("Failed to load %s: %s.\n", SONAME_LIBVULKAN, vkd3d_dlerror()); + return; + } + +#define LOAD_VK_PFN(name) name = vkd3d_dlsym(libvulkan, #name); +LOAD_VK_PFN(vkGetInstanceProcAddr) +#define VK_INSTANCE_PFN LOAD_VK_PFN +#include "vulkan_procs.h" + if (FAILED(hr = create_vkd3d_instance(&instance))) return;

1 0

Zebediah Figura : include: Implement vkd3d_dl*() wrappers for Win32 platforms.
by Alexandre Julliard April 20, 2022

April 20, 2022

Module: vkd3d Branch: master Commit: d087b9ea5b4fffcd03e3c4925c2eb83ab8d1f39e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d087b9ea5b4fffcd03e3c49… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Apr 18 20:28:42 2022 -0500 include: Implement vkd3d_dl*() wrappers for Win32 platforms. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/private/vkd3d_common.h | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index 7aabe8ab..c041b52d 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -27,6 +27,7 @@ #include <limits.h> #include <stdbool.h> #include <stdint.h> +#include <stdio.h> #ifdef _MSC_VER #include <intrin.h> @@ -246,7 +247,33 @@ static inline void vkd3d_parse_version(const char *version, int *major, int *min HRESULT hresult_from_vkd3d_result(int vkd3d_result); -#ifdef HAVE_DLFCN_H +#ifdef _WIN32 +static inline void *vkd3d_dlopen(const char *name) +{ + return LoadLibraryA(name); +} + +static inline void *vkd3d_dlsym(void *handle, const char *symbol) +{ + return GetProcAddress(handle, symbol); +} + +static inline int vkd3d_dlclose(void *handle) +{ + return FreeLibrary(handle); +} + +static inline const char *vkd3d_dlerror(void) +{ + unsigned int error = GetLastError(); + static char message[256]; + + if (FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM, NULL, error, 0, message, sizeof(message), NULL)) + return message; + sprintf(message, "Unknown error %u.\n", error); + return message; +} +#elif defined(HAVE_DLFCN_H) #include <dlfcn.h> static inline void *vkd3d_dlopen(const char *name)

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Support vector indexing.
by Alexandre Julliard April 20, 2022

April 20, 2022

Module: vkd3d Branch: master Commit: d1fac2660c3f5e4f5c72b785f8a0a29dbc298f05 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d1fac2660c3f5e4f5c72b78… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Apr 18 08:34:01 2022 +0200 vkd3d-shader/hlsl: Support vector indexing. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 14 ++++++++++---- tests/hlsl-vector-indexing.shader_test | 4 ++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index fd808648..291f8392 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -592,13 +592,21 @@ static bool add_array_load(struct hlsl_ctx *ctx, struct list *instrs, struct hls if (expr_type->type == HLSL_CLASS_ARRAY) { data_type = expr_type->e.array.type; + if (!(c = hlsl_new_uint_constant(ctx, hlsl_type_get_array_element_reg_size(data_type), &loc))) + return false; } - else if (expr_type->type == HLSL_CLASS_MATRIX || expr_type->type == HLSL_CLASS_VECTOR) + else if (expr_type->type == HLSL_CLASS_MATRIX) { /* This needs to be lowered now, while we still have type information. */ - FIXME("Index of matrix or vector type.\n"); + FIXME("Index of matrix type.\n"); return false; } + else if (expr_type->type == HLSL_CLASS_VECTOR) + { + data_type = hlsl_get_scalar_type(ctx, expr_type->base_type); + if (!(c = hlsl_new_uint_constant(ctx, 1, &loc))) + return false; + } else { if (expr_type->type == HLSL_CLASS_SCALAR) @@ -608,8 +616,6 @@ static bool add_array_load(struct hlsl_ctx *ctx, struct list *instrs, struct hls return false; } - if (!(c = hlsl_new_uint_constant(ctx, hlsl_type_get_array_element_reg_size(data_type), &loc))) - return false; list_add_tail(instrs, &c->node.entry); if (!(mul = hlsl_new_binary_expr(ctx, HLSL_OP2_MUL, index, &c->node))) return false; diff --git a/tests/hlsl-vector-indexing.shader_test b/tests/hlsl-vector-indexing.shader_test index 1c964147..f2d20c44 100644 --- a/tests/hlsl-vector-indexing.shader_test +++ b/tests/hlsl-vector-indexing.shader_test @@ -10,7 +10,7 @@ float4 main() : SV_TARGET } [test] -todo draw quad +draw quad probe all rgba (0.02, 0.245, 0.351, 1.0) [pixel shader] @@ -23,5 +23,5 @@ float4 main() : SV_TARGET [test] uniform 0 float4 1.0 2.0 3.0 4.0 -todo draw quad +draw quad probe all rgba (1.0, 2.0, 2.0, 3.0)

1 0

Zebediah Figura : include: Move vkd3d_dl*() helpers to vkd3d_common.h.
by Alexandre Julliard April 20, 2022

April 20, 2022

Module: vkd3d Branch: master Commit: a58e713314486521d990c5aef619df3a5db34067 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a58e713314486521d990c5a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Apr 18 20:28:41 2022 -0500 include: Move vkd3d_dl*() helpers to vkd3d_common.h. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/private/vkd3d_common.h | 44 +++++++++++++++++++++++++++++++++++++++++ libs/vkd3d/device.c | 45 ------------------------------------------ 2 files changed, 44 insertions(+), 45 deletions(-) diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index 11acc643..7aabe8ab 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -246,4 +246,48 @@ static inline void vkd3d_parse_version(const char *version, int *major, int *min HRESULT hresult_from_vkd3d_result(int vkd3d_result); +#ifdef HAVE_DLFCN_H +#include <dlfcn.h> + +static inline void *vkd3d_dlopen(const char *name) +{ + return dlopen(name, RTLD_NOW); +} + +static inline void *vkd3d_dlsym(void *handle, const char *symbol) +{ + return dlsym(handle, symbol); +} + +static inline int vkd3d_dlclose(void *handle) +{ + return dlclose(handle); +} + +static inline const char *vkd3d_dlerror(void) +{ + return dlerror(); +} +#else +static inline void *vkd3d_dlopen(const char *name) +{ + return NULL; +} + +static inline void *vkd3d_dlsym(void *handle, const char *symbol) +{ + return NULL; +} + +static inline int vkd3d_dlclose(void *handle) +{ + return 0; +} + +static inline const char *vkd3d_dlerror(void) +{ + return "Not implemented for this platform.\n"; +} +#endif + #endif /* __VKD3D_COMMON_H */ diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index ab087d60..0b643727 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -19,51 +19,6 @@ #include "vkd3d_private.h" #include "vkd3d_version.h" -#ifdef HAVE_DLFCN_H -#include <dlfcn.h> - -static void *vkd3d_dlopen(const char *name) -{ - return dlopen(name, RTLD_NOW); -} - -static void *vkd3d_dlsym(void *handle, const char *symbol) -{ - return dlsym(handle, symbol); -} - -static int vkd3d_dlclose(void *handle) -{ - return dlclose(handle); -} - -static const char *vkd3d_dlerror(void) -{ - return dlerror(); -} -#else -static void *vkd3d_dlopen(const char *name) -{ - FIXME("Not implemented for this platform.\n"); - return NULL; -} - -static void *vkd3d_dlsym(void *handle, const char *symbol) -{ - return NULL; -} - -static int vkd3d_dlclose(void *handle) -{ - return 0; -} - -static const char *vkd3d_dlerror(void) -{ - return "Not implemented for this platform.\n"; -} -#endif - struct vkd3d_struct { enum vkd3d_structure_type type;

1 0