February 2020 - Wine-Commits

Jacek Caban : guiddef.h: Improve __uuidof implementation.
by Alexandre Julliard Feb. 5, 2020

Feb. 5, 2020

Module: wine Branch: master Commit: 51b75e9a534d8c6021bbcc71889e3c154f0f84ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=51b75e9a534d8c6021bbcc71… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 5 17:12:22 2020 +0100 guiddef.h: Improve __uuidof implementation. This patch ensures that the reference is unique and identical for all uses in module, fixes handling of const types and uses direct reference instead of depending on optimizer to produce sane code. Based on patch by Kevin Puetz. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/guiddef.h | 39 +++++++++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/include/guiddef.h b/include/guiddef.h index cc26e8b3a5..9fc40c73eb 100644 --- a/include/guiddef.h +++ b/include/guiddef.h @@ -42,30 +42,45 @@ typedef struct _GUID #endif /* Macros for __uuidof emulation */ -#if defined(__cplusplus) && !defined(_MSC_VER) +#ifdef __cplusplus +# if defined(__MINGW32__) +# define __WINE_UUID_ATTR __attribute__((selectany)) +# elif defined(__GNUC__) +# define __WINE_UUID_ATTR __attribute__((visibility("hidden"),weak)) +# endif +#endif + +#ifdef __WINE_UUID_ATTR extern "C++" { - template<typename T> const GUID &__wine_uuidof(); + template<typename T> struct __wine_uuidof; + + template<typename T> struct __wine_uuidof_type { + typedef __wine_uuidof<T> inst; + }; + template<typename T> struct __wine_uuidof_type<T *> { + typedef __wine_uuidof<T> inst; + }; + template<typename T> struct __wine_uuidof_type<T * const> { + typedef __wine_uuidof<T> inst; + }; } #define __CRT_UUID_DECL(type,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \ extern "C++" { \ - template<> inline const GUID &__wine_uuidof<type>() { \ - static const IID __uuid_inst = {l,w1,w2, {b1,b2,b3,b4,b5,b6,b7,b8}}; \ - return __uuid_inst; \ - } \ - template<> inline const GUID &__wine_uuidof<type*>() { \ - return __wine_uuidof<type>(); \ - } \ + template<> struct __wine_uuidof<type> { \ + static const GUID uuid; \ + }; \ + __WINE_UUID_ATTR const GUID __wine_uuidof<type>::uuid = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}; \ } -#define __uuidof(type) __wine_uuidof<typeof(type)>() +#define __uuidof(type) __wine_uuidof_type<typeof(type)>::inst::uuid -#else +#else /* __WINE_UUID_ATTR */ #define __CRT_UUID_DECL(type,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) -#endif +#endif /* __WINE_UUID_ATTR */ #endif

1 0

Kevin Puetz : ntdll: Allow NULL lpAssemblyDirectoryName in find_actctx_dll.
by Alexandre Julliard Feb. 5, 2020

Feb. 5, 2020

Module: wine Branch: master Commit: b6e91fa44b38b5771c6c694d8f6cfa607362fb49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6e91fa44b38b5771c6c694d… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Wed Feb 5 20:00:44 2020 +0100 ntdll: Allow NULL lpAssemblyDirectoryName in find_actctx_dll. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index b865d4f9ed..85eb297680 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2757,7 +2757,7 @@ static NTSTATUS find_actctx_dll( LPCWSTR libname, LPWSTR *fullname ) /* restart with larger buffer */ } - if (!info->lpAssemblyManifestPath || !info->lpAssemblyDirectoryName) + if (!info->lpAssemblyManifestPath) { status = STATUS_SXS_KEY_NOT_FOUND; goto done; @@ -2768,7 +2768,7 @@ static NTSTATUS find_actctx_dll( LPCWSTR libname, LPWSTR *fullname ) DWORD dirlen = info->ulAssemblyDirectoryNameLength / sizeof(WCHAR); p++; - if (strncmpiW( p, info->lpAssemblyDirectoryName, dirlen ) || strcmpiW( p + dirlen, dotManifestW )) + if (!dirlen || strncmpiW( p, info->lpAssemblyDirectoryName, dirlen ) || strcmpiW( p + dirlen, dotManifestW )) { /* manifest name does not match directory name, so it's not a global * windows/winsxs manifest; use the manifest directory name instead */ @@ -2786,6 +2786,12 @@ static NTSTATUS find_actctx_dll( LPCWSTR libname, LPWSTR *fullname ) } } + if (!info->lpAssemblyDirectoryName) + { + status = STATUS_SXS_KEY_NOT_FOUND; + goto done; + } + needed = (strlenW(user_shared_data->NtSystemRoot) * sizeof(WCHAR) + sizeof(winsxsW) + info->ulAssemblyDirectoryNameLength + nameW.Length + 2*sizeof(WCHAR));

1 0

Rémi Bernon : ntdll: Reorder code to make the select logic clearer.
by Alexandre Julliard Feb. 5, 2020

Feb. 5, 2020

Module: wine Branch: master Commit: 6cb23362174cc43ba1d34b7d545fbc143ff7b2fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cb23362174cc43ba1d34b7d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Feb 5 11:49:37 2020 +0100 ntdll: Reorder code to make the select logic clearer. The wait_select_reply call may return STATUS_USER_APC/STATUS_KERNEL_APC, depending on which APC is about to be returned but the apc call will always be APC_NONE right after the wait. It needs an additional select request to actually return the call. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/server.c | 17 ++++++++++------- dlls/ntdll/sync.c | 10 ++++++---- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 73f4d86cf4..18ee41790f 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -607,7 +607,7 @@ unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT memset( &result, 0, sizeof(result) ); - for (;;) + do { SERVER_START_REQ( select ) { @@ -623,9 +623,13 @@ unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT call = reply->call; } SERVER_END_REQ; - if (ret == STATUS_PENDING) ret = wait_select_reply( &cookie ); - if (ret != STATUS_USER_APC && ret != STATUS_KERNEL_APC) break; - if (invoke_apc( &call, &result )) + + /* don't signal multiple times */ + if (size >= sizeof(select_op->signal_and_wait) && select_op->op == SELECT_SIGNAL_AND_WAIT) + size = offsetof( select_op_t, signal_and_wait.signal ); + + if ((ret == STATUS_USER_APC || ret == STATUS_KERNEL_APC) && + invoke_apc( &call, &result )) { /* if we ran a user apc we have to check once more if additional apcs are queued, * but we don't want to wait */ @@ -634,10 +638,9 @@ unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT size = 0; } - /* don't signal multiple times */ - if (size >= sizeof(select_op->signal_and_wait) && select_op->op == SELECT_SIGNAL_AND_WAIT) - size = offsetof( select_op_t, signal_and_wait.signal ); + if (ret == STATUS_PENDING) ret = wait_select_reply( &cookie ); } + while (ret == STATUS_USER_APC || ret == STATUS_KERNEL_APC); if (ret == STATUS_TIMEOUT && user_apc) ret = STATUS_USER_APC; diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index d09b90a927..3b8b4f4eaa 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -2470,7 +2470,7 @@ NTSTATUS WINAPI RtlWaitOnAddress( const void *addr, const void *cmp, SIZE_T size memset( &result, 0, sizeof(result) ); - for (;;) + do { RtlEnterCriticalSection( &addr_section ); if (!compare_addr( addr, cmp, size )) @@ -2496,16 +2496,18 @@ NTSTATUS WINAPI RtlWaitOnAddress( const void *addr, const void *cmp, SIZE_T size RtlLeaveCriticalSection( &addr_section ); - if (ret == STATUS_PENDING) ret = wait_select_reply( &cookie ); - if (ret != STATUS_USER_APC && ret != STATUS_KERNEL_APC) break; - if (invoke_apc( &call, &result )) + if ((ret == STATUS_USER_APC || ret == STATUS_KERNEL_APC) && + invoke_apc( &call, &result )) { /* if we ran a user apc we have to check once more if additional apcs are queued, * but we don't want to wait */ abs_timeout = 0; user_apc = TRUE; } + + if (ret == STATUS_PENDING) ret = wait_select_reply( &cookie ); } + while (ret == STATUS_USER_APC || ret == STATUS_KERNEL_APC); if (ret == STATUS_TIMEOUT && user_apc) ret = STATUS_USER_APC;

1 0

Rémi Bernon : ntdll: Use the status to tell user APC from system APC.
by Alexandre Julliard Feb. 5, 2020

Feb. 5, 2020

Module: wine Branch: master Commit: 3ffa355d2b9d270e794f4d8f6d2aa5e3f9f6557b URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ffa355d2b9d270e794f4d8f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Feb 5 11:49:38 2020 +0100 ntdll: Use the status to tell user APC from system APC. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll_misc.h | 2 +- dlls/ntdll/server.c | 14 ++++++-------- dlls/ntdll/sync.c | 5 +++-- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index e1fb1e9eba..bec88e6f07 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -115,7 +115,7 @@ extern NTSTATUS alloc_object_attributes( const OBJECT_ATTRIBUTES *attr, struct o data_size_t *ret_len ) DECLSPEC_HIDDEN; extern NTSTATUS validate_open_object_attributes( const OBJECT_ATTRIBUTES *attr ) DECLSPEC_HIDDEN; extern int wait_select_reply( void *cookie ) DECLSPEC_HIDDEN; -extern BOOL invoke_apc( const apc_call_t *call, apc_result_t *result ) DECLSPEC_HIDDEN; +extern void invoke_apc( const apc_call_t *call, apc_result_t *result ) DECLSPEC_HIDDEN; /* module handling */ extern LIST_ENTRY tls_links DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 18ee41790f..c17ab964d5 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -384,11 +384,11 @@ int wait_select_reply( void *cookie ) /*********************************************************************** * invoke_apc * - * Invoke a single APC. Return TRUE if a user APC has been run. + * Invoke a single APC. + * */ -BOOL invoke_apc( const apc_call_t *call, apc_result_t *result ) +void invoke_apc( const apc_call_t *call, apc_result_t *result ) { - BOOL user_apc = FALSE; SIZE_T size; void *addr; pe_image_info_t image_info; @@ -403,7 +403,6 @@ BOOL invoke_apc( const apc_call_t *call, apc_result_t *result ) { void (WINAPI *func)(ULONG_PTR,ULONG_PTR,ULONG_PTR) = wine_server_get_ptr( call->user.func ); func( call->user.args[0], call->user.args[1], call->user.args[2] ); - user_apc = TRUE; break; } case APC_TIMER: @@ -411,7 +410,6 @@ BOOL invoke_apc( const apc_call_t *call, apc_result_t *result ) void (WINAPI *func)(void*, unsigned int, unsigned int) = wine_server_get_ptr( call->timer.func ); func( wine_server_get_ptr( call->timer.arg ), (DWORD)call->timer.time, (DWORD)(call->timer.time >> 32) ); - user_apc = TRUE; break; } case APC_ASYNC_IO: @@ -587,7 +585,6 @@ BOOL invoke_apc( const apc_call_t *call, apc_result_t *result ) server_protocol_error( "get_apc_request: bad type %d\n", call->type ); break; } - return user_apc; } @@ -628,9 +625,10 @@ unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT if (size >= sizeof(select_op->signal_and_wait) && select_op->op == SELECT_SIGNAL_AND_WAIT) size = offsetof( select_op_t, signal_and_wait.signal ); - if ((ret == STATUS_USER_APC || ret == STATUS_KERNEL_APC) && - invoke_apc( &call, &result )) + if (ret == STATUS_KERNEL_APC) invoke_apc( &call, &result ); + if (ret == STATUS_USER_APC) { + invoke_apc( &call, &result ); /* if we ran a user apc we have to check once more if additional apcs are queued, * but we don't want to wait */ abs_timeout = 0; diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 3b8b4f4eaa..3e670f47f7 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -2496,9 +2496,10 @@ NTSTATUS WINAPI RtlWaitOnAddress( const void *addr, const void *cmp, SIZE_T size RtlLeaveCriticalSection( &addr_section ); - if ((ret == STATUS_USER_APC || ret == STATUS_KERNEL_APC) && - invoke_apc( &call, &result )) + if (ret == STATUS_KERNEL_APC) invoke_apc( &call, &result ); + if (ret == STATUS_USER_APC) { + invoke_apc( &call, &result ); /* if we ran a user apc we have to check once more if additional apcs are queued, * but we don't want to wait */ abs_timeout = 0;

1 0

Rémi Bernon : ntdll: Process system APCs while the signals are blocked.
by Alexandre Julliard Feb. 5, 2020

Feb. 5, 2020

Module: wine Branch: master Commit: 544fd9504a6b8c646c09d314c1539e4e7b6fb946 URL: https://source.winehq.org/git/wine.git/?a=commit;h=544fd9504a6b8c646c09d314… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Feb 5 11:49:40 2020 +0100 ntdll: Process system APCs while the signals are blocked. This makes sure that system APC, such as APC_BREAK_PROCESS do not get interrupted in the middle of their execution, and that the APC completion notification is always correctly sent back to the caller. Otherwise DbgBreakProcess sometimes did not return until WaitForDebugEvent/ContinueDebugEvent are called, because of a race condition between the APC servicing thread, and the newly created exception thread. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/server.c | 5 ++++- dlls/ntdll/sync.c | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 15d53b348e..4facdc08a7 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -601,11 +601,13 @@ unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT apc_call_t call; apc_result_t result; timeout_t abs_timeout = timeout ? timeout->QuadPart : TIMEOUT_INFINITE; + sigset_t old_set; memset( &result, 0, sizeof(result) ); do { + pthread_sigmask( SIG_BLOCK, &server_block_set, &old_set ); for (;;) { SERVER_START_REQ( select ) @@ -616,7 +618,7 @@ unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT req->timeout = abs_timeout; wine_server_add_data( req, &result, sizeof(result) ); wine_server_add_data( req, select_op, size ); - ret = wine_server_call( req ); + ret = server_call_unlocked( req ); abs_timeout = reply->timeout; apc_handle = reply->apc_handle; call = reply->call; @@ -630,6 +632,7 @@ unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT if (ret != STATUS_KERNEL_APC) break; invoke_apc( &call, &result ); } + pthread_sigmask( SIG_SETMASK, &old_set, NULL ); if (ret == STATUS_USER_APC) { diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 8b12e03eef..2b5b6ce44a 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -2457,6 +2457,7 @@ NTSTATUS WINAPI RtlWaitOnAddress( const void *addr, const void *cmp, SIZE_T size apc_call_t call; apc_result_t result; timeout_t abs_timeout = timeout ? timeout->QuadPart : TIMEOUT_INFINITE; + sigset_t old_set; if (size != 1 && size != 2 && size != 4 && size != 8) return STATUS_INVALID_PARAMETER; @@ -2479,6 +2480,7 @@ NTSTATUS WINAPI RtlWaitOnAddress( const void *addr, const void *cmp, SIZE_T size return STATUS_SUCCESS; } + pthread_sigmask( SIG_BLOCK, &server_block_set, &old_set ); for (;;) { SERVER_START_REQ( select ) @@ -2489,7 +2491,7 @@ NTSTATUS WINAPI RtlWaitOnAddress( const void *addr, const void *cmp, SIZE_T size req->timeout = abs_timeout; wine_server_add_data( req, &result, sizeof(result) ); wine_server_add_data( req, &select_op, sizeof(select_op.keyed_event) ); - ret = wine_server_call( req ); + ret = server_call_unlocked( req ); abs_timeout = reply->timeout; apc_handle = reply->apc_handle; call = reply->call; @@ -2499,6 +2501,7 @@ NTSTATUS WINAPI RtlWaitOnAddress( const void *addr, const void *cmp, SIZE_T size if (ret != STATUS_KERNEL_APC) break; invoke_apc( &call, &result ); } + pthread_sigmask( SIG_SETMASK, &old_set, NULL ); RtlLeaveCriticalSection( &addr_section );

1 0

Daniel Lehman : include: Add some E_* defines.
by Alexandre Julliard Feb. 5, 2020

Feb. 5, 2020

Module: wine Branch: master Commit: d724f5e38c73a30da7867c596dda2014918b2a24 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d724f5e38c73a30da7867c59… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Feb 5 09:55:52 2020 -0800 include: Add some E_* defines. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winerror.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/winerror.h b/include/winerror.h index 73027c4189..6fad106685 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -2099,7 +2099,9 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define E_PENDING _HRESULT_TYPEDEF_(0x8000000A) #define E_BOUNDS _HRESULT_TYPEDEF_(0x8000000B) - +#define E_CHANGED_STATE _HRESULT_TYPEDEF_(0x8000000C) +#define E_ILLEGAL_STATE_CHANGE _HRESULT_TYPEDEF_(0x8000000D) +#define E_ILLEGAL_METHOD_CALL _HRESULT_TYPEDEF_(0x8000000E) #define E_NOTIMPL _HRESULT_TYPEDEF_(0x80004001) #define E_NOINTERFACE _HRESULT_TYPEDEF_(0x80004002)

1 0

Daniel Lehman : msvcrt: Don't set error in wcstombs_s_l if no characters to convert.
by Alexandre Julliard Feb. 5, 2020

Feb. 5, 2020

Module: wine Branch: master Commit: 417897248735cfaabb2e440147bdc0f7816fb97c URL: https://source.winehq.org/git/wine.git/?a=commit;h=417897248735cfaabb2e4401… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Feb 3 12:06:10 2020 -0800 msvcrt: Don't set error in wcstombs_s_l if no characters to convert. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/string.c | 2 +- dlls/msvcrt/wcs.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 32e264908a..7d9b46b3e6 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2300,7 +2300,7 @@ static void test__wcstombs_s_l(void) { L"text", _TRUNCATE, "", 1, 1, STRUNCATE, NULL, FALSE, TRUE }, { L"text", 5, "", 3, 0, ERANGE, NULL, TRUE }, - { L"", 0, NULL, 0, 1, 0, "English_United States.1252", TRUE, TRUE }, + { L"", 0, NULL, 0, 1, 0, "English_United States.1252" }, { L"\xfffd", 1, NULL, 0, 0, EILSEQ, "English_United States.1252", TRUE }, { L"\xfffd", 1, "", 1, 0, EILSEQ, "English_United States.1252", TRUE }, { L"\xfffd", 1, "", 6, 0, EILSEQ, "English_United States.1252", TRUE }, diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 8411048204..64bc1f83d4 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -459,12 +459,12 @@ static MSVCRT_size_t MSVCRT_wcsrtombs_l(char *mbstr, const MSVCRT_wchar_t **wcst if(!mbstr) { tmp = WideCharToMultiByte(locinfo->lc_codepage, WC_NO_BEST_FIT_CHARS, - *wcstr, -1, NULL, 0, NULL, &used_default)-1; + *wcstr, -1, NULL, 0, NULL, &used_default); if(!tmp || used_default) { *MSVCRT__errno() = MSVCRT_EILSEQ; return -1; } - return tmp; + return tmp-1; } while(**wcstr) {

1 0

Rémi Bernon : ntdll: Handle system APCs in a separate inner loop.
by Alexandre Julliard Feb. 5, 2020

Feb. 5, 2020

Module: wine Branch: master Commit: 2dc99bfb308393f95d6d9896e030646012beddf6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2dc99bfb308393f95d6d9896… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Feb 5 11:49:39 2020 +0100 ntdll: Handle system APCs in a separate inner loop. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/server.c | 39 ++++++++++++++++++++++----------------- dlls/ntdll/sync.c | 31 ++++++++++++++++++------------- 2 files changed, 40 insertions(+), 30 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index c17ab964d5..15d53b348e 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -606,26 +606,31 @@ unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT do { - SERVER_START_REQ( select ) + for (;;) { - req->flags = flags; - req->cookie = wine_server_client_ptr( &cookie ); - req->prev_apc = apc_handle; - req->timeout = abs_timeout; - wine_server_add_data( req, &result, sizeof(result) ); - wine_server_add_data( req, select_op, size ); - ret = wine_server_call( req ); - abs_timeout = reply->timeout; - apc_handle = reply->apc_handle; - call = reply->call; - } - SERVER_END_REQ; + SERVER_START_REQ( select ) + { + req->flags = flags; + req->cookie = wine_server_client_ptr( &cookie ); + req->prev_apc = apc_handle; + req->timeout = abs_timeout; + wine_server_add_data( req, &result, sizeof(result) ); + wine_server_add_data( req, select_op, size ); + ret = wine_server_call( req ); + abs_timeout = reply->timeout; + apc_handle = reply->apc_handle; + call = reply->call; + } + SERVER_END_REQ; + + /* don't signal multiple times */ + if (size >= sizeof(select_op->signal_and_wait) && select_op->op == SELECT_SIGNAL_AND_WAIT) + size = offsetof( select_op_t, signal_and_wait.signal ); - /* don't signal multiple times */ - if (size >= sizeof(select_op->signal_and_wait) && select_op->op == SELECT_SIGNAL_AND_WAIT) - size = offsetof( select_op_t, signal_and_wait.signal ); + if (ret != STATUS_KERNEL_APC) break; + invoke_apc( &call, &result ); + } - if (ret == STATUS_KERNEL_APC) invoke_apc( &call, &result ); if (ret == STATUS_USER_APC) { invoke_apc( &call, &result ); diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 3e670f47f7..8b12e03eef 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -2479,24 +2479,29 @@ NTSTATUS WINAPI RtlWaitOnAddress( const void *addr, const void *cmp, SIZE_T size return STATUS_SUCCESS; } - SERVER_START_REQ( select ) + for (;;) { - req->flags = SELECT_INTERRUPTIBLE; - req->cookie = wine_server_client_ptr( &cookie ); - req->prev_apc = apc_handle; - req->timeout = abs_timeout; - wine_server_add_data( req, &result, sizeof(result) ); - wine_server_add_data( req, &select_op, sizeof(select_op.keyed_event) ); - ret = wine_server_call( req ); - abs_timeout = reply->timeout; - apc_handle = reply->apc_handle; - call = reply->call; + SERVER_START_REQ( select ) + { + req->flags = SELECT_INTERRUPTIBLE; + req->cookie = wine_server_client_ptr( &cookie ); + req->prev_apc = apc_handle; + req->timeout = abs_timeout; + wine_server_add_data( req, &result, sizeof(result) ); + wine_server_add_data( req, &select_op, sizeof(select_op.keyed_event) ); + ret = wine_server_call( req ); + abs_timeout = reply->timeout; + apc_handle = reply->apc_handle; + call = reply->call; + } + SERVER_END_REQ; + + if (ret != STATUS_KERNEL_APC) break; + invoke_apc( &call, &result ); } - SERVER_END_REQ; RtlLeaveCriticalSection( &addr_section ); - if (ret == STATUS_KERNEL_APC) invoke_apc( &call, &result ); if (ret == STATUS_USER_APC) { invoke_apc( &call, &result );

1 0

Rémi Bernon : server: Use STATUS_KERNEL_APC to indicate system APCs.
by Alexandre Julliard Feb. 5, 2020

Feb. 5, 2020

Module: wine Branch: master Commit: 676ad9b0afeb1d6e591e2b7d48258730f9f84a83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=676ad9b0afeb1d6e591e2b7d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Feb 5 11:49:36 2020 +0100 server: Use STATUS_KERNEL_APC to indicate system APCs. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/server.c | 2 +- dlls/ntdll/sync.c | 2 +- server/thread.c | 22 +++++++++++++++++----- server/trace.c | 1 + 4 files changed, 20 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 089eb3b89a..73f4d86cf4 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -624,7 +624,7 @@ unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT } SERVER_END_REQ; if (ret == STATUS_PENDING) ret = wait_select_reply( &cookie ); - if (ret != STATUS_USER_APC) break; + if (ret != STATUS_USER_APC && ret != STATUS_KERNEL_APC) break; if (invoke_apc( &call, &result )) { /* if we ran a user apc we have to check once more if additional apcs are queued, diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index c4885973b6..d09b90a927 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -2497,7 +2497,7 @@ NTSTATUS WINAPI RtlWaitOnAddress( const void *addr, const void *cmp, SIZE_T size RtlLeaveCriticalSection( &addr_section ); if (ret == STATUS_PENDING) ret = wait_select_reply( &cookie ); - if (ret != STATUS_USER_APC) break; + if (ret != STATUS_USER_APC && ret != STATUS_KERNEL_APC) break; if (invoke_apc( &call, &result )) { /* if we ran a user apc we have to check once more if additional apcs are queued, diff --git a/server/thread.c b/server/thread.c index 5844d03968..edf70c61bd 100644 --- a/server/thread.c +++ b/server/thread.c @@ -747,7 +747,7 @@ static int check_wait( struct thread *thread ) assert( wait ); if ((wait->flags & SELECT_INTERRUPTIBLE) && !list_empty( &thread->system_apc )) - return STATUS_USER_APC; + return STATUS_KERNEL_APC; /* Suspended threads may not acquire locks, but they can run system APCs */ if (thread->process->suspend + thread->suspend > 0) return -1; @@ -1081,12 +1081,11 @@ void thread_cancel_apc( struct thread *thread, struct object *owner, enum apc_ty } /* remove the head apc from the queue; the returned object must be released by the caller */ -static struct thread_apc *thread_dequeue_apc( struct thread *thread, int system_only ) +static struct thread_apc *thread_dequeue_apc( struct thread *thread, int system ) { struct thread_apc *apc = NULL; - struct list *ptr = list_head( &thread->system_apc ); + struct list *ptr = list_head( system ? &thread->system_apc : &thread->user_apc ); - if (!ptr && !system_only) ptr = list_head( &thread->user_apc ); if (ptr) { apc = LIST_ENTRY( ptr, struct thread_apc, entry ); @@ -1581,7 +1580,7 @@ DECL_HANDLER(select) while (get_error() == STATUS_USER_APC) { - if (!(apc = thread_dequeue_apc( current, !(req->flags & SELECT_ALERTABLE) ))) + if (!(apc = thread_dequeue_apc( current, 0 ))) break; /* Optimization: ignore APC_NONE calls, they are only used to * wake up a thread, but since we got here the thread woke up already. @@ -1597,6 +1596,19 @@ DECL_HANDLER(select) wake_up( &apc->obj, 0 ); release_object( apc ); } + + if (get_error() == STATUS_KERNEL_APC) + { + apc = thread_dequeue_apc( current, 1 ); + if ((reply->apc_handle = alloc_handle( current->process, apc, SYNCHRONIZE, 0 ))) + reply->call = apc->call; + else + { + apc->executed = 1; + wake_up( &apc->obj, 0 ); + } + release_object( apc ); + } } /* queue an APC for a thread or process */ diff --git a/server/trace.c b/server/trace.c index c3ec6bf363..79e3f22ee5 100644 --- a/server/trace.c +++ b/server/trace.c @@ -5577,6 +5577,7 @@ static const struct { "INVALID_READ_MODE", STATUS_INVALID_READ_MODE }, { "INVALID_SECURITY_DESCR", STATUS_INVALID_SECURITY_DESCR }, { "IO_TIMEOUT", STATUS_IO_TIMEOUT }, + { "KERNEL_APC", STATUS_KERNEL_APC }, { "KEY_DELETED", STATUS_KEY_DELETED }, { "MAPPED_FILE_SIZE_ZERO", STATUS_MAPPED_FILE_SIZE_ZERO }, { "MORE_PROCESSING_REQUIRED", STATUS_MORE_PROCESSING_REQUIRED },

1 0

Alexandre Julliard : libport: Move wine_fold_string implementation back to libwine and make it obsolete.
by Alexandre Julliard Feb. 5, 2020

Feb. 5, 2020

Module: wine Branch: master Commit: afd681ebd920f54300601ab842399723b9af3e2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=afd681ebd920f54300601ab8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 5 09:00:04 2020 +0100 libport: Move wine_fold_string implementation back to libwine and make it obsolete. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/unicode.h | 1 - libs/port/Makefile.in | 1 - libs/wine/Makefile.in | 1 + libs/{port => wine}/fold.c | 10 +++++++++- libs/wine/port.c | 1 - libs/wine/wine.map | 2 +- 6 files changed, 11 insertions(+), 5 deletions(-) diff --git a/include/wine/unicode.h b/include/wine/unicode.h index 5210b72498..d2b852fafb 100644 --- a/include/wine/unicode.h +++ b/include/wine/unicode.h @@ -95,7 +95,6 @@ extern int wine_utf8_wcstombs( int flags, const WCHAR *src, int srclen, char *ds extern int wine_compare_string( int flags, const WCHAR *str1, int len1, const WCHAR *str2, int len2 ); extern int wine_get_sortkey( int flags, const WCHAR *src, int srclen, char *dst, int dstlen ); -extern int wine_fold_string( int flags, const WCHAR *src, int srclen , WCHAR *dst, int dstlen ); extern int strcmpiW( const WCHAR *str1, const WCHAR *str2 ); extern int strncmpiW( const WCHAR *str1, const WCHAR *str2, int n ); diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 3b70f82d6f..4e3f23cde9 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -82,7 +82,6 @@ C_SRCS = \ decompose.c \ digitmap.c \ ffs.c \ - fold.c \ fstatvfs.c \ getopt.c \ interlocked.c \ diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index f7dd34b058..d0b2d1e7b6 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -4,6 +4,7 @@ EXTRALIBS = $(DL_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) $(I386_LIBS) C_SRCS = \ config.c \ debug.c \ + fold.c \ ldt.c \ loader.c \ mmap.c \ diff --git a/libs/port/fold.c b/libs/wine/fold.c similarity index 96% rename from libs/port/fold.c rename to libs/wine/fold.c index 00046f15a3..ef4e88c81c 100644 --- a/libs/port/fold.c +++ b/libs/wine/fold.c @@ -18,6 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wine/asm.h" + +#ifdef __ASM_OBSOLETE + #include "wine/unicode.h" static inline WCHAR to_unicode_digit( WCHAR ch ) @@ -116,7 +120,7 @@ static inline const WCHAR* get_ligature( WCHAR wc ) } /* fold a unicode string */ -int wine_fold_string( int flags, const WCHAR *src, int srclen, WCHAR *dst, int dstlen ) +int wine_fold_string_obsolete( int flags, const WCHAR *src, int srclen, WCHAR *dst, int dstlen ) { WCHAR *dstbase = dst; const WCHAR *expand; @@ -197,3 +201,7 @@ int wine_fold_string( int flags, const WCHAR *src, int srclen, WCHAR *dst, int d } return dst - dstbase; } + +__ASM_OBSOLETE(wine_fold_string); + +#endif /* __ASM_OBSOLETE */ diff --git a/libs/wine/port.c b/libs/wine/port.c index e5cfcf41ab..43355719c2 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -45,7 +45,6 @@ const void *libwine_port_functions[] = wine_cp_wcstombs, wine_cpsymbol_mbstowcs, wine_cpsymbol_wcstombs, - wine_fold_string, wine_utf8_mbstowcs, wine_utf8_wcstombs }; diff --git a/libs/wine/wine.map b/libs/wine/wine.map index 17c91fd162..08de127cff 100644 --- a/libs/wine/wine.map +++ b/libs/wine/wine.map @@ -22,7 +22,6 @@ WINE_1.0 wine_dlopen; wine_dlsym; wine_exec_wine_binary; - wine_fold_string; wine_get_build_dir; wine_get_build_id; wine_get_config_dir; @@ -117,6 +116,7 @@ WINE_1.0 wine_dll_load; wine_dll_load_main_exe; wine_dll_unload; + wine_fold_string; wine_pthread_get_functions; wine_pthread_set_functions; wine_switch_to_stack;

1 0