August 2023 - Wine-commits - list.winehq.org

Alex Henrie : include: Annotate PFLT_CONTEXT_ALLOCATE_CALLBACK with __WINE_ALLOC_SIZE.
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: wine Branch: master Commit: a4752dcf9fad0a8b517757fde13c92af2e20ae0a URL: https://gitlab.winehq.org/wine/wine/-/commit/a4752dcf9fad0a8b517757fde13c92… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Aug 11 16:56:52 2023 -0700 include: Annotate PFLT_CONTEXT_ALLOCATE_CALLBACK with __WINE_ALLOC_SIZE. --- include/ddk/fltkernel.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/ddk/fltkernel.h b/include/ddk/fltkernel.h index 8ebebfa2e81..49c9d55dbaa 100644 --- a/include/ddk/fltkernel.h +++ b/include/ddk/fltkernel.h @@ -585,7 +585,7 @@ typedef struct _FLT_CALLBACK_DATA KPROCESSOR_MODE RequestorMode; } FLT_CALLBACK_DATA, *PFLT_CALLBACK_DATA; -typedef void* (WINAPI *PFLT_CONTEXT_ALLOCATE_CALLBACK)(POOL_TYPE,SIZE_T,FLT_CONTEXT_TYPE); +typedef void* (__WINE_ALLOC_SIZE(2) WINAPI *PFLT_CONTEXT_ALLOCATE_CALLBACK)(POOL_TYPE,SIZE_T,FLT_CONTEXT_TYPE); typedef void (WINAPI *PFLT_CONTEXT_CLEANUP_CALLBACK)(PFLT_CONTEXT, FLT_CONTEXT_TYPE); typedef void (WINAPI *PFLT_CONTEXT_FREE_CALLBACK)(void *, FLT_CONTEXT_TYPE); typedef NTSTATUS (WINAPI *PFLT_FILTER_UNLOAD_CALLBACK)(FLT_FILTER_UNLOAD_FLAGS);

1 0

Alex Henrie : include: Annotate PRTL_(AVL|GENERIC)_ALLOCATE_ROUTINE with __WINE_ALLOC_SIZE.
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: wine Branch: master Commit: 6354cd9f56c4c02df87e68cd3b777767db0ac603 URL: https://gitlab.winehq.org/wine/wine/-/commit/6354cd9f56c4c02df87e68cd3b7777… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Aug 11 16:56:52 2023 -0700 include: Annotate PRTL_(AVL|GENERIC)_ALLOCATE_ROUTINE with __WINE_ALLOC_SIZE. --- include/ddk/ntddk.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index 9072b9121a0..e8d9bb89ad4 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -163,7 +163,7 @@ typedef struct _RTL_SPLAY_LINKS struct _RTL_GENERIC_TABLE; typedef RTL_GENERIC_COMPARE_RESULTS (WINAPI *PRTL_GENERIC_COMPARE_ROUTINE)(struct _RTL_GENERIC_TABLE *, void *, void *); -typedef void * (WINAPI *PRTL_GENERIC_ALLOCATE_ROUTINE)(struct _RTL_GENERIC_TABLE *, LONG); +typedef void * (__WINE_ALLOC_SIZE(2) WINAPI *PRTL_GENERIC_ALLOCATE_ROUTINE)(struct _RTL_GENERIC_TABLE *, LONG); typedef void (WINAPI *PRTL_GENERIC_FREE_ROUTINE)(struct _RTL_GENERIC_TABLE *Table, void *); typedef struct _RTL_GENERIC_TABLE @@ -193,7 +193,7 @@ struct _RTL_AVL_TABLE; typedef RTL_GENERIC_COMPARE_RESULTS (WINAPI *PRTL_AVL_COMPARE_ROUTINE)(struct _RTL_AVL_TABLE *, void *, void *); -typedef void * (WINAPI *PRTL_AVL_ALLOCATE_ROUTINE)(struct _RTL_AVL_TABLE *, LONG); +typedef void * (__WINE_ALLOC_SIZE(2) WINAPI *PRTL_AVL_ALLOCATE_ROUTINE)(struct _RTL_AVL_TABLE *, LONG); typedef void (WINAPI *PRTL_AVL_FREE_ROUTINE )(struct _RTL_AVL_TABLE *, void *buffer);

1 0

Alex Henrie : include: Annotate PALLOCATE_FUNCTION(_EX) with __WINE_ALLOC_SIZE.
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: wine Branch: master Commit: 6bd87223bff8bd7a28e4206a3c5b5907cb73c1eb URL: https://gitlab.winehq.org/wine/wine/-/commit/6bd87223bff8bd7a28e4206a3c5b59… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Aug 11 16:56:52 2023 -0700 include: Annotate PALLOCATE_FUNCTION(_EX) with __WINE_ALLOC_SIZE. --- include/ddk/wdm.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 79c88315c2e..45503f48a4e 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1407,8 +1407,8 @@ typedef struct _KLOCK_QUEUE_HANDLE { KIRQL OldIrql; } KLOCK_QUEUE_HANDLE, *PKLOCK_QUEUE_HANDLE; -typedef void * (NTAPI *PALLOCATE_FUNCTION)(POOL_TYPE, SIZE_T, ULONG); -typedef void * (NTAPI *PALLOCATE_FUNCTION_EX)(POOL_TYPE, SIZE_T, ULONG, PLOOKASIDE_LIST_EX); +typedef void * (__WINE_ALLOC_SIZE(2) NTAPI *PALLOCATE_FUNCTION)(POOL_TYPE, SIZE_T, ULONG); +typedef void * (__WINE_ALLOC_SIZE(2) NTAPI *PALLOCATE_FUNCTION_EX)(POOL_TYPE, SIZE_T, ULONG, PLOOKASIDE_LIST_EX); typedef void (NTAPI *PFREE_FUNCTION)(void *); typedef void (NTAPI *PFREE_FUNCTION_EX)(void *, PLOOKASIDE_LIST_EX); typedef void (NTAPI *PCALLBACK_FUNCTION)(void *, void *, void *);

1 0

Paul Gofman : opengl32: Skip debug callback messages called from native thread.
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: wine Branch: master Commit: 51b671532715bd2a0486a2c7ddf23134d81ba688 URL: https://gitlab.winehq.org/wine/wine/-/commit/51b671532715bd2a0486a2c7ddf231… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Aug 11 17:57:29 2023 -0600 opengl32: Skip debug callback messages called from native thread. --- dlls/opengl32/unix_wgl.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/opengl32/unix_wgl.c b/dlls/opengl32/unix_wgl.c index cf819e96df2..4cf12893541 100644 --- a/dlls/opengl32/unix_wgl.c +++ b/dlls/opengl32/unix_wgl.c @@ -903,8 +903,15 @@ static void gl_debug_message_callback( GLenum source, GLenum type, GLuint id, GL }; void *ret_ptr; ULONG ret_len; - struct wgl_handle *ptr = (struct wgl_handle *)userParam; + + if (!NtCurrentTeb()) + { + fprintf( stderr, "msg:gl_debug_message_callback called from native thread, severity %#x, message \"%.*s\".\n", + severity, length, message ); + return; + } + if (!(params.user_callback = ptr->u.context->debug_callback)) return; params.user_data = ptr->u.context->debug_user;

1 0

Maxim Karasev : secur32: Add stub message for unimplemented name types in GetUserNameExW.
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: wine Branch: master Commit: 5abe9de59fdc88a8c742f313f35cb175c60da98e URL: https://gitlab.winehq.org/wine/wine/-/commit/5abe9de59fdc88a8c742f313f35cb1… Author: Maxim Karasev <mxkrsv(a)etersoft.ru> Date: Wed Aug 2 20:42:07 2023 +0300 secur32: Add stub message for unimplemented name types in GetUserNameExW. --- dlls/secur32/secur32.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index 46a80c9a76c..bb723e90004 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -1140,6 +1140,7 @@ BOOLEAN WINAPI GetUserNameExW( case NameCanonicalEx: case NameServicePrincipal: case NameDnsDomain: + FIXME("NameFormat %d not implemented\n", NameFormat); SetLastError(ERROR_NONE_MAPPED); return FALSE;

1 0

Maxim Karasev : whoami: Refactor and add more commands.
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: wine Branch: master Commit: aa3beb88b346cd74568157d5c10a464a6995c7c2 URL: https://gitlab.winehq.org/wine/wine/-/commit/aa3beb88b346cd74568157d5c10a46… Author: Maxim Karasev <mxkrsv(a)etersoft.ru> Date: Mon Jul 24 22:15:34 2023 +0300 whoami: Refactor and add more commands. Particularly it implements '/logonid' and '/user' options, as well as adds stubs for '/upn' and '/fqdn'. --- programs/whoami/Makefile.in | 2 +- programs/whoami/main.c | 267 +++++++++++++++++++++++++++++++++++++++----- 2 files changed, 239 insertions(+), 30 deletions(-) diff --git a/programs/whoami/Makefile.in b/programs/whoami/Makefile.in index 4898a96f456..5be08c702a8 100644 --- a/programs/whoami/Makefile.in +++ b/programs/whoami/Makefile.in @@ -1,5 +1,5 @@ MODULE = whoami.exe -IMPORTS = secur32 +IMPORTS = secur32 advapi32 EXTRADLLFLAGS = -mconsole -municode diff --git a/programs/whoami/main.c b/programs/whoami/main.c index 7e93de998ef..c98a553d32d 100644 --- a/programs/whoami/main.c +++ b/programs/whoami/main.c @@ -1,5 +1,6 @@ /* * Copyright 2020 Brendan Shanks for CodeWeavers + * Copyright 2023 Maxim Karasev <mxkrsv(a)etersoft.ru> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -16,9 +17,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_LEAN_AND_MEAN #define SECURITY_WIN32 #include <windows.h> #include <security.h> +#include <sddl.h> +#include <stdarg.h> #include "wine/debug.h" @@ -27,67 +31,272 @@ WINE_DEFAULT_DEBUG_CHANNEL(whoami); static int output_write(const WCHAR* str, int len) { DWORD count; + + if (len < 0) + len = wcslen(str); + if (!WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), str, len, &count, NULL)) { DWORD lenA; - char* strA; + char *strA; /* On Windows WriteConsoleW() fails if the output is redirected. So fall * back to WriteFile() with OEM code page. */ - lenA = WideCharToMultiByte(GetOEMCP(), 0, str, len, - NULL, 0, NULL, NULL); - strA = HeapAlloc(GetProcessHeap(), 0, lenA); + lenA = WideCharToMultiByte(GetOEMCP(), 0, str, len, NULL, 0, NULL, NULL); + strA = malloc(lenA); if (!strA) return 0; - WideCharToMultiByte(GetOEMCP(), 0, str, len, strA, lenA, - NULL, NULL); + WideCharToMultiByte(GetOEMCP(), 0, str, len, strA, lenA, NULL, NULL); WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), strA, lenA, &count, FALSE); - HeapFree(GetProcessHeap(), 0, strA); + free(strA); } return count; } -int __cdecl wmain(int argc, WCHAR *argv[]) +static WCHAR *get_user_name(EXTENDED_NAME_FORMAT name_format) { - WCHAR *buf = NULL; ULONG size = 0; - BOOL result; + WCHAR *ret; - if (argc > 1) + if (GetUserNameExW(name_format, NULL, &size) || GetLastError() != ERROR_MORE_DATA) + return NULL; + + ret = malloc(size * sizeof(WCHAR)); + if (!ret) + return NULL; + + if (!GetUserNameExW(name_format, ret, &size)) { - int i; + free(ret); + return NULL; + } + + return ret; +} + +static void *get_token(TOKEN_INFORMATION_CLASS token_type) +{ + HANDLE token_handle; + void *ret; + /* GetTokenInformation wants a dword-aligned buffer */ + ULONG ret_size = sizeof(DWORD) * 256; + ULONG token_size; + + ret = malloc(ret_size); + if (!OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token_handle)) + return NULL; - WINE_FIXME("unsupported arguments:"); - for (i = 0; i < argc; i++) - WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); - WINE_FIXME("\n"); + if (!GetTokenInformation(token_handle, token_type, ret, ret_size, &token_size)) + { + CloseHandle(token_handle); + return NULL; + } + + CloseHandle(token_handle); + return ret; +} + +static SID *get_process_sid(void) +{ + ULONG user_sid_len; + TOKEN_USER *token_user; + SID *ret; + + token_user = get_token(TokenUser); + if (!token_user) + return NULL; + + user_sid_len = GetLengthSid(token_user->User.Sid); + ret = malloc(user_sid_len); + if (!ret) + { + free(token_user); + return NULL; } - result = GetUserNameExW(NameSamCompatible, NULL, &size); - if (result || GetLastError() != ERROR_MORE_DATA) + if (!CopySid(user_sid_len, ret, token_user->User.Sid)) { - WINE_ERR("GetUserNameExW failed, result %d, error %ld\n", result, GetLastError()); + free(token_user); + free(ret); + return NULL; + } + + free(token_user); + return ret; +} + +static SID *get_logon_sid(void) +{ + TOKEN_GROUPS *token_groups; + DWORD group_token_len; + DWORD i; + SID *ret; + + token_groups = get_token(TokenGroups); + if (!token_groups) + return NULL; + + for (i = 0; i < token_groups->GroupCount; i++) + { + if ((token_groups->Groups[i].Attributes & SE_GROUP_LOGON_ID) == SE_GROUP_LOGON_ID) + { + group_token_len = GetLengthSid(token_groups->Groups[i].Sid); + ret = malloc(group_token_len); + if (!ret) + { + free(token_groups); + return NULL; + } + + if (!CopySid(group_token_len, ret, token_groups->Groups[i].Sid)) + { + free(token_groups); + free(ret); + return NULL; + } + + free(token_groups); + return ret; + } + } + + free(token_groups); + return NULL; +} + +static int simple(EXTENDED_NAME_FORMAT name_format) +{ + WCHAR *name; + + name = get_user_name(name_format); + if (!name) + { + ERR("get_user_name failed\n"); return 1; } - buf = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); - if (!buf) + output_write(name, -1); + output_write(L"\n", 1); + + free(name); + + return 0; +} + +static int logon_id(void) +{ + PSID sid; + WCHAR *sid_string; + + sid = get_logon_sid(); + if (!sid) { - WINE_ERR("Memory allocation failed\n"); + ERR("get_logon_sid failed\n"); return 1; } - result = GetUserNameExW(NameSamCompatible, buf, &size); - if (result) + if (!ConvertSidToStringSidW(sid, &sid_string)) { - output_write(buf, size); - output_write(L"\r\n", 2); + ERR("ConvertSidToStringSidW failed, error %ld\n", GetLastError()); + return 1; + } + + output_write(sid_string, -1); + output_write(L"\n", 1); + + free(sid); + LocalFree(sid_string); + + return 0; +} + +static int user(void) +{ + PSID sid; + WCHAR *name; + WCHAR *sid_string; + ULONG i; + + name = get_user_name(NameSamCompatible); + if (!name) + { + ERR("get_user_name failed\n"); + return 1; + } + + sid = get_process_sid(); + if (!sid) + { + ERR("get_process_sid failed\n"); + return 1; } - else - WINE_ERR("GetUserNameExW failed, error %ld\n", GetLastError()); - HeapFree(GetProcessHeap(), 0, buf); + if (!ConvertSidToStringSidW(sid, &sid_string)) + { + ERR("ConvertSidToStringSidW failed, error %ld\n", GetLastError()); + return 1; + } + + output_write(L"\nUSER INFORMATION\n----------------\n\n", -1); + output_write(L"User Name", -1); + for (i = 0; i <= max(wcslen(name), wcslen(L"User Name")) - wcslen(L"User Name"); i++) + output_write(L" ", 1); + output_write(L"SID\n", -1); + + for (i = 0; i < wcslen(name); i++) + output_write(L"=", 1); + output_write(L" ", 1); + for (i = 0; i < wcslen(sid_string); i++) + output_write(L"=", 1); + output_write(L"\n", 1); + + output_write(name, -1); + output_write(L" ", 1); + output_write(sid_string, -1); + output_write(L"\n", 1); + + free(name); + free(sid); + LocalFree(sid_string); + return 0; } + +int __cdecl wmain(int argc, WCHAR *argv[]) +{ + if (argv[1] == NULL) + { + + return simple(NameSamCompatible); + } + else + { + wcslwr(argv[1]); + + if (!wcscmp(argv[1], L"/upn")) + { + /* Not implemented as of now, therefore fails */ + return simple(NameUserPrincipal); + } + else if (!wcscmp(argv[1], L"/fqdn")) + { + /* Not implemented as of now, therefore fails */ + return simple(NameFullyQualifiedDN); + } + else if (!wcscmp(argv[1], L"/logonid")) + { + return logon_id(); + } + else if (!wcscmp(argv[1], L"/user")) + { + return user(); + } + else + { + FIXME("stub\n"); + return 0; + } + } +}

1 0

Biswapriyo Nath : include: Add IXAudio2Extension in xaudio2.idl.
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: wine Branch: master Commit: a34267e87e6c21e13c13204ecf63b73bcca75e85 URL: https://gitlab.winehq.org/wine/wine/-/commit/a34267e87e6c21e13c13204ecf63b7… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Fri Aug 4 21:42:39 2023 +0530 include: Add IXAudio2Extension in xaudio2.idl. Required for rpcs3 project. --- include/xaudio2.idl | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/xaudio2.idl b/include/xaudio2.idl index 277fc450469..b07c562914b 100644 --- a/include/xaudio2.idl +++ b/include/xaudio2.idl @@ -572,6 +572,18 @@ interface IXAudio2 : IUnknown [in, defaultvalue(NULL)] void* pReserved); } +[ + object, + local, + uuid(84ac29bb-d619-44d2-b197-e4acf7df3ed6) +] +interface IXAudio2Extension : IUnknown +{ + void GetProcessingQuantum(UINT32 *quantum_numerator, UINT32 *quantum_denominator); + + void GetProcessor(XAUDIO2_PROCESSOR *processor); +} + const UINT32 XAUDIO2_DEBUG_ENGINE = 0x00000001; const UINT32 XAUDIO2_VOICE_NOPITCH = 0x00000002; const UINT32 XAUDIO2_VOICE_NOSRC = 0x00000004;

1 0

Zebediah Figura : opengl32: Preserve the remainder of the version string when limiting the version to 4.3.
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: wine Branch: master Commit: 06be26daa1cf1d158c165a55a097b385a88a0465 URL: https://gitlab.winehq.org/wine/wine/-/commit/06be26daa1cf1d158c165a55a097b3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Aug 13 17:31:13 2023 -0500 opengl32: Preserve the remainder of the version string when limiting the version to 4.3. --- dlls/opengl32/unix_wgl.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/opengl32/unix_wgl.c b/dlls/opengl32/unix_wgl.c index a03f8337fbf..cf819e96df2 100644 --- a/dlls/opengl32/unix_wgl.c +++ b/dlls/opengl32/unix_wgl.c @@ -71,6 +71,7 @@ struct opengl_context GLubyte *extensions; /* extension string */ GLuint *disabled_exts; /* indices of disabled extensions */ struct wgl_context *drv_ctx; /* driver context */ + GLubyte *version_string; }; struct wgl_handle @@ -412,7 +413,7 @@ static BOOL check_extension_support( TEB *teb, const char *extension, const char return FALSE; } -static void parse_gl_version( const char *gl_version, int *major, int *minor ) +static const char *parse_gl_version( const char *gl_version, int *major, int *minor ) { const char *ptr = gl_version; @@ -425,6 +426,9 @@ static void parse_gl_version( const char *gl_version, int *major, int *minor ) ERR( "Invalid OpenGL version string %s.\n", debugstr_a(gl_version) ); *minor = atoi( ptr ); + + while (isdigit( *ptr )) ++ptr; + return ptr; } static void wrap_glGetIntegerv( TEB *teb, GLenum pname, GLint *data ) @@ -469,13 +473,25 @@ static const GLubyte *wrap_glGetString( TEB *teb, GLenum name ) } else if (name == GL_VERSION && is_win64 && is_wow64()) { + struct wgl_handle *ptr = get_current_context_ptr( teb ); int major, minor; + const char *rest; - parse_gl_version( (const char *)ret, &major, &minor ); + if (ptr->u.context->version_string) + return ptr->u.context->version_string; + + rest = parse_gl_version( (const char *)ret, &major, &minor ); /* 4.4 depends on ARB_buffer_storage, which we don't support on wow64. */ if (major > 4 || (major == 4 && minor >= 4)) - return (const GLubyte *)"4.3"; + { + char *str = malloc( 3 + strlen( rest ) + 1 ); + + sprintf( str, "4.3%s", rest ); + if (InterlockedCompareExchangePointer( (void **)&ptr->u.context->version_string, str, NULL )) + free( str ); + return ptr->u.context->version_string; + } } } @@ -700,6 +716,7 @@ static BOOL wrap_wglDeleteContext( TEB *teb, HGLRC hglrc ) } if (hglrc == teb->glCurrentRC) wrap_wglMakeCurrent( teb, 0, 0 ); ptr->funcs->wgl.p_wglDeleteContext( ptr->u.context->drv_ctx ); + free( ptr->u.context->version_string ); free( ptr->u.context->disabled_exts ); free( ptr->u.context->extensions ); free( ptr->u.context );

1 0

Zebediah Figura : configure: Fail if --enable-archs is used and any cross-compiler is missing.
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: wine Branch: master Commit: cda2886fd3018c9e8c12791238db481b528f6a65 URL: https://gitlab.winehq.org/wine/wine/-/commit/cda2886fd3018c9e8c12791238db48… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Aug 12 17:43:08 2023 -0500 configure: Fail if --enable-archs is used and any cross-compiler is missing. For example, currently, if --enable-archs=i386,x86_64 is used, and there is an x86_64 cross compiler present but no i386 cross compiler, Wine will silently remove i386 from the list of cross-compiled architechtures, and only compile PE code for x86_64. This seems quite undesirable. I am not aware of any practical reason for this to happen. Debian does ship i686 and x86_64 MinGW compilers in separate packages, though, so it is possible in theory. --- configure | 33 ++++++++++++++++----------------- configure.ac | 18 ++++++++++-------- 2 files changed, 26 insertions(+), 25 deletions(-) diff --git a/configure b/configure index d5e699ca7d9..829741a5c0e 100755 --- a/configure +++ b/configure @@ -10512,11 +10512,6 @@ test -n "$x86_64_CC" || x86_64_CC="false" esac fi - if eval test \"x\$"${wine_arch}_CC"\" = x"false" -then : - continue -fi - saved_CC=$CC saved_CFLAGS=$CFLAGS saved_LDFLAGS=$LDFLAGS @@ -10531,7 +10526,11 @@ fi target="" as_wine_cv_crosscc=`printf "%s\n" "ac_cv_${wine_arch}_crosscc" | $as_tr_sh` - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC works" >&5 + if eval test \"x\$"${wine_arch}_CC"\" = x"false" +then : + +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC works" >&5 printf %s "checking whether $CC works... " >&6; } if eval test \${$as_wine_cv_crosscc+y} then : @@ -10559,6 +10558,7 @@ fi eval ac_res=\$$as_wine_cv_crosscc { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 printf "%s\n" "$ac_res" >&6; } +fi if eval test \"x\$"$as_wine_cv_crosscc"\" = x"yes" then : set x $CC @@ -10627,6 +10627,11 @@ fi if test -z "$target" then + if test ${enable_archs+y} +then : + as_fn_error $? "MinGW $wine_arch compiler not found. +This is an error since --enable-archs=$wine_arch was requested." "$LINENO" 5 +fi CC=$saved_CC CFLAGS=$saved_CFLAGS LDFLAGS=$saved_LDFLAGS @@ -10676,6 +10681,11 @@ printf "%s\n" "unsupported" >&6; } CC=$saved_CC CFLAGS=$saved_CFLAGS LDFLAGS=$saved_LDFLAGS + if test ${enable_archs+y} +then : + as_fn_error $? "MinGW $wine_arch compiler supporting C99 not found. +This is an error since --enable-archs=$wine_arch was requested." "$LINENO" 5 +fi continue ;; x*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $res" >&5 @@ -11648,17 +11658,6 @@ if test $HOST_ARCH = aarch64 then test "x$PE_ARCHS" != x || as_fn_error $? "PE cross-compilation is required for ARM64, please install clang/llvm-dlltool/lld, or llvm-mingw." "$LINENO" 5 DLLEXT="" -else - if test "x$PE_ARCHS" = "x" -then : - case "x$with_mingw" in - x) as_fn_append wine_notices "|MinGW compiler not found, cross-compiling PE files won't be supported." ;; - xno) ;; - *) as_fn_error $? "MinGW compiler not found, cross-compiling PE files won't be supported. -This is an error since --with-mingw was requested." "$LINENO" 5 ;; -esac - -fi fi diff --git a/configure.ac b/configure.ac index 0a683212866..90f4fd3809d 100644 --- a/configure.ac +++ b/configure.ac @@ -849,8 +849,6 @@ do ;; esac]) - AS_VAR_IF([${wine_arch}_CC],[false],[continue]) - saved_CC=$CC saved_CFLAGS=$CFLAGS saved_LDFLAGS=$LDFLAGS @@ -864,9 +862,10 @@ do target="" AS_VAR_PUSHDEF([wine_cv_crosscc],[ac_cv_${wine_arch}_crosscc]) - AC_CACHE_CHECK([whether $CC works],[wine_cv_crosscc], - [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], - [AS_VAR_SET([wine_cv_crosscc],[yes])],[AS_VAR_SET([wine_cv_crosscc],[no])])]) + AS_VAR_IF([${wine_arch}_CC],[false],[], + [AC_CACHE_CHECK([whether $CC works],[wine_cv_crosscc], + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], + [AS_VAR_SET([wine_cv_crosscc],[yes])],[AS_VAR_SET([wine_cv_crosscc],[no])])])]) AS_VAR_IF([wine_cv_crosscc],[yes], [set x $CC shift @@ -903,6 +902,9 @@ do if test -z "$target" then + AS_VAR_SET_IF([enable_archs], + [AC_MSG_ERROR([MinGW $wine_arch compiler not found. +This is an error since --enable-archs=$wine_arch was requested.])]) CC=$saved_CC CFLAGS=$saved_CFLAGS LDFLAGS=$saved_LDFLAGS @@ -930,6 +932,9 @@ do CC=$saved_CC CFLAGS=$saved_CFLAGS LDFLAGS=$saved_LDFLAGS + AS_VAR_SET_IF([enable_archs], + [AC_MSG_ERROR([MinGW $wine_arch compiler supporting C99 not found. +This is an error since --enable-archs=$wine_arch was requested.])]) continue ;; x*) AC_MSG_RESULT([$res]) @@ -1009,9 +1014,6 @@ if test $HOST_ARCH = aarch64 then test "x$PE_ARCHS" != x || AC_MSG_ERROR([PE cross-compilation is required for ARM64, please install clang/llvm-dlltool/lld, or llvm-mingw.]) DLLEXT="" -else - WINE_NOTICE_WITH(mingw,[test "x$PE_ARCHS" = "x"], - [MinGW compiler not found, cross-compiling PE files won't be supported.]) fi dnl **** External libraries ****

1 0

Rémi Bernon : mfplat/tests: Create the test_callback event in the constructor.
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: wine Branch: master Commit: 848fe4a741ba194c50cc4517f23dc950104f62f6 URL: https://gitlab.winehq.org/wine/wine/-/commit/848fe4a741ba194c50cc4517f23dc9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 8 15:42:20 2023 +0200 mfplat/tests: Create the test_callback event in the constructor. --- dlls/mfplat/tests/mfplat.c | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 39fdb665bbf..0f4ae026228 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -521,7 +521,10 @@ static ULONG WINAPI testcallback_Release(IMFAsyncCallback *iface) ULONG refcount = InterlockedDecrement(&callback->refcount); if (!refcount) + { + CloseHandle(callback->event); free(callback); + } return refcount; } @@ -804,6 +807,7 @@ static struct test_callback * create_test_callback(const IMFAsyncCallbackVtbl *v callback->IMFAsyncCallback_iface.lpVtbl = vtbl ? vtbl : &testcallbackvtbl; callback->refcount = 1; + callback->event = CreateEventA(NULL, FALSE, FALSE, NULL); return callback; } @@ -816,7 +820,6 @@ static BOOL get_event(IMFMediaEventGenerator *generator, MediaEventType expected HRESULT hr; callback = create_test_callback(&events_callback_vtbl); - callback->event = CreateEventA(NULL, FALSE, FALSE, NULL); for (;;) { @@ -847,7 +850,6 @@ static BOOL get_event(IMFMediaEventGenerator *generator, MediaEventType expected } } - CloseHandle(callback->event); if (callback->media_event) IMFMediaEvent_Release(callback->media_event); IMFAsyncCallback_Release(&callback->IMFAsyncCallback_iface); @@ -937,7 +939,6 @@ static void test_source_resolver(void) IMFByteStream_Release(stream); /* Create from URL. */ - callback->event = CreateEventA(NULL, FALSE, FALSE, NULL); hr = IMFSourceResolver_CreateObjectFromURL(resolver, L"nonexisting.mp4", MF_RESOLUTION_BYTESTREAM, NULL, &obj_type, (IUnknown **)&stream); @@ -1234,7 +1235,6 @@ static void test_source_resolver(void) (void **)&scheme_handler); ok(hr == S_OK, "Failed to create handler object, hr %#lx.\n", hr); - callback2->event = callback->event; cancel_cookie = NULL; hr = IMFSchemeHandler_BeginCreateObject(scheme_handler, pathW, MF_RESOLUTION_MEDIASOURCE, NULL, &cancel_cookie, &callback2->IMFAsyncCallback_iface, (IUnknown *)scheme_handler); @@ -1249,8 +1249,6 @@ static void test_source_resolver(void) if (do_uninit) CoUninitialize(); - CloseHandle(callback->event); - IMFSourceResolver_Release(resolver); hr = MFShutdown(); @@ -3524,16 +3522,12 @@ static void test_event_queue(void) hr = IMFMediaEventQueue_BeginGetEvent(queue, &callback2->IMFAsyncCallback_iface, (IUnknown *)&callback->IMFAsyncCallback_iface); ok(hr == MF_E_MULTIPLE_SUBSCRIBERS, "Unexpected hr %#lx.\n", hr); - callback->event = CreateEventA(NULL, FALSE, FALSE, NULL); - hr = IMFMediaEventQueue_QueueEvent(queue, event); ok(hr == S_OK, "Failed to queue event, hr %#lx.\n", hr); ret = WaitForSingleObject(callback->event, 500); ok(ret == WAIT_OBJECT_0, "Unexpected return value %#lx.\n", ret); - CloseHandle(callback->event); - IMFMediaEvent_Release(event); hr = MFCreateAsyncResult(NULL, &callback->IMFAsyncCallback_iface, NULL, &result); @@ -4957,8 +4951,6 @@ static void test_async_create_file(void) hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); ok(hr == S_OK, "Fail to start up, hr %#lx.\n", hr); - callback->event = CreateEventA(NULL, FALSE, FALSE, NULL); - GetTempPathW(ARRAY_SIZE(pathW), pathW); GetTempFileNameW(pathW, NULL, 0, fileW); @@ -4971,8 +4963,6 @@ static void test_async_create_file(void) IUnknown_Release(cancel_cookie); - CloseHandle(callback->event); - hr = MFShutdown(); ok(hr == S_OK, "Failed to shut down, hr %#lx.\n", hr); @@ -5856,7 +5846,6 @@ static void test_queue_com_state(const char *name) HRESULT hr; callback = create_test_callback(&test_queue_com_state_callback_vtbl); - callback->event = CreateEventA(NULL, FALSE, FALSE, NULL); hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); ok(hr == S_OK, "Failed to start up, hr %#lx.\n", hr); @@ -5888,8 +5877,6 @@ static void test_queue_com_state(const char *name) } } - CloseHandle(callback->event); - hr = MFShutdown(); ok(hr == S_OK, "Failed to shut down, hr %#lx.\n", hr);

1 0