October 2018 - Wine-commits

Jacek Caban : configure: Get rid of no longer used SOCKET_LIBS.
by Alexandre Julliard 05 Oct '18

05 Oct '18

Module: wine Branch: master Commit: 2e754a652725c067bc44445cebe8b96487ec4a6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e754a652725c067bc44445c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 5 20:20:34 2018 +0200 configure: Get rid of no longer used SOCKET_LIBS. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 6 +----- configure.ac | 3 +-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 969396a..c2483c8 100755 --- a/configure +++ b/configure @@ -729,7 +729,6 @@ LIBWINE_INSTALL_DEV LIBWINE_INSTALL_LIB LIBWINE_IMPORTLIB LIBWINE_SHAREDLIB -SOCKET_LIBS DLLTOOL WINELOADER_PROGRAMS CONFIGURE_TARGETS @@ -8154,9 +8153,7 @@ fi crtlibs="" case $host_os in mingw32*) - crtlibs="-lmsvcrt" - SOCKET_LIBS="-lws2_32" - ;; + crtlibs="-lmsvcrt" ;; esac LIBWINE_SHAREDLIB="libwine.dll" @@ -18877,7 +18874,6 @@ ac_config_commands="$ac_config_commands include/stamp-h" $as_echo_n "creating Makefile rules..." >&6 ALL_VARS_RULES="OPENGL_LIBS = $OPENGL_LIBS -SOCKET_LIBS = $SOCKET_LIBS COREFOUNDATION_LIBS = $COREFOUNDATION_LIBS IOKIT_LIBS = $IOKIT_LIBS FORCEFEEDBACK_LIBS = $FORCEFEEDBACK_LIBS diff --git a/configure.ac b/configure.ac index f5c08b7..b64d99e 100644 --- a/configure.ac +++ b/configure.ac @@ -753,8 +753,7 @@ case $host_os in crtlibs="" case $host_os in mingw32*) - crtlibs="-lmsvcrt" - AC_SUBST(SOCKET_LIBS,"-lws2_32") ;; + crtlibs="-lmsvcrt" ;; esac AC_SUBST(LIBWINE_SHAREDLIB,"libwine.dll")

1 0

Jacek Caban : winhttp: Move cookie_t declaration to cookie.c.
by Alexandre Julliard 05 Oct '18

05 Oct '18

Module: wine Branch: master Commit: acf936b94a6d3689d273a938032c939d706ebd01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=acf936b94a6d3689d273a938… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 5 14:58:45 2018 +0200 winhttp: Move cookie_t declaration to cookie.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/cookie.c | 8 ++++++++ dlls/winhttp/winhttp_private.h | 8 -------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/winhttp/cookie.c b/dlls/winhttp/cookie.c index 59d098f..63cbde7 100644 --- a/dlls/winhttp/cookie.c +++ b/dlls/winhttp/cookie.c @@ -30,6 +30,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(winhttp); +typedef struct +{ + struct list entry; + WCHAR *name; + WCHAR *value; + WCHAR *path; +} cookie_t; + static domain_t *add_domain( session_t *session, WCHAR *name ) { domain_t *domain; diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 53b3c16..cac87bb 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -73,14 +73,6 @@ typedef struct struct list cookies; } domain_t; -typedef struct -{ - struct list entry; - WCHAR *name; - WCHAR *value; - WCHAR *path; -} cookie_t; - typedef struct { struct list entry; LONG ref;

1 0

Jacek Caban : winhttp: Make cookie access thread safe.
by Alexandre Julliard 05 Oct '18

05 Oct '18

Module: wine Branch: master Commit: 533083e4983df98531c79286e6583b98b99a4c30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=533083e4983df98531c79286… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 5 14:59:10 2018 +0200 winhttp: Make cookie access thread safe. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/cookie.c | 32 ++++++++++++++++++++++---------- dlls/winhttp/session.c | 4 ++++ dlls/winhttp/winhttp_private.h | 1 + 3 files changed, 27 insertions(+), 10 deletions(-) diff --git a/dlls/winhttp/cookie.c b/dlls/winhttp/cookie.c index 63cbde7..668daba 100644 --- a/dlls/winhttp/cookie.c +++ b/dlls/winhttp/cookie.c @@ -116,24 +116,28 @@ static BOOL add_cookie( session_t *session, cookie_t *cookie, WCHAR *domain_name cookie_t *old_cookie; struct list *item; + if (!(cookie->path = strdupW( path ))) return FALSE; + + EnterCriticalSection( &session->cs ); + LIST_FOR_EACH( item, &session->cookie_cache ) { domain = LIST_ENTRY( item, domain_t, entry ); if (domain_match( domain_name, domain, FALSE )) break; domain = NULL; } - if (!domain) - { - if (!(domain = add_domain( session, domain_name ))) return FALSE; - } + if (!domain) domain = add_domain( session, domain_name ); else if ((old_cookie = find_cookie( domain, path, cookie->name ))) delete_cookie( old_cookie ); - cookie->path = strdupW( path ); - list_add_head( &domain->cookies, &cookie->entry ); + if (domain) + { + list_add_head( &domain->cookies, &cookie->entry ); + TRACE("domain %s path %s <- %s=%s\n", debugstr_w(domain_name), debugstr_w(cookie->path), + debugstr_w(cookie->name), debugstr_w(cookie->value)); + } - TRACE("domain %s path %s <- %s=%s\n", debugstr_w(domain_name), debugstr_w(cookie->path), - debugstr_w(cookie->name), debugstr_w(cookie->value)); - return TRUE; + LeaveCriticalSection( &session->cs ); + return domain != NULL; } static cookie_t *parse_cookie( const WCHAR *string ) @@ -303,6 +307,8 @@ BOOL add_cookie_headers( request_t *request ) struct list *domain_cursor; session_t *session = request->connect->session; + EnterCriticalSection( &session->cs ); + LIST_FOR_EACH( domain_cursor, &session->cookie_cache ) { domain_t *domain = LIST_ENTRY( domain_cursor, domain_t, entry ); @@ -325,7 +331,11 @@ BOOL add_cookie_headers( request_t *request ) len = len_cookie + len_name; if (cookie->value) len += strlenW( cookie->value ) + 1; - if (!(header = heap_alloc( (len + 1) * sizeof(WCHAR) ))) return FALSE; + if (!(header = heap_alloc( (len + 1) * sizeof(WCHAR) ))) + { + LeaveCriticalSection( &session->cs ); + return FALSE; + } memcpy( header, cookieW, len_cookie * sizeof(WCHAR) ); strcpyW( header + len_cookie, cookie->name ); @@ -343,5 +353,7 @@ BOOL add_cookie_headers( request_t *request ) } } } + + LeaveCriticalSection( &session->cs ); return TRUE; } diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 0610915..7078e47 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -102,6 +102,8 @@ static void session_destroy( object_header_t *hdr ) domain = LIST_ENTRY( item, domain_t, entry ); delete_domain( domain ); } + session->cs.DebugInfo->Spare[0] = 0; + DeleteCriticalSection( &session->cs ); heap_free( session->agent ); heap_free( session->proxy_server ); heap_free( session->proxy_bypass ); @@ -279,6 +281,8 @@ HINTERNET WINAPI WinHttpOpen( LPCWSTR agent, DWORD access, LPCWSTR proxy, LPCWST session->receive_timeout = DEFAULT_RECEIVE_TIMEOUT; session->receive_response_timeout = DEFAULT_RECEIVE_RESPONSE_TIMEOUT; list_init( &session->cookie_cache ); + InitializeCriticalSection( &session->cs ); + session->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": session.cs"); if (agent && !(session->agent = strdupW( agent ))) goto end; if (access == WINHTTP_ACCESS_TYPE_DEFAULT_PROXY) diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index cac87bb..2ea798b 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -85,6 +85,7 @@ typedef struct { typedef struct { object_header_t hdr; + CRITICAL_SECTION cs; LPWSTR agent; DWORD access; int resolve_timeout;

1 0

Jacek Caban : winhttp: Make accessing session credential handle thread safe.
by Alexandre Julliard 05 Oct '18

05 Oct '18

Module: wine Branch: master Commit: 543bfdf1af21bac4261c227fc84efabd93726c95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=543bfdf1af21bac4261c227f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 5 14:59:18 2018 +0200 winhttp: Make accessing session credential handle thread safe. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 24 ++++++++++++++++-------- dlls/winhttp/session.c | 2 ++ 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 960c755..d101023 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1608,21 +1608,29 @@ static DWORD map_secure_protocols( DWORD mask ) static BOOL ensure_cred_handle( session_t *session ) { - SCHANNEL_CRED cred; - SECURITY_STATUS status; + SECURITY_STATUS status = SEC_E_OK; if (session->cred_handle_initialized) return TRUE; - memset( &cred, 0, sizeof(cred) ); - cred.dwVersion = SCHANNEL_CRED_VERSION; - cred.grbitEnabledProtocols = map_secure_protocols( session->secure_protocols ); - if ((status = AcquireCredentialsHandleW( NULL, (WCHAR *)UNISP_NAME_W, SECPKG_CRED_OUTBOUND, NULL, &cred, - NULL, NULL, &session->cred_handle, NULL )) != SEC_E_OK) + EnterCriticalSection( &session->cs ); + if (!session->cred_handle_initialized) + { + SCHANNEL_CRED cred; + memset( &cred, 0, sizeof(cred) ); + cred.dwVersion = SCHANNEL_CRED_VERSION; + cred.grbitEnabledProtocols = map_secure_protocols( session->secure_protocols ); + status = AcquireCredentialsHandleW( NULL, (WCHAR *)UNISP_NAME_W, SECPKG_CRED_OUTBOUND, NULL, + &cred, NULL, NULL, &session->cred_handle, NULL ); + if (status == SEC_E_OK) + session->cred_handle_initialized = TRUE; + } + LeaveCriticalSection( &session->cs ); + + if (status != SEC_E_OK) { WARN( "AcquireCredentialsHandleW failed: 0x%08x\n", status ); return FALSE; } - session->cred_handle_initialized = TRUE; return TRUE; } diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 7078e47..b9d9ab8 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -198,7 +198,9 @@ static BOOL session_set_option( object_header_t *hdr, DWORD option, LPVOID buffe set_last_error( ERROR_INSUFFICIENT_BUFFER ); return FALSE; } + EnterCriticalSection( &session->cs ); session->secure_protocols = *(DWORD *)buffer; + LeaveCriticalSection( &session->cs ); TRACE("0x%x\n", session->secure_protocols); return TRUE; }

1 0

Bernhard Übelacker : services/tests: Change pipe type from byte to message.
by Alexandre Julliard 05 Oct '18

05 Oct '18

Module: wine Branch: master Commit: 099a12ad40ed8b1a88fbaf546576483831acd266 URL: https://source.winehq.org/git/wine.git/?a=commit;h=099a12ad40ed8b1a88fbaf54… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Fri Oct 5 15:49:21 2018 +0200 services/tests: Change pipe type from byte to message. Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/tests/service.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/services/tests/service.c b/programs/services/tests/service.c index c68d37a..aaae680 100644 --- a/programs/services/tests/service.c +++ b/programs/services/tests/service.c @@ -589,7 +589,7 @@ static void test_runner(void (*p_run_test)(void)) sprintf(named_pipe_name, "\\\\.\\pipe\\%s_pipe", service_name); pipe_handle = CreateNamedPipeA(named_pipe_name, PIPE_ACCESS_INBOUND, - PIPE_TYPE_BYTE|PIPE_READMODE_BYTE|PIPE_WAIT, 10, 2048, 2048, 10000, NULL); + PIPE_TYPE_MESSAGE|PIPE_READMODE_MESSAGE|PIPE_WAIT, 10, 2048, 2048, 10000, NULL); ok(pipe_handle != INVALID_HANDLE_VALUE, "CreateNamedPipe failed: %u\n", GetLastError()); if(pipe_handle == INVALID_HANDLE_VALUE) return;

1 0

Jacek Caban : msvcrt: Use memmove to copy memory in wmemcpy_s.
by Alexandre Julliard 05 Oct '18

05 Oct '18

Module: wine Branch: master Commit: be56a83fd00cdaf9583a973b1e041f47c5277768 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be56a83fd00cdaf9583a973b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 5 16:38:48 2018 +0200 msvcrt: Use memmove to copy memory in wmemcpy_s. Fixes memory corruption in Outlook 2016. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/tests/msvcr100.c | 14 +++++++++++++- dlls/msvcrt/heap.c | 2 +- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr100/tests/msvcr100.c b/dlls/msvcr100/tests/msvcr100.c index db5a4cb..594ac28 100644 --- a/dlls/msvcr100/tests/msvcr100.c +++ b/dlls/msvcr100/tests/msvcr100.c @@ -371,7 +371,7 @@ static BOOL init(void) static void test_wmemcpy_s(void) { - static wchar_t dest[8]; + static wchar_t dest[8], buf[32]; static const wchar_t tiny[] = {'T',0,'I','N','Y',0}; static const wchar_t big[] = {'a','t','o','o','l','o','n','g','s','t','r','i','n','g',0}; const wchar_t XX = 0x5858; /* two 'X' bytes */ @@ -434,6 +434,18 @@ static void test_wmemcpy_s(void) okwchars(dest, XX, XX, XX, XX, XX, XX, XX, XX); CHECK_CALLED(invalid_parameter_handler); + ret = p_wmemcpy_s(buf, ARRAY_SIZE(buf), big, ARRAY_SIZE(big)); + ok(!ret, "wmemcpy_s returned %d\n", ret); + ok(!memcmp(buf, big, sizeof(big)), "unexpected buf\n"); + + ret = p_wmemcpy_s(buf + 1, ARRAY_SIZE(buf) - 1, buf, ARRAY_SIZE(big)); + ok(!ret, "wmemcpy_s returned %d\n", ret); + ok(!memcmp(buf + 1, big, sizeof(big)), "unexpected buf\n"); + + ret = p_wmemcpy_s(buf, ARRAY_SIZE(buf), buf + 1, ARRAY_SIZE(big)); + ok(!ret, "wmemcpy_s returned %d\n", ret); + ok(!memcmp(buf, big, sizeof(big)), "unexpected buf\n"); + ok(p_set_invalid_parameter_handler(NULL) == test_invalid_parameter_handler, "Cannot reset invalid parameter handler\n"); } diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index b4f11d8..a780896 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -826,7 +826,7 @@ int CDECL wmemcpy_s(MSVCRT_wchar_t *dest, MSVCRT_size_t numberOfElements, return MSVCRT_ERANGE; } - memcpy(dest, src, sizeof(MSVCRT_wchar_t)*count); + memmove(dest, src, sizeof(MSVCRT_wchar_t)*count); return 0; } #endif

1 0

Jacek Caban : msvcrt: Use memmove to copy memory in memcpy_s.
by Alexandre Julliard 05 Oct '18

05 Oct '18

Module: wine Branch: master Commit: 055ca5e4d9770d4f14e3c157f1288fa6308b86dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=055ca5e4d9770d4f14e3c157… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 5 16:38:54 2018 +0200 msvcrt: Use memmove to copy memory in memcpy_s. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/heap.c | 2 +- dlls/msvcrt/tests/string.c | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index a780896..0d6aee0 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -799,7 +799,7 @@ int CDECL MSVCRT_memcpy_s(void *dest, MSVCRT_size_t numberOfElements, const void return MSVCRT_ERANGE; } - memcpy(dest, src, count); + memmove(dest, src, count); return 0; } diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index ae23890..670c7cf 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -615,7 +615,7 @@ static void test_strcpy_s(void) static void test_memcpy_s(void) { - static char dest[8]; + static char dest[8], buf[32]; static const char tiny[] = {'T',0,'I','N','Y',0}; static const char big[] = {'a','t','o','o','l','o','n','g','s','t','r','i','n','g',0}; int ret; @@ -667,6 +667,18 @@ static void test_memcpy_s(void) ok(ret == EINVAL, "Copying a NULL buffer into a destination of size 0 returned %d, expected EINVAL\n", ret); ok(errno == EINVAL, "errno is %d, expected EINVAL\n", errno); okchars(dest, 'X', 'X', 'X', 'X', 'X', 'X', 'X', 'X'); + + ret = p_memcpy_s(buf, ARRAY_SIZE(buf), big, ARRAY_SIZE(big)); + ok(!ret, "memcpy_s returned %d\n", ret); + ok(!memcmp(buf, big, sizeof(big)), "unexpected buf\n"); + + ret = p_memcpy_s(buf + 1, ARRAY_SIZE(buf) - 1, buf, ARRAY_SIZE(big)); + ok(!ret, "memcpy_s returned %d\n", ret); + ok(!memcmp(buf + 1, big, sizeof(big)), "unexpected buf\n"); + + ret = p_memcpy_s(buf, ARRAY_SIZE(buf), buf + 1, ARRAY_SIZE(big)); + ok(!ret, "memcpy_s returned %d\n", ret); + ok(!memcmp(buf, big, sizeof(big)), "unexpected buf\n"); } static void test_memmove_s(void)

1 0

Józef Kucia : winevulkan: Remove parsing of validextensionstructs.
by Alexandre Julliard 05 Oct '18

05 Oct '18

Module: wine Branch: master Commit: 6e87235523f48d523285409dcbbd7885df9948d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e87235523f48d523285409d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Oct 5 16:55:17 2018 +0200 winevulkan: Remove parsing of validextensionstructs. It was replaced by structextends. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 8e7d88a..ae90905 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -869,7 +869,7 @@ class VkHandle(object): class VkMember(object): def __init__(self, const=False, struct_fwd_decl=False,_type=None, pointer=None, name=None, array_len=None, - dyn_array_len=None, optional=False, extension_structs=None): + dyn_array_len=None, optional=False): self.const = const self.struct_fwd_decl = struct_fwd_decl self.name = name @@ -879,7 +879,6 @@ class VkMember(object): self.array_len = array_len self.dyn_array_len = dyn_array_len self.optional = optional - self.extension_structs = extension_structs def __eq__(self, other): """ Compare member based on name against a string. @@ -927,12 +926,7 @@ class VkMember(object): # Name of other member within, which stores the number of # elements pointed to be by this member. - dyn_array_len = member.get("len", None) - - if "validextensionstructs" in member.attrib: - extension_structs = member.get("validextensionstructs").split(",") - else: - extension_structs = None + dyn_array_len = member.get("len") # Some members are optional, which is important for conversion code e.g. not dereference NULL pointer. optional = True if member.get("optional") else False @@ -956,7 +950,7 @@ class VkMember(object): array_len = name_elem.tail.strip("[]") return VkMember(const=const, struct_fwd_decl=struct_fwd_decl, _type=member_type, pointer=pointer, name=name_elem.text, - array_len=array_len, dyn_array_len=dyn_array_len, optional=optional, extension_structs=extension_structs) + array_len=array_len, dyn_array_len=dyn_array_len, optional=optional) def copy(self, input, output, direction): """ Helper method for use by conversion logic to generate a C-code statement to copy this member. """

1 0

Józef Kucia : winevulkan: Check if conversion is required for pNext chains.
by Alexandre Julliard 05 Oct '18

05 Oct '18

Module: wine Branch: master Commit: 94a4dadd9a05d6da8688e17187583fa6a11a6e04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94a4dadd9a05d6da8688e171… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Oct 5 16:55:18 2018 +0200 winevulkan: Check if conversion is required for pNext chains. Unhandled conversions are only logged for now. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 41 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 37 insertions(+), 4 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index ae90905..ce14c78 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1028,9 +1028,12 @@ class VkMember(object): # Collect any conversion for any member structs. struct = self.type_info["data"] for m in struct: + m.needs_struct_extensions_conversion() if m.needs_conversion(): conversions.extend(m.get_conversions()) + struct.needs_struct_extensions_conversion() + struct = self.type_info["data"] direction = Direction.OUTPUT if struct.returnedonly else Direction.INPUT if self.is_dynamic_array(): @@ -1119,6 +1122,13 @@ class VkMember(object): # though none of this type have been encountered yet. return False + def needs_struct_extensions_conversion(self): + if not self.is_struct(): + return False + + struct = self.type_info["data"] + return struct.needs_struct_extensions_conversion() + def set_type_info(self, type_info): """ Helper function to set type information from the type registry. This is needed, because not all type data is available at time of @@ -1356,6 +1366,10 @@ class VkParam(object): if not self.is_struct(): return None + self.struct.needs_struct_extensions_conversion() + for m in self.struct: + m.needs_struct_extensions_conversion() + if not self.needs_conversion(): return None @@ -1485,14 +1499,16 @@ class VkParam(object): class VkStruct(Sequence): """ Class which represents the type union and struct. """ - def __init__(self, name, members, returnedonly, alias=None, union=False): + def __init__(self, name, members, returnedonly, structextends, alias=None, union=False): self.name = name self.members = members self.returnedonly = returnedonly + self.structextends = structextends self.required = False self.alias = alias self.union = union self.type_info = None # To be set later. + self.struct_extensions = [] def __getitem__(self, i): return self.members[i] @@ -1503,7 +1519,7 @@ class VkStruct(Sequence): @staticmethod def from_alias(struct, alias): name = struct.attrib.get("name") - return VkStruct(name, alias.members, alias.returnedonly, alias=alias) + return VkStruct(name, alias.members, alias.returnedonly, alias.structextends, alias=alias) @staticmethod def from_xml(struct): @@ -1511,18 +1527,21 @@ class VkStruct(Sequence): # know which one we are dealing with later on for code generation. union = True if struct.attrib["category"] == "union" else False - name = struct.attrib.get("name", None) + name = struct.attrib.get("name") # 'Output' structures for which data is filled in by the API are # marked as 'returnedonly'. returnedonly = True if struct.attrib.get("returnedonly") else False + structextends = struct.attrib.get("structextends") + structextends = structextends.split(",") if structextends else [] + members = [] for member in struct.findall("member"): vk_member = VkMember.from_xml(member) members.append(vk_member) - return VkStruct(name, members, returnedonly, union=union) + return VkStruct(name, members, returnedonly, structextends, union=union) @staticmethod def decouple_structs(structs): @@ -1648,6 +1667,16 @@ class VkStruct(Sequence): return False + def needs_struct_extensions_conversion(self): + """ Checks if structure extensions in pNext chain need conversion. """ + + for e in self.struct_extensions: + if e.required and e.needs_conversion(): + LOGGER.error("Unhandled pNext chain conversion for {0}".format(e.name)) + return True + + return False + def set_type_info(self, types): """ Helper function to set type information from the type registry. This is needed, because not all type data is available at time of @@ -2756,6 +2785,10 @@ class VkRegistry(object): for struct in structs: struct.set_type_info(self.types) + for structextend in struct.structextends: + s = self.types[structextend]["data"] + s.struct_extensions.append(struct) + # Guarantee everything is sorted, so code generation doesn't have # to deal with this. self.base_types = sorted(base_types, key=lambda base_type: base_type.name)

1 0

Józef Kucia : winevulkan: Parse enum value aliases.
by Alexandre Julliard 05 Oct '18

05 Oct '18

Module: wine Branch: master Commit: b5a79ca5d05d6fcfa87fa0b5924d49aed7f18c6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5a79ca5d05d6fcfa87fa0b5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Oct 5 16:55:19 2018 +0200 winevulkan: Parse enum value aliases. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index ce14c78..cb55a30 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -322,22 +322,26 @@ class VkEnum(object): for v in enum.findall("enum"): # Value is either a value or a bitpos, only one can exist. value = v.attrib.get("value") - if value is None: - # bitmask - value = 1 << int(v.attrib.get("bitpos")) - values.append(VkEnumValue(v.attrib.get("name"), value, hex=True)) - else: + alias_name = v.attrib.get("alias") + if alias_name: + alias = next(x for x in values if x.name == alias_name) + values.append(VkEnumValue(v.attrib.get("name"), alias.value, alias.hex)) + elif value: # Some values are in hex form. We want to preserve the hex representation # at least when we convert back to a string. Internally we want to use int. if "0x" in value: values.append(VkEnumValue(v.attrib.get("name"), int(value, 0), hex=True)) else: values.append(VkEnumValue(v.attrib.get("name"), int(value, 0))) + else: + # bitmask + value = 1 << int(v.attrib.get("bitpos")) + values.append(VkEnumValue(v.attrib.get("name"), value, hex=True)) # vulkan.h contains a *_MAX_ENUM value set to 32-bit at the time of writing, # which is to prepare for extensions as they can add values and hence affect # the size definition. - max_name = re.sub(r'([0-9a-z_])([A-Z0-9])',r'\1_\2',name).upper() + "_MAX_ENUM" + max_name = re.sub(r'([0-9a-z_])([A-Z0-9])',r'\1_\2', name).upper() + "_MAX_ENUM" values.append(VkEnumValue(max_name, 0x7fffffff, hex=True)) return VkEnum(name, values)

1 0