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

Alexandre Julliard : urlmon/tests: Update winehq.org's IP address.
by Alexandre Julliard 23 Jun '20

23 Jun '20

Module: wine Branch: master Commit: ef9d05d9c2e62d31f59d1ad649856031b47a625b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef9d05d9c2e62d31f59d1ad6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 23 22:34:00 2020 +0200 urlmon/tests: Update winehq.org's IP address. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/url.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index cfa29248d6..6dd47732dd 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -157,10 +157,9 @@ static const WCHAR wszTextHtml[] = {'t','e','x','t','/','h','t','m','l',0}; static WCHAR BSCBHolder[] = { '_','B','S','C','B','_','H','o','l','d','e','r','_',0 }; -static const WCHAR wszWineHQSite[] = - {'w','w','w','.','w','i','n','e','h','q','.','o','r','g',0}; -static const WCHAR wszWineHQIP[] = - {'4','.','1','5','.','1','8','4','.','7','7',0}; +#define WINEHQ_IP "4.4.81.124" +static const WCHAR wszWineHQSite[] = L"www.winehq.org"; +static const WCHAR wszWineHQIP[] = L"" WINEHQ_IP; static const CHAR wszIndexHtmlA[] = "index.html"; static const WCHAR cache_fileW[] = {'c',':','\\','c','a','c','h','e','.','h','t','m',0}; static const CHAR dwl_htmlA[] = "dwl.html"; @@ -2870,7 +2869,7 @@ static void init_bind_test(int protocol, DWORD flags, DWORD t) url_a = "its:test.chm::/blank.html"; break; case HTTPS_TEST: - url_a = (flags & BINDTEST_INVALID_CN) ? "https://4.15.184.77/favicon.ico" : "https://test.winehq.org/tests/hello.html"; + url_a = (flags & BINDTEST_INVALID_CN) ? "https://" WINEHQ_IP "/favicon.ico" : "https://test.winehq.org/tests/hello.html"; break; case FTP_TEST: url_a = "ftp://ftp.winehq.org/welcome%2emsg";

1 0

Hans Leidekker : winhttp: Don't close child handles on release.
by Alexandre Julliard 23 Jun '20

23 Jun '20

Module: wine Branch: master Commit: 933665147704ab07e702bf4366f1a9a8aa6a62d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=933665147704ab07e702bf43… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 22 21:39:20 2020 +0200 winhttp: Don't close child handles on release. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/handle.c | 14 ++------------ dlls/winhttp/request.c | 2 -- dlls/winhttp/session.c | 5 ----- dlls/winhttp/tests/winhttp.c | 27 +++++++++++++++++++++++---- dlls/winhttp/winhttp_private.h | 1 - 5 files changed, 25 insertions(+), 24 deletions(-) diff --git a/dlls/winhttp/handle.c b/dlls/winhttp/handle.c index 9c77d5166a..08052b91ee 100644 --- a/dlls/winhttp/handle.c +++ b/dlls/winhttp/handle.c @@ -79,7 +79,6 @@ void release_object( struct object_header *hdr ) send_callback( hdr, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, &hdr->handle, sizeof(HINTERNET) ); TRACE("destroying object %p\n", hdr); - if (hdr->type != WINHTTP_HANDLE_TYPE_SESSION) list_remove( &hdr->entry ); hdr->vtbl->destroy( hdr ); } } @@ -89,7 +88,6 @@ HINTERNET alloc_handle( struct object_header *hdr ) struct object_header **p; ULONG_PTR handle, num; - list_init( &hdr->children ); hdr->handle = NULL; EnterCriticalSection( &handle_cs ); @@ -123,7 +121,7 @@ BOOL free_handle( HINTERNET hinternet ) { BOOL ret = FALSE; ULONG_PTR handle = (ULONG_PTR)hinternet; - struct object_header *hdr = NULL, *child, *next; + struct object_header *hdr = NULL; EnterCriticalSection( &handle_cs ); @@ -141,15 +139,7 @@ BOOL free_handle( HINTERNET hinternet ) LeaveCriticalSection( &handle_cs ); - if (hdr) - { - LIST_FOR_EACH_ENTRY_SAFE( child, next, &hdr->children, struct object_header, entry ) - { - TRACE("freeing child handle %p for parent handle 0x%lx\n", child->handle, handle + 1); - free_handle( child->handle ); - } - release_object( hdr ); - } + if (hdr) release_object( hdr ); EnterCriticalSection( &handle_cs ); if (next_handle > handle && !handles[handle]) next_handle = handle; diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 0511dd44ee..08e9d7584e 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3102,11 +3102,9 @@ HINTERNET WINAPI WinHttpWebSocketCompleteUpgrade( HINTERNET hrequest, DWORD_PTR socket->hdr.vtbl = &socket_vtbl; socket->hdr.refs = 1; socket->hdr.context = context; - list_init( &socket->hdr.children ); addref_object( &request->hdr ); socket->request = request; - list_add_head( &request->hdr.children, &socket->hdr.entry ); if ((hsocket = alloc_handle( &socket->hdr ))) socket->hdr.handle = hsocket; diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 87974ffbd8..13d228d851 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -246,7 +246,6 @@ HINTERNET WINAPI WinHttpOpen( LPCWSTR agent, DWORD access, LPCWSTR proxy, LPCWST session->hdr.flags = flags; session->hdr.refs = 1; session->hdr.redirect_policy = WINHTTP_OPTION_REDIRECT_POLICY_DISALLOW_HTTPS_TO_HTTP; - list_init( &session->hdr.children ); session->resolve_timeout = DEFAULT_RESOLVE_TIMEOUT; session->connect_timeout = DEFAULT_CONNECT_TIMEOUT; session->send_timeout = DEFAULT_SEND_TIMEOUT; @@ -552,11 +551,9 @@ HINTERNET WINAPI WinHttpConnect( HINTERNET hsession, LPCWSTR server, INTERNET_PO connect->hdr.notify_mask = session->hdr.notify_mask; connect->hdr.context = session->hdr.context; connect->hdr.redirect_policy = session->hdr.redirect_policy; - list_init( &connect->hdr.children ); addref_object( &session->hdr ); connect->session = session; - list_add_head( &session->hdr.children, &connect->hdr.entry ); if (!(connect->hostname = strdupW( server ))) goto end; connect->hostport = port; @@ -1121,12 +1118,10 @@ HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, LPCWSTR verb, LPCWSTR o request->hdr.notify_mask = connect->hdr.notify_mask; request->hdr.context = connect->hdr.context; request->hdr.redirect_policy = connect->hdr.redirect_policy; - list_init( &request->hdr.children ); list_init( &request->task_queue ); addref_object( &connect->hdr ); request->connect = connect; - list_add_head( &connect->hdr.children, &request->hdr.entry ); request->resolve_timeout = connect->session->resolve_timeout; request->connect_timeout = connect->session->connect_timeout; diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 8083c4825b..be02bbe250 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -3099,6 +3099,7 @@ static void test_websocket(int port) { HINTERNET session, connection, request, socket; DWORD size, len, count, status, index, error; + DWORD_PTR ctx; WCHAR header[32]; char buf[128]; BOOL ret; @@ -3244,10 +3245,28 @@ static void test_websocket(int port) /* Send/Receive on websock */ - WinHttpCloseHandle(request); - WinHttpCloseHandle(socket); - WinHttpCloseHandle(connection); - WinHttpCloseHandle(session); + ret = WinHttpCloseHandle(connection); + ok(ret, "got %u\n", GetLastError()); + + /* request handle is still valid */ + size = sizeof(ctx); + ret = WinHttpQueryOption(request, WINHTTP_OPTION_CONTEXT_VALUE, &ctx, &size); + ok(ret, "got %u\n", GetLastError()); + + ret = WinHttpCloseHandle(socket); + ok(ret, "got %u\n", GetLastError()); + + ret = WinHttpQueryOption(request, WINHTTP_OPTION_CONTEXT_VALUE, &ctx, &size); + ok(ret, "got %u\n", GetLastError()); + + ret = WinHttpCloseHandle(session); + ok(ret, "got %u\n", GetLastError()); + + ret = WinHttpQueryOption(request, WINHTTP_OPTION_CONTEXT_VALUE, &ctx, &size); + ok(ret, "got %u\n", GetLastError()); + + ret = WinHttpCloseHandle(request); + ok(ret, "got %u\n", GetLastError()); } static void test_not_modified(int port) diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index af695f86c3..9b07b64b09 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -51,7 +51,6 @@ struct object_header WINHTTP_STATUS_CALLBACK callback; DWORD notify_mask; struct list entry; - struct list children; }; struct hostdata

1 0

Hans Leidekker : winhttp: Get rid of some redundant assignments.
by Alexandre Julliard 23 Jun '20

23 Jun '20

Module: wine Branch: master Commit: 5c4f1e4c82ace138fa411cf06421440916d347c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c4f1e4c82ace138fa411cf0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 22 21:39:21 2020 +0200 winhttp: Get rid of some redundant assignments. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 2 +- dlls/winhttp/session.c | 19 +++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 08e9d7584e..1324005f1d 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3106,7 +3106,7 @@ HINTERNET WINAPI WinHttpWebSocketCompleteUpgrade( HINTERNET hrequest, DWORD_PTR addref_object( &request->hdr ); socket->request = request; - if ((hsocket = alloc_handle( &socket->hdr ))) socket->hdr.handle = hsocket; + hsocket = alloc_handle( &socket->hdr ); release_object( &socket->hdr ); release_object( &request->hdr ); diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 13d228d851..a5ec8b22f3 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -282,8 +282,7 @@ HINTERNET WINAPI WinHttpOpen( LPCWSTR agent, DWORD access, LPCWSTR proxy, LPCWST if (bypass && !(session->proxy_bypass = strdupW( bypass ))) goto end; } - if (!(handle = alloc_handle( &session->hdr ))) goto end; - session->hdr.handle = handle; + handle = alloc_handle( &session->hdr ); end: release_object( &session->hdr ); @@ -559,10 +558,10 @@ HINTERNET WINAPI WinHttpConnect( HINTERNET hsession, LPCWSTR server, INTERNET_PO connect->hostport = port; if (!set_server_for_hostname( connect, server, port )) goto end; - if (!(hconnect = alloc_handle( &connect->hdr ))) goto end; - connect->hdr.handle = hconnect; - - send_callback( &session->hdr, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED, &hconnect, sizeof(hconnect) ); + if ((hconnect = alloc_handle( &connect->hdr ))) + { + send_callback( &session->hdr, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED, &hconnect, sizeof(hconnect) ); + } end: release_object( &connect->hdr ); @@ -1137,10 +1136,10 @@ HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, LPCWSTR verb, LPCWSTR o if (!(request->version = strdupW( version ))) goto end; if (!(add_accept_types_header( request, types ))) goto end; - if (!(hrequest = alloc_handle( &request->hdr ))) goto end; - request->hdr.handle = hrequest; - - send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED, &hrequest, sizeof(hrequest) ); + if ((hrequest = alloc_handle( &request->hdr ))) + { + send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED, &hrequest, sizeof(hrequest) ); + } end: release_object( &request->hdr );

1 0

Hans Leidekker : winhttp: Make the task queue implementation more generic.
by Alexandre Julliard 23 Jun '20

23 Jun '20

Module: wine Branch: master Commit: 6a98d5f524b74c0ec3ea5879be30c929c75042b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a98d5f524b74c0ec3ea5879… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 22 21:39:22 2020 +0200 winhttp: Make the task queue implementation more generic. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 174 +++++++++++++++++++++-------------------- dlls/winhttp/session.c | 12 ++- dlls/winhttp/winhttp_private.h | 18 +++-- 3 files changed, 109 insertions(+), 95 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6a98d5f524b74c0ec3ea…

1 0

Alistair Leslie-Hughes : winhttp: Pass length in WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER callback.
by Alexandre Julliard 23 Jun '20

23 Jun '20

Module: wine Branch: master Commit: 57a1936053380de95c247d81619c5dc7bf73086d URL: https://source.winehq.org/git/wine.git/?a=commit;h=57a1936053380de95c247d81… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jun 22 21:39:23 2020 +0200 winhttp: Pass length in WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER callback. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 9b72253a26..3129d4154e 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1592,7 +1592,8 @@ static DWORD open_connection( struct request *request ) TRACE("connecting to %s:%u\n", debugstr_w(addressW), port); - send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER, addressW, 0 ); + len = lstrlenW( addressW ) + 1; + send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER, addressW, len ); if ((ret = netconn_create( host, &connect->sockaddr, request->connect_timeout, &netconn ))) {

1 0

Hans Leidekker : winhttp: Set socket notification mask and callback from the parent request.
by Alexandre Julliard 23 Jun '20

23 Jun '20

Module: wine Branch: master Commit: c8c0bc6d2e428129886bbecf9881645f3666b16f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8c0bc6d2e428129886bbecf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 22 21:39:24 2020 +0200 winhttp: Set socket notification mask and callback from the parent request. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 3129d4154e..d44baa26c2 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3106,6 +3106,8 @@ HINTERNET WINAPI WinHttpWebSocketCompleteUpgrade( HINTERNET hrequest, DWORD_PTR socket->hdr.type = WINHTTP_HANDLE_TYPE_SOCKET; socket->hdr.vtbl = &socket_vtbl; socket->hdr.refs = 1; + socket->hdr.callback = request->hdr.callback; + socket->hdr.notify_mask = request->hdr.notify_mask; socket->hdr.context = context; addref_object( &request->hdr );

1 0

Hans Leidekker : winhttp: Send WINHTTP_CALLBACK_STATUS_HANDLE_CREATED notification in WinHttpWebSocketCompleteUpgrade.
by Alexandre Julliard 23 Jun '20

23 Jun '20

Module: wine Branch: master Commit: cc1c4759bacace8a8d1060e8b0e20dce592accd3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc1c4759bacace8a8d1060e8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 22 21:39:25 2020 +0200 winhttp: Send WINHTTP_CALLBACK_STATUS_HANDLE_CREATED notification in WinHttpWebSocketCompleteUpgrade. Based on a patch by Alistair Leslie-Hughes. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index d44baa26c2..0c038289f8 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3113,7 +3113,10 @@ HINTERNET WINAPI WinHttpWebSocketCompleteUpgrade( HINTERNET hrequest, DWORD_PTR addref_object( &request->hdr ); socket->request = request; - hsocket = alloc_handle( &socket->hdr ); + if ((hsocket = alloc_handle( &socket->hdr ))) + { + send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED, &hsocket, sizeof(hsocket) ); + } release_object( &socket->hdr ); release_object( &request->hdr );

1 0

Zebediah Figura : d3dcompiler: Prepend static initializers to the function body.
by Alexandre Julliard 23 Jun '20

23 Jun '20

Module: wine Branch: master Commit: 142be506298368dc820d0f51ab163fa071fa4cd2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=142be506298368dc820d0f51… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 18 10:46:20 2020 -0500 d3dcompiler: Prepend static initializers to the function body. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/d3dcompiler_private.h | 2 ++ dlls/d3dcompiler_43/hlsl.y | 20 +++++++++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 9feaee0d8a..a2d9c04d3b 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -979,6 +979,8 @@ struct hlsl_parse_ctx struct hlsl_type *sampler[HLSL_SAMPLER_DIM_MAX + 1]; struct hlsl_type *Void; } builtin_types; + + struct list static_initializers; }; extern struct hlsl_parse_ctx hlsl_ctx DECLSPEC_HIDDEN; diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 393f8d52fb..c9dbdeb8c1 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -888,14 +888,17 @@ static struct list *declare_vars(struct hlsl_type *basic_type, DWORD modifiers, continue; } - list_move_tail(statements_list, v->initializer.instrs); - d3dcompiler_free(v->initializer.instrs); - load = new_var_load(var, var->loc); - list_add_tail(statements_list, &load->node.entry); + list_add_tail(v->initializer.instrs, &load->node.entry); assignment = make_assignment(&load->node, ASSIGN_OP_ASSIGN, v->initializer.args[0]); d3dcompiler_free(v->initializer.args); - list_add_tail(statements_list, &assignment->entry); + list_add_tail(v->initializer.instrs, &assignment->entry); + + if (modifiers & HLSL_STORAGE_STATIC) + list_move_tail(&hlsl_ctx.static_initializers, v->initializer.instrs); + else + list_move_tail(statements_list, v->initializer.instrs); + d3dcompiler_free(v->initializer.instrs); } d3dcompiler_free(v); } @@ -1514,6 +1517,10 @@ hlsl_prog: /* empty */ | hlsl_prog declaration_statement { TRACE("Declaration statement parsed.\n"); + + if (!list_empty($2)) + FIXME("Uniform initializer.\n"); + free_instr_list($2); } | hlsl_prog preproc_directive { @@ -2961,6 +2968,7 @@ HRESULT parse_hlsl(enum shader_type type, DWORD major, DWORD minor, list_init(&hlsl_ctx.scopes); list_init(&hlsl_ctx.types); init_functions_tree(&hlsl_ctx.functions); + list_init(&hlsl_ctx.static_initializers); push_scope(&hlsl_ctx); hlsl_ctx.globals = hlsl_ctx.cur_scope; @@ -2984,6 +2992,8 @@ HRESULT parse_hlsl(enum shader_type type, DWORD major, DWORD minor, "entry point \"%s\" is missing a return value semantic", entry_func->func->name); } + list_move_head(entry_func->body, &hlsl_ctx.static_initializers); + /* Index 0 means unused; index 1 means function entry, so start at 2. */ index_instructions(entry_func->body, 2);

1 0

Zebediah Figura : d3dcompiler: Pass an instruction list to the load creation functions.
by Alexandre Julliard 23 Jun '20

23 Jun '20

Module: wine Branch: master Commit: 548f763f995eefcd56a0ec6f03cf2fb8db837201 URL: https://source.winehq.org/git/wine.git/?a=commit;h=548f763f995eefcd56a0ec6f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 18 10:46:24 2020 -0500 d3dcompiler: Pass an instruction list to the load creation functions. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/hlsl.y | 61 +++++++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index c9dbdeb8c1..f6285e6658 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -620,7 +620,7 @@ static struct hlsl_ir_load *new_var_load(struct hlsl_ir_var *var, const struct s return load; } -static struct hlsl_ir_load *new_load(struct hlsl_ir_node *var_node, struct hlsl_ir_node *offset, +static struct hlsl_ir_load *add_load(struct list *instrs, struct hlsl_ir_node *var_node, struct hlsl_ir_node *offset, struct hlsl_type *data_type, const struct source_location loc) { struct hlsl_ir_node *add = NULL; @@ -636,7 +636,7 @@ static struct hlsl_ir_load *new_load(struct hlsl_ir_node *var_node, struct hlsl_ { if (!(add = new_binary_expr(HLSL_IR_BINOP_ADD, src->offset, offset, loc))) return NULL; - list_add_after(&offset->entry, &add->entry); + list_add_tail(instrs, &add->entry); offset = add; } } @@ -654,7 +654,7 @@ static struct hlsl_ir_load *new_load(struct hlsl_ir_node *var_node, struct hlsl_ if (!(assign = make_simple_assignment(var, var_node))) return NULL; - list_add_after(&var_node->entry, &assign->node.entry); + list_add_tail(instrs, &assign->node.entry); } if (!(load = d3dcompiler_alloc(sizeof(*load)))) @@ -662,23 +662,23 @@ static struct hlsl_ir_load *new_load(struct hlsl_ir_node *var_node, struct hlsl_ init_node(&load->node, HLSL_IR_LOAD, data_type, loc); load->src.var = var; load->src.offset = offset; - list_add_after(&offset->entry, &load->node.entry); + list_add_tail(instrs, &load->node.entry); return load; } -static struct hlsl_ir_load *new_record_load(struct hlsl_ir_node *record, +static struct hlsl_ir_load *add_record_load(struct list *instrs, struct hlsl_ir_node *record, const struct hlsl_struct_field *field, const struct source_location loc) { struct hlsl_ir_constant *c; if (!(c = new_uint_constant(field->reg_offset * 4, loc))) return NULL; - list_add_after(&record->entry, &c->node.entry); + list_add_tail(instrs, &c->node.entry); - return new_load(record, &c->node, field->type, loc); + return add_load(instrs, record, &c->node, field->type, loc); } -static struct hlsl_ir_load *new_array_load(struct hlsl_ir_node *array, +static struct hlsl_ir_load *add_array_load(struct list *instrs, struct hlsl_ir_node *array, struct hlsl_ir_node *index, const struct source_location loc) { const struct hlsl_type *expr_type = array->data_type; @@ -709,13 +709,13 @@ static struct hlsl_ir_load *new_array_load(struct hlsl_ir_node *array, if (!(c = new_uint_constant(data_type->reg_size * 4, loc))) return NULL; - list_add_after(&index->entry, &c->node.entry); + list_add_tail(instrs, &c->node.entry); if (!(mul = new_binary_expr(HLSL_IR_BINOP_MUL, index, &c->node, loc))) return NULL; - list_add_after(&c->node.entry, &mul->entry); + list_add_tail(instrs, &mul->entry); index = mul; - return new_load(array, index, data_type, loc); + return add_load(instrs, array, index, data_type, loc); } static void struct_var_initializer(struct list *list, struct hlsl_ir_var *var, @@ -2365,7 +2365,7 @@ postfix_expr: primary_expr { if (!strcmp($3, field->name)) { - if (!new_record_load(node, field, loc)) + if (!add_record_load($1, node, field, loc)) YYABORT; $$ = $1; break; @@ -2398,26 +2398,27 @@ postfix_expr: primary_expr YYABORT; } } - | postfix_expr '[' expr ']' - { - struct hlsl_ir_load *load; + | postfix_expr '[' expr ']' + { + struct hlsl_ir_node *array = node_from_list($1), *index = node_from_list($3); - if (node_from_list($3)->data_type->type != HLSL_CLASS_SCALAR) - { - hlsl_report_message(get_location(&@3), HLSL_LEVEL_ERROR, "array index is not scalar"); - free_instr_list($1); - free_instr_list($3); - YYABORT; - } + list_move_tail($1, $3); + d3dcompiler_free($3); - if (!(load = new_array_load(node_from_list($1), node_from_list($3), get_location(&@2)))) - { - free_instr_list($1); - free_instr_list($3); - YYABORT; - } - $$ = append_binop($1, $3, &load->node); - } + if (index->data_type->type != HLSL_CLASS_SCALAR) + { + hlsl_report_message(get_location(&@3), HLSL_LEVEL_ERROR, "array index is not scalar"); + free_instr_list($1); + YYABORT; + } + + if (!add_array_load($1, array, index, get_location(&@2))) + { + free_instr_list($1); + YYABORT; + } + $$ = $1; + } /* "var_modifiers" doesn't make sense in this case, but it's needed in the grammar to avoid shift/reduce conflicts. */

1 0

Zebediah Figura : d3dcompiler: Append the instruction to its list in new_return().
by Alexandre Julliard 23 Jun '20

23 Jun '20

Module: wine Branch: master Commit: 95ef2fa578f7d22b1868c45f70638f116615673b URL: https://source.winehq.org/git/wine.git/?a=commit;h=95ef2fa578f7d22b1868c45f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 22 22:53:00 2020 +0200 d3dcompiler: Append the instruction to its list in new_return(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/hlsl.y | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index f6285e6658..c4a9532809 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -562,7 +562,8 @@ static struct hlsl_ir_assignment *make_simple_assignment(struct hlsl_ir_var *lhs return new_assignment(lhs, NULL, rhs, 0, rhs->loc); } -static struct hlsl_ir_jump *new_return(struct hlsl_ir_node *return_value, struct source_location loc) +static struct hlsl_ir_jump *add_return(struct list *instrs, + struct hlsl_ir_node *return_value, struct source_location loc) { struct hlsl_type *return_type = hlsl_ctx.cur_function->return_type; struct hlsl_ir_jump *jump; @@ -591,6 +592,7 @@ static struct hlsl_ir_jump *new_return(struct hlsl_ir_node *return_value, struct } init_node(&jump->node, HLSL_IR_JUMP, NULL, loc); jump->type = HLSL_IR_JUMP_RETURN; + list_add_tail(instrs, &jump->node.entry); return jump; } @@ -2162,24 +2164,22 @@ statement: declaration_statement | selection_statement | loop_statement -jump_statement: KW_RETURN expr ';' - { - struct hlsl_ir_jump *jump; - if (!(jump = new_return(node_from_list($2), get_location(&@1)))) - YYABORT; +jump_statement: - $$ = $2; - list_add_tail($$, &jump->node.entry); - } - | KW_RETURN ';' - { - struct hlsl_ir_jump *jump; - if (!(jump = new_return(NULL, get_location(&@1)))) - YYABORT; - $$ = d3dcompiler_alloc(sizeof(*$$)); - list_init($$); - list_add_tail($$, &jump->node.entry); - } + KW_RETURN expr ';' + { + if (!add_return($2, node_from_list($2), get_location(&@1))) + YYABORT; + $$ = $2; + } + | KW_RETURN ';' + { + if (!($$ = d3dcompiler_alloc(sizeof(*$$)))) + YYABORT; + list_init($$); + if (!add_return($$, NULL, get_location(&@1))) + YYABORT; + } selection_statement: KW_IF '(' expr ')' if_body {

1 0