May 2021 - Wine-commits - list.winehq.org

Zebediah Figura : ws2_32: Move host lookup functions to protocol.c.
by Alexandre Julliard 03 May '21

03 May '21

Module: wine Branch: master Commit: ec9f3119306e34f5a8bd3bfeb233eed740c1c6ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec9f3119306e34f5a8bd3bfe… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 30 19:09:59 2021 -0500 ws2_32: Move host lookup functions to protocol.c. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/protocol.c | 491 ++++++++++++++++++++++++++++++++++++++++ dlls/ws2_32/socket.c | 516 +------------------------------------------ dlls/ws2_32/ws2_32_private.h | 29 ++- 3 files changed, 520 insertions(+), 516 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ec9f3119306e34f5a8bd…

1 0

Zebediah Figura : ws2_32: Move name info functions to protocol.c.
by Alexandre Julliard 03 May '21

03 May '21

Module: wine Branch: master Commit: 877e3e24d4c76146f5613b0a9b3b70b25b007a93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=877e3e24d4c76146f5613b0a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 30 19:10:00 2021 -0500 ws2_32: Move name info functions to protocol.c. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/protocol.c | 87 ++++++++++++++++++++++++++++++++++++++++++++ dlls/ws2_32/socket.c | 83 +----------------------------------------- dlls/ws2_32/ws2_32_private.h | 8 ++++ 3 files changed, 97 insertions(+), 81 deletions(-) diff --git a/dlls/ws2_32/protocol.c b/dlls/ws2_32/protocol.c index 460f4e78dcc..c2e661c03dc 100644 --- a/dlls/ws2_32/protocol.c +++ b/dlls/ws2_32/protocol.c @@ -854,6 +854,93 @@ void WINAPI FreeAddrInfoExW( ADDRINFOEXW *ai ) } +static const int ws_niflag_map[][2] = +{ + MAP_OPTION( NI_NOFQDN ), + MAP_OPTION( NI_NUMERICHOST ), + MAP_OPTION( NI_NAMEREQD ), + MAP_OPTION( NI_NUMERICSERV ), + MAP_OPTION( NI_DGRAM ), +}; + +static int convert_niflag_w2u( int winflags ) +{ + unsigned int i; + int unixflags = 0; + + for (i = 0; i < ARRAY_SIZE(ws_niflag_map); i++) + { + if (ws_niflag_map[i][0] & winflags) + { + unixflags |= ws_niflag_map[i][1]; + winflags &= ~ws_niflag_map[i][0]; + } + } + if (winflags) + FIXME("Unhandled windows NI_xxx flags 0x%x\n", winflags); + return unixflags; +} + + +/*********************************************************************** + * getnameinfo (ws2_32.@) + */ +int WINAPI WS_getnameinfo( const SOCKADDR *addr, WS_socklen_t addr_len, char *host, + DWORD host_len, char *serv, DWORD serv_len, int flags ) +{ +#ifdef HAVE_GETNAMEINFO + int ret; + union generic_unix_sockaddr uaddr; + unsigned int uaddr_len; + + TRACE( "addr %s, addr_len %d, host %p, host_len %u, serv %p, serv_len %d, flags %#x\n", + debugstr_sockaddr(addr), addr_len, host, host_len, serv, serv_len, flags ); + + uaddr_len = ws_sockaddr_ws2u( addr, addr_len, &uaddr ); + if (!uaddr_len) + { + SetLastError( WSAEFAULT ); + return WSA_NOT_ENOUGH_MEMORY; + } + ret = getnameinfo( &uaddr.addr, uaddr_len, host, host_len, serv, serv_len, convert_niflag_w2u(flags) ); + return convert_eai_u2w( ret ); +#else + FIXME( "getnameinfo() failed, not found during buildtime.\n" ); + return EAI_FAIL; +#endif +} + + +/*********************************************************************** + * GetNameInfoW (ws2_32.@) + */ +int WINAPI GetNameInfoW( const SOCKADDR *addr, WS_socklen_t addr_len, WCHAR *host, + DWORD host_len, WCHAR *serv, DWORD serv_len, int flags ) +{ + int ret; + char *hostA = NULL, *servA = NULL; + + if (host && (!(hostA = HeapAlloc( GetProcessHeap(), 0, host_len )))) + return EAI_MEMORY; + if (serv && (!(servA = HeapAlloc( GetProcessHeap(), 0, serv_len )))) + { + HeapFree( GetProcessHeap(), 0, hostA ); + return EAI_MEMORY; + } + + ret = WS_getnameinfo( addr, addr_len, hostA, host_len, servA, serv_len, flags ); + if (!ret) + { + if (host) MultiByteToWideChar( CP_ACP, 0, hostA, -1, host, host_len ); + if (serv) MultiByteToWideChar( CP_ACP, 0, servA, -1, serv, serv_len ); + } + + HeapFree( GetProcessHeap(), 0, hostA ); + HeapFree( GetProcessHeap(), 0, servA ); + return ret; +} + + static UINT host_errno_from_unix( int err ) { WARN( "%d\n", err ); diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 7313741e4b1..5ced4720558 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -235,12 +235,6 @@ static unsigned int if_addr_cache_size; static SOCKET *socket_list; static unsigned int socket_list_size; -union generic_unix_sockaddr -{ - struct sockaddr addr; - char data[128]; /* should be big enough for all families */ -}; - const char *debugstr_sockaddr( const struct WS_sockaddr *a ) { if (!a) return "(nil)"; @@ -717,15 +711,6 @@ static const int ws_socktype_map[][2] = {FROM_PROTOCOL_INFO, FROM_PROTOCOL_INFO}, }; -static const int ws_niflag_map[][2] = -{ - MAP_OPTION( NI_NOFQDN ), - MAP_OPTION( NI_NUMERICHOST ), - MAP_OPTION( NI_NAMEREQD ), - MAP_OPTION( NI_NUMERICSERV ), - MAP_OPTION( NI_DGRAM ), -}; - static const int ws_poll_map[][2] = { MAP_OPTION( POLLERR ), @@ -1633,8 +1618,8 @@ static inline BOOL supported_pf(int pf) /* Returns the length of the converted address if successful, 0 if it was too * small to start with or unknown family or invalid address buffer. */ -static unsigned int ws_sockaddr_ws2u(const struct WS_sockaddr* wsaddr, int wsaddrlen, - union generic_unix_sockaddr *uaddr) +unsigned int ws_sockaddr_ws2u( const struct WS_sockaddr *wsaddr, int wsaddrlen, + union generic_unix_sockaddr *uaddr ) { unsigned int uaddrlen = 0; @@ -5860,70 +5845,6 @@ struct WS_servent* WINAPI WS_getservbyname(const char *name, const char *proto) return retval; } -static int convert_niflag_w2u(int winflags) { - unsigned int i; - int unixflags = 0; - - for (i = 0; i < ARRAY_SIZE(ws_niflag_map); i++) - if (ws_niflag_map[i][0] & winflags) { - unixflags |= ws_niflag_map[i][1]; - winflags &= ~ws_niflag_map[i][0]; - } - if (winflags) - FIXME("Unhandled windows NI_xxx flags 0x%x\n", winflags); - return unixflags; -} - -int WINAPI WS_getnameinfo(const SOCKADDR *sa, WS_socklen_t salen, PCHAR host, - DWORD hostlen, PCHAR serv, DWORD servlen, INT flags) -{ -#ifdef HAVE_GETNAMEINFO - int ret; - union generic_unix_sockaddr sa_u; - unsigned int size; - - TRACE("%s %d %p %d %p %d %d\n", debugstr_sockaddr(sa), salen, host, hostlen, - serv, servlen, flags); - - size = ws_sockaddr_ws2u(sa, salen, &sa_u); - if (!size) - { - SetLastError(WSAEFAULT); - return WSA_NOT_ENOUGH_MEMORY; - } - ret = getnameinfo(&sa_u.addr, size, host, hostlen, serv, servlen, convert_niflag_w2u(flags)); - return convert_eai_u2w(ret); -#else - FIXME("getnameinfo() failed, not found during buildtime.\n"); - return EAI_FAIL; -#endif -} - -int WINAPI GetNameInfoW(const SOCKADDR *sa, WS_socklen_t salen, PWCHAR host, - DWORD hostlen, PWCHAR serv, DWORD servlen, INT flags) -{ - int ret; - char *hostA = NULL, *servA = NULL; - - if (host && (!(hostA = HeapAlloc(GetProcessHeap(), 0, hostlen)))) return EAI_MEMORY; - if (serv && (!(servA = HeapAlloc(GetProcessHeap(), 0, servlen)))) - { - HeapFree(GetProcessHeap(), 0, hostA); - return EAI_MEMORY; - } - - ret = WS_getnameinfo(sa, salen, hostA, hostlen, servA, servlen, flags); - if (!ret) - { - if (host) MultiByteToWideChar(CP_ACP, 0, hostA, -1, host, hostlen); - if (serv) MultiByteToWideChar(CP_ACP, 0, servA, -1, serv, servlen); - } - - HeapFree(GetProcessHeap(), 0, hostA); - HeapFree(GetProcessHeap(), 0, servA); - return ret; -} - /*********************************************************************** * getservbyport (WS2_32.56) */ diff --git a/dlls/ws2_32/ws2_32_private.h b/dlls/ws2_32/ws2_32_private.h index 121ce25ad1d..e86a3569510 100644 --- a/dlls/ws2_32/ws2_32_private.h +++ b/dlls/ws2_32/ws2_32_private.h @@ -161,11 +161,19 @@ static const char magic_loopback_addr[] = {127, 12, 34, 56}; +union generic_unix_sockaddr +{ + struct sockaddr addr; + char data[128]; /* should be big enough for all families */ +}; + int convert_eai_u2w( int ret ) DECLSPEC_HIDDEN; int convert_socktype_u2w( int type ) DECLSPEC_HIDDEN; int convert_socktype_w2u( int type ) DECLSPEC_HIDDEN; int ws_sockaddr_u2ws( const struct sockaddr *unix_addr, struct WS_sockaddr *win_addr, int *win_addr_len ) DECLSPEC_HIDDEN; +unsigned int ws_sockaddr_ws2u( const struct WS_sockaddr *win_addr, int win_addr_len, + union generic_unix_sockaddr *unix_addr ) DECLSPEC_HIDDEN; const char *debugstr_sockaddr( const struct WS_sockaddr *addr ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : kernelbase: Fix alignment of compatibility context elements.
by Alexandre Julliard 03 May '21

03 May '21

Module: wine Branch: master Commit: ea50d41b3f5f9b3565bfa2831f8f37aeb1824424 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea50d41b3f5f9b3565bfa283… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 30 23:12:16 2021 +0200 kernelbase: Fix alignment of compatibility context elements. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51080 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/version.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/kernelbase/version.c b/dlls/kernelbase/version.c index 66bd619e394..96349708989 100644 --- a/dlls/kernelbase/version.c +++ b/dlls/kernelbase/version.c @@ -168,7 +168,11 @@ static RTL_OSVERSIONINFOEXW current_version; static BOOL CALLBACK init_current_version(PINIT_ONCE init_once, PVOID parameter, PVOID *context) { - /*ACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION*/DWORD *acci; + struct acci + { + DWORD ElementCount; + COMPATIBILITY_CONTEXT_ELEMENT Elements[1]; + } *acci; const struct version_info *ver; SIZE_T req; int idx; @@ -201,13 +205,12 @@ static BOOL CALLBACK init_current_version(PINIT_ONCE init_once, PVOID parameter, { do { - COMPATIBILITY_CONTEXT_ELEMENT *elements = (COMPATIBILITY_CONTEXT_ELEMENT*)(acci + 1); - DWORD i, count = *acci; + DWORD i; - for (i = 0; i < count; i++) + for (i = 0; i < acci->ElementCount; i++) { - if (elements[i].Type == ACTCTX_COMPATIBILITY_ELEMENT_TYPE_OS && - IsEqualGUID(&elements[i].Id, &version_data[idx].guid)) + if (acci->Elements[i].Type == ACTCTX_COMPATIBILITY_ELEMENT_TYPE_OS && + IsEqualGUID(&acci->Elements[i].Id, &version_data[idx].guid)) { ver = &version_data[idx].info;

1 0

Alexandre Julliard : gdi32: Don't bother computing the gamma ramp when not used.
by Alexandre Julliard 03 May '21

03 May '21

Module: wine Branch: master Commit: f2068ec4387fcdd77c1d51b6ece46885fcf607c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2068ec4387fcdd77c1d51b6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 3 09:48:00 2021 +0200 gdi32: Don't bother computing the gamma ramp when not used. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 067d76ba9fd..43c743bd281 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -4009,10 +4009,13 @@ static void init_font_options(void) This looks roughly similar to Windows Native with the same registry value. MS GDI seems to be rasterizing the outline at a different rate than FreeType. */ gamma = 1000 * gamma / 1400; - for (i = 0; i < 256; i++) + if (gamma != 1000) { - font_gamma_ramp.encode[i] = pow( i / 255., 1000. / gamma ) * 255. + .5; - font_gamma_ramp.decode[i] = pow( i / 255., gamma / 1000. ) * 255. + .5; + for (i = 0; i < 256; i++) + { + font_gamma_ramp.encode[i] = pow( i / 255., 1000. / gamma ) * 255. + .5; + font_gamma_ramp.decode[i] = pow( i / 255., gamma / 1000. ) * 255. + .5; + } } font_gamma_ramp.gamma = gamma; TRACE("gamma %d\n", font_gamma_ramp.gamma);

1 0

Alexandre Julliard : ntdll: Use the native machine id instead of hardcoded values.
by Alexandre Julliard 03 May '21

03 May '21

Module: wine Branch: master Commit: 8b79c8d41fe593c21a810bf635bfcb2e8e2fa65a URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b79c8d41fe593c21a810bf6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 3 11:02:21 2021 +0200 ntdll: Use the native machine id instead of hardcoded values. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 11 ++++------- dlls/ntdll/unix/process.c | 4 +--- dlls/ntdll/unix/server.c | 12 ++++++------ dlls/ntdll/unix/unix_private.h | 6 ++++++ dlls/ntdll/unix/virtual.c | 2 +- 5 files changed, 18 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index e4c062cea98..e78df4d73d2 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -439,20 +439,17 @@ static NTSTATUS loader_exec( const char *loader, char **argv, WORD machine ) NTSTATUS exec_wineloader( char **argv, int socketfd, const pe_image_info_t *pe_info ) { WORD machine = pe_info->machine; - int is_child_64bit = (machine == IMAGE_FILE_MACHINE_AMD64 || machine == IMAGE_FILE_MACHINE_ARM64); ULONGLONG res_start = pe_info->base; ULONGLONG res_end = pe_info->base + pe_info->map_size; const char *loader = argv0; const char *loader_env = getenv( "WINELOADER" ); char preloader_reserve[64], socket_env[64]; + BOOL is_child_64bit; if (pe_info->image_flags & IMAGE_FLAGS_WineFakeDll) res_start = res_end = 0; + if (pe_info->image_flags & IMAGE_FLAGS_ComPlusNativeReady) machine = native_machine; - if (!is_child_64bit && (is_win64 || is_wow64) && (pe_info->image_flags & IMAGE_FLAGS_ComPlusNativeReady)) - { - is_child_64bit = TRUE; - machine = IMAGE_FILE_MACHINE_AMD64; - } + is_child_64bit = is_machine_64bit( machine ); if (!is_win64 ^ !is_child_64bit) { @@ -1469,7 +1466,7 @@ const WCHAR *get_machine_wow64_dir( WORD machine ) static const WCHAR sysx8664[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\','s','y','s','x','8','6','6','4','\\',0}; static const WCHAR sysarm64[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\','s','y','s','a','r','m','6','4','\\',0}; - if (machine == supported_machines[0]) machine = IMAGE_FILE_MACHINE_TARGET_HOST; + if (machine == native_machine) machine = IMAGE_FILE_MACHINE_TARGET_HOST; switch (machine) { diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 3f71d70e60f..ce2033bc0dc 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -1240,9 +1240,7 @@ NTSTATUS WINAPI NtQueryInformationProcess( HANDLE handle, PROCESSINFOCLASS class SERVER_START_REQ( get_process_info ) { req->handle = wine_server_obj_handle( handle ); - if (!(ret = wine_server_call( req ))) - val = (reply->machine != IMAGE_FILE_MACHINE_AMD64 && - reply->machine != IMAGE_FILE_MACHINE_ARM64); + if (!(ret = wine_server_call( req ))) val = (reply->machine != native_machine); } SERVER_END_REQ; } diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index b13e2997962..ff632b7c6c0 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -103,6 +103,7 @@ static const char *server_dir; unsigned int supported_machines_count = 0; USHORT supported_machines[8] = { 0 }; +USHORT native_machine = 0; BOOL is_wow64 = FALSE; BOOL process_exiting = FALSE; @@ -1579,10 +1580,9 @@ size_t server_init_process(void) fatal_error( "'%s' is a 64-bit installation, it cannot be used with a 32-bit wineserver.\n", config_dir ); - switch (supported_machines[0]) + native_machine = supported_machines[0]; + if (is_machine_64bit( native_machine )) { - case IMAGE_FILE_MACHINE_AMD64: - case IMAGE_FILE_MACHINE_ARM64: if (arch && !strcmp( arch, "win32" )) fatal_error( "WINEARCH set to win32 but '%s' is a 64-bit installation.\n", config_dir ); if (!is_win64) @@ -1590,13 +1590,13 @@ size_t server_init_process(void) is_wow64 = TRUE; init_teb64( NtCurrentTeb() ); } - break; - default: + } + else + { if (is_win64) fatal_error( "'%s' is a 32-bit installation, it cannot support 64-bit applications.\n", config_dir ); if (arch && !strcmp( arch, "win64" )) fatal_error( "WINEARCH set to win64 but '%s' is a 32-bit installation.\n", config_dir ); - break; } for (i = 0; i < supported_machines_count; i++) diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index a5bade02b8a..c47695c408c 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -36,9 +36,15 @@ static const WORD current_machine = IMAGE_FILE_MACHINE_ARMNT; #elif defined(__aarch64__) static const WORD current_machine = IMAGE_FILE_MACHINE_ARM64; #endif +extern WORD native_machine DECLSPEC_HIDDEN; static const BOOL is_win64 = (sizeof(void *) > sizeof(int)); +static inline BOOL is_machine_64bit( WORD machine ) +{ + return (machine == IMAGE_FILE_MACHINE_AMD64 || machine == IMAGE_FILE_MACHINE_ARM64); +} + struct debug_info { unsigned int str_pos; /* current position in strings buffer */ diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index f3e6b612b93..c3baa5f09c7 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -4469,7 +4469,7 @@ void virtual_fill_image_information( const pe_image_info_t *pe_info, SECTION_IMA info->ImageFileSize = pe_info->file_size; info->CheckSum = pe_info->checksum; #ifndef _WIN64 /* don't return 64-bit values to 32-bit processes */ - if (pe_info->machine == IMAGE_FILE_MACHINE_AMD64 || pe_info->machine == IMAGE_FILE_MACHINE_ARM64) + if (is_machine_64bit( pe_info->machine )) { info->TransferAddress = (void *)0x81231234; /* sic */ info->MaximumStackSize = 0x100000;

1 0

Alexandre Julliard : ntdll: Sort the info classes by numeric value in NtQuerySystemInformation().
by Alexandre Julliard 03 May '21

03 May '21

Module: wine Branch: master Commit: d6a7b3566938ec215eaef5b888b9b00ea8a1412e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6a7b3566938ec215eaef5b8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 3 20:41:31 2021 +0200 ntdll: Sort the info classes by numeric value in NtQuerySystemInformation(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/system.c | 292 +++++++++++++++++++++++------------------------ 1 file changed, 146 insertions(+), 146 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d6a7b3566938ec215eae…

1 0

Ziqing Hui : windowscodecs: Add tests for DDS encoder.
by Alexandre Julliard 03 May '21

03 May '21

Module: wine Branch: master Commit: 7eae1c8b434eb2d111ac6df2250ef22df103b7e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7eae1c8b434eb2d111ac6df2… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Sat May 1 11:14:34 2021 +0800 windowscodecs: Add tests for DDS encoder. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/ddsformat.c | 89 ++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index 28554e77c9b..492416c0ce4 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -500,6 +500,31 @@ static IWICBitmapDecoder *create_decoder(void) return decoder; } +static IWICBitmapEncoder *create_encoder(void) +{ + IWICBitmapEncoder *encoder = NULL; + GUID guidresult; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_WICDdsEncoder, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICBitmapEncoder, (void **)&encoder); + if (hr != S_OK) + { + win_skip("DDS encoder is not supported\n"); + return NULL; + } + + memset(&guidresult, 0, sizeof(guidresult)); + + hr = IWICBitmapEncoder_GetContainerFormat(encoder, &guidresult); + ok(hr == S_OK, "GetContainerFormat failed, hr %#x\n", hr); + + ok(IsEqualGUID(&guidresult, &GUID_ContainerFormatDds), + "Got unexpected container format %s\n", debugstr_guid(&guidresult)); + + return encoder; +} + static HRESULT init_decoder(IWICBitmapDecoder *decoder, IWICStream *stream, HRESULT expected, int index, BOOL wine_init) { HRESULT hr; @@ -1231,6 +1256,69 @@ static void test_dds_decoder(void) } } +static void test_dds_encoder_initialize(void) +{ + IWICBitmapEncoder *encoder = NULL; + IWICStream *stream = NULL; + BYTE buffer[1]; + HRESULT hr; + + encoder = create_encoder(); + if (!encoder) goto end; + + stream = create_stream(buffer, sizeof(buffer)); + if (!stream) goto end; + + /* initialize with invalid cache option */ + + hr = IWICBitmapEncoder_Initialize(encoder, (IStream *)stream, 0xdeadbeef); + todo_wine + ok(hr == WINCODEC_ERR_UNSUPPORTEDOPERATION, "Initialize got unexpected hr %#x\n", hr); + + hr = IWICBitmapEncoder_Initialize(encoder, (IStream *)stream, WICBitmapEncoderNoCache); + todo_wine + ok(hr == E_INVALIDARG, "Initialize got unexpected hr %#x\n", hr); + + IWICBitmapEncoder_Release(encoder); + + /* initialize with null stream */ + + encoder = create_encoder(); + if (!encoder) goto end; + + hr = IWICBitmapEncoder_Initialize(encoder, NULL, WICBitmapEncoderNoCache); + todo_wine + ok(hr == E_INVALIDARG, "Initialize got unexpected hr %#x\n", hr); + + hr = IWICBitmapEncoder_Initialize(encoder, (IStream *)stream, WICBitmapEncoderNoCache); + todo_wine + ok(hr == S_OK, "Initialize failed, hr %#x\n", hr); + + IWICBitmapEncoder_Release(encoder); + + /* regularly initialize */ + + encoder = create_encoder(); + if (!encoder) goto end; + + hr = IWICBitmapEncoder_Initialize(encoder, (IStream *)stream, WICBitmapEncoderNoCache); + todo_wine + ok(hr == S_OK, "Initialize failed, hr %#x\n", hr); + + hr = IWICBitmapEncoder_Initialize(encoder, (IStream *)stream, WICBitmapEncoderNoCache); + todo_wine + ok(hr == WINCODEC_ERR_WRONGSTATE, "Initialize got unexpected hr %#x\n", hr); + +end: + if (stream) IWICStream_Release(stream); + if (encoder) IWICBitmapEncoder_Release(encoder); +} + +static void test_dds_encoder(void) +{ + test_dds_encoder_initialize(); +} + START_TEST(ddsformat) { HRESULT hr; @@ -1242,6 +1330,7 @@ START_TEST(ddsformat) if (hr != S_OK) goto end; test_dds_decoder(); + test_dds_encoder(); end: if (factory) IWICImagingFactory_Release(factory);

1 0

Francois Gouget : winetest/build-patterns: Fix detecting transitions in non-run-time failures.
by Alexandre Julliard 03 May '21

03 May '21

Module: tools Branch: master Commit: e5288e8eb055413071c707ed21768955b2de3ab7 URL: https://source.winehq.org/git/tools.git/?a=commit;h=e5288e8eb055413071c707e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 3 14:45:11 2021 +0200 winetest/build-patterns: Fix detecting transitions in non-run-time failures. Record the first failure type so changes can be detected later on. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-patterns | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index 460c17c..a84e2a7 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -480,12 +480,15 @@ foreach my $testname (keys %tests) } next if ($status eq "skipped"); # same as if WineTest was not run - # It is not an error if the dll is missing (or other similar - # error) _and_ it has always been so. my $failtype = fail_type($status); - next if ($testreport->{failtype} eq "" and $failtype ne "random"); - - if ($testreport->{failtype} ne $failtype) + if ($testreport->{failtype} eq "" and $failtype ne "random") + { + # It is not an error if the dll is missing (or other similar + # error) _and_ it has always been so. So just record failtype + # for now. + $testreport->{failtype} = $failtype; + } + elsif ($testreport->{failtype} ne $failtype) { # Either there was no failure before; or the failure type # changed in a way that cannot be explained by randomness; e.g.

1 0

Francois Gouget : winetest/build-patterns: Highlight recent changes in the failure modes.
by Alexandre Julliard 03 May '21

03 May '21

Module: tools Branch: master Commit: 9f40728cd785c04965642292963833d532070c6a URL: https://source.winehq.org/git/tools.git/?a=commit;h=9f40728cd785c0496564229… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 3 14:59:00 2021 +0200 winetest/build-patterns: Highlight recent changes in the failure modes. Highlight the new failure modes and put the test units that would otherwise go into the 'has always been failing' list in their own list. This should help catch new failures that pile on an already failing test unit. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-patterns | 53 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 50 insertions(+), 3 deletions(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index a84e2a7..ea9cd4c 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -260,6 +260,10 @@ my %reports; # True if the test had enough successful results after the last failure to be # considered fixed. # +# - newmodes +# A hashtable of new failure modes, that its of status values present in the +# last $patternbuilds build results that are not present in older builds. +# # - testreports # A hashtable mapping report directory names to objects storing the results # for that test and report combination. Each testreport object has the @@ -695,6 +699,11 @@ sub get_status_html($$) return ("?", "", "unknown status $status", "report", ""); } +sub cmpstatus +{ + return ($a =~ /^[0-9]+$/ and $b =~ /^[0-9]+$/) ? $a <=> $b : $a cmp $b; +} + sub write_patterns_list($$$$) { my ($html, $pagereports, $mainpage, $list) = @_; @@ -720,6 +729,17 @@ sub write_patterns_list($$$$) compute_set_colors($test->{colors}); print $html "<div class='test'>\n"; + if (%{$test->{newmodes}}) + { + print $html "New failure modes:"; + foreach my $status (sort cmpstatus keys %{$test->{newmodes}}) + { + my ($symbol, $class, $title, $_link, $attrs) = get_status_html($status, $test->{colors}); + print $html " <span class='pat$class'$attrs title='$title'><b><i>$symbol</i></b></span>"; + } + print $html "\n"; + } + foreach my $reportdir (@sortedreports) { next if (!$pagereports->{$reportdir}); @@ -727,6 +747,7 @@ sub write_patterns_list($$$$) next if (!$testreport->{failed}); print $html "<div class='pattern'>"; + my $has_newmode; my ($range_symbol, $range_count) = ("", 0); my ($range_start, $range_end, $range_title); foreach my $build (@sortedbuilds) @@ -773,6 +794,11 @@ sub write_patterns_list($$$$) $attrs .= sprintf " href='%s/%s/%s.html#%s'", $build->{name}, $reportdir, $link, $dll; } + if ($test->{newmodes}->{$status}) + { + $symbol = "<b><i>$symbol</i></b>"; + $has_newmode = 1; + } } if ($range_symbol eq $symbol) @@ -815,7 +841,9 @@ sub write_patterns_list($$$$) date_range($range_start, $range_end), $range_title, $range_symbol x $range_count; } - print $html "</div> $reportdir\n"; + my $label = $reportdir; + $label = "<b>$label</b>" if ($has_newmode); + print $html "</div> $label\n"; } print $html "</div></div>\n"; } @@ -848,6 +876,9 @@ EOF recent => {title => "Recent failures", desc => "have recent failures (that is failures that did not happen for the $patternbuilds oldest builds).", testnames => []}, + newmode => {title => "New failure modes", + desc => "failed in new ways in the $patternbuilds most recent builds.", + testnames => []}, regular => {title => "Regular failures", desc => "had failures.", testnames => []}, @@ -862,6 +893,7 @@ EOF my $first = @sortedbuilds; my $last = -1; my $fixed = 1; + my ($oldfailures, $newfailures) = ({}, {}); foreach my $reportdir (keys %$pagereports) { my $testreport = $test->{testreports}->{$reportdir}; @@ -876,8 +908,16 @@ EOF $testreport->{first}; $last = $replast if ($replast > $last); - foreach my $status (values %{$testreport->{status}}) + for my $i (0..(a)sortedbuilds-1) { + my $build = $sortedbuilds[$i]; + my $status = $testreport->{status}->{$build->{name}}; + next if (!defined $status); + next if ($status eq "skipped"); + + my $failures = ($i < @sortedbuilds - $patternbuilds) ? $oldfailures : $newfailures; + $failures->{$status}++; + next if ($status !~ /^[0-9]+$/); next if ($status eq "258"); # timeouts have their own color $test->{colors}->{$status} = undef; @@ -885,9 +925,16 @@ EOF } next if ($last == -1); # no report had a pattern of interest + $test->{newmodes} = {}; + foreach my $status (keys %$newfailures) + { + next if ($oldfailures->{$status}); + $test->{newmodes}->{$status} = 1; + } $fixed = 1 if (($test->{fixed} || 0) >= $fixed_threshold); my $listid = ($fixed or $last < @sortedbuilds - $patternbuilds) ? "old" : ($first > $patternbuilds) ? "recent" : + %{$test->{newmodes}} ? "newmode" : "regular"; push @{$lists{$listid}->{testnames}}, $testname; } @@ -895,7 +942,7 @@ EOF # Generate the lists index (and up test unit links) print $html "<h1>$title</h1>\n"; print $html "<ul>\n"; - my @listids = ("recent", "regular", "old"); + my @listids = ("recent", "newmode", "regular", "old"); my $prevunit = ""; foreach my $listid (@listids) {

1 0

Francois Gouget : winetest/dissect: Add an optional --max-fails option.
by Alexandre Julliard 03 May '21

03 May '21

Module: tools Branch: master Commit: 9fa45eed7f60ee2850a8bc396ed28b74d76d32aa URL: https://source.winehq.org/git/tools.git/?a=commit;h=9fa45eed7f60ee2850a8bc3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 3 15:42:18 2021 +0200 winetest/dissect: Add an optional --max-fails option. This allows not 'rejecting' old reports when reprocessing reports in-place. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index ea76cb8..33cfb0a 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -92,7 +92,7 @@ sub short_date($) # Command line processing # -my ($opt_workdir, $update, $report, $usage); +my ($opt_workdir, $opt_maxfails, $update, $report, $usage); sub check_opt_val($$) { @@ -124,6 +124,10 @@ while (@ARGV) $report = check_opt_val($arg, $report); $update = 1; } + elsif ($arg eq "--max-fails") + { + $opt_maxfails = check_opt_val($arg, $opt_maxfails); + } elsif ($arg eq "--help") { $usage = 0; @@ -146,6 +150,15 @@ if (!defined $usage) require Cwd; $workdir = Cwd::cwd() . "/$workdir"; } + if (defined $opt_maxfails) + { + $maxfailedtests = $opt_maxfails; + if ($opt_maxfails !~ /^\d+$/) + { + error("'$opt_maxfails' must be a positive integer\n"); + $usage = 2; + } + } if (!-f "$workdir/report.css") { error("'$workdir' is not a valid work directory\n"); @@ -165,7 +178,7 @@ if (defined $usage) exit $usage; } print <<EOF; -Usage: $name0 [--workdir DIR] [--update REPORT] [--help] +Usage: $name0 [--workdir DIR] [--update REPORT] [--max-fails MAX] [--help] Processes a test report to generate the corresponding HTML files. @@ -174,6 +187,7 @@ Where: files. Can be omitted if set in winetest.conf. --update REPORT Updates the HTML files of the specified test report. Note that it must have already been moved into place. + --max-fails MAX Reject reports with more than MAX failed test units. --help Shows this usage message. Actions:

1 0