February 2020 - Wine-commits

Alexandre Julliard : wmc: Set the output format from the output file name.
by Alexandre Julliard 06 Feb '20

06 Feb '20

Module: wine Branch: master Commit: 8247686c106fca0098d22bd6b182942b2597dfde URL: https://source.winehq.org/git/wine.git/?a=commit;h=8247686c106fca0098d22bd6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 6 15:05:48 2020 +0100 wmc: Set the output format from the output file name. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 15 ++++++--------- tools/wmc/utils.c | 7 +++++++ tools/wmc/utils.h | 1 + tools/wmc/wmc.c | 12 ++++++++++++ 4 files changed, 26 insertions(+), 9 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 4cc0e784c7..e5628712cc 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2757,11 +2757,15 @@ static void output_source_rc( struct makefile *make, struct incl_file *source, c static void output_source_mc( struct makefile *make, struct incl_file *source, const char *obj ) { unsigned int i; + char *obj_path = obj_dir_path( make, obj ); strarray_add( &make->res_files, strmake( "%s.res", obj )); strarray_add( &make->clean_files, strmake( "%s.pot", obj )); - output( "%s.res: %s\n", obj_dir_path( make, obj ), source->filename ); - output( "\t%s -U -O res -o $@ %s", tools_path( make, "wmc" ), source->filename ); + output( "%s.pot %s.res: %s", obj_path, obj_path, source->filename ); + output_filename( tools_path( make, "wmc" )); + output_filenames( source->dependencies ); + output( "\n" ); + output( "\t%s -u -o $@ %s", tools_path( make, "wmc" ), source->filename ); if (linguas.count) { char *po_dir = top_obj_dir_path( make, "po" ); @@ -2772,13 +2776,6 @@ static void output_source_mc( struct makefile *make, struct incl_file *source, c output_filename( strmake( "%s/%s.mo", po_dir, linguas.str[i] )); } output( "\n" ); - output( "%s.pot: %s\n", obj_dir_path( make, obj ), source->filename ); - output( "\t%s -O pot -o $@ %s", tools_path( make, "wmc" ), source->filename ); - output( "\n" ); - output( "%s.pot %s.res:", obj_dir_path( make, obj ), obj_dir_path( make, obj )); - output_filename( tools_path( make, "wmc" )); - output_filenames( source->dependencies ); - output( "\n" ); } diff --git a/tools/wmc/utils.c b/tools/wmc/utils.c index e3da5422d7..7261fe715a 100644 --- a/tools/wmc/utils.c +++ b/tools/wmc/utils.c @@ -200,6 +200,13 @@ char *strmake( const char* fmt, ... ) } } +int strendswith( const char *str, const char *end ) +{ + int l = strlen(str); + int m = strlen(end); + return l >= m && !strcmp( str + l - m, end ); +} + int unistrlen(const WCHAR *s) { int n; diff --git a/tools/wmc/utils.h b/tools/wmc/utils.h index 48f47ee751..e4c546765d 100644 --- a/tools/wmc/utils.h +++ b/tools/wmc/utils.h @@ -43,6 +43,7 @@ void error(const char *s, ...) __attribute__((format (printf, 1, 2))); void warning(const char *s, ...) __attribute__((format (printf, 1, 2))); char *dup_basename(const char *name, const char *ext); +int strendswith( const char *str, const char *end ); WCHAR *xunistrdup(const WCHAR * str); WCHAR *unistrcpy(WCHAR *dst, const WCHAR *src); diff --git a/tools/wmc/wmc.c b/tools/wmc/wmc.c index 89c8d6e8e9..93c029d751 100644 --- a/tools/wmc/wmc.c +++ b/tools/wmc/wmc.c @@ -126,6 +126,7 @@ FILE *yyin; static enum { + FORMAT_UNKNOWN, FORMAT_RC, FORMAT_RES, FORMAT_POT @@ -287,6 +288,15 @@ int main(int argc,char *argv[]) input_name = argv[optind]; } + /* Guess output format */ + if (output_format == FORMAT_UNKNOWN) + { + if (output_name && strendswith( output_name, ".res" )) output_format = FORMAT_RES; + else if (output_name && strendswith( output_name, ".pot" )) output_format = FORMAT_POT; + else output_format = FORMAT_RC; + } + if (output_format == FORMAT_RES) unicodeout = 1; + /* Generate appropriate outfile names */ if(!output_name) { @@ -340,6 +350,8 @@ int main(int argc,char *argv[]) case FORMAT_POT: write_pot_file( output_name ); break; + default: + break; } output_name = NULL; header_name = NULL;

1 0

Alexandre Julliard : wmc: Add trailing newlines to error messages.
by Alexandre Julliard 06 Feb '20

06 Feb '20

Module: wine Branch: master Commit: ccfabb323be58de25c0ff40f59f8666b2cd42e39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ccfabb323be58de25c0ff40f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 6 15:29:33 2020 +0100 wmc: Add trailing newlines to error messages. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wmc/mcy.y | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/wmc/mcy.y b/tools/wmc/mcy.y index f1d34584a6..1869fa9853 100644 --- a/tools/wmc/mcy.y +++ b/tools/wmc/mcy.y @@ -48,14 +48,14 @@ #include "wmc.h" #include "lang.h" -static const char err_syntax[] = "Syntax error"; -static const char err_number[] = "Number expected"; -static const char err_ident[] = "Identifier expected"; -static const char err_assign[] = "'=' expected"; -static const char err_popen[] = "'(' expected"; -static const char err_pclose[] = "')' expected"; -static const char err_colon[] = "':' expected"; -static const char err_msg[] = "Message expected"; +static const char err_syntax[] = "Syntax error\n"; +static const char err_number[] = "Number expected\n"; +static const char err_ident[] = "Identifier expected\n"; +static const char err_assign[] = "'=' expected\n"; +static const char err_popen[] = "'(' expected\n"; +static const char err_pclose[] = "')' expected\n"; +static const char err_colon[] = "':' expected\n"; +static const char err_msg[] = "Message expected\n"; /* Scanner switches */ int want_nl = 0; /* Request next newlinw */

1 0

Francois Gouget : testbot/UpdateTaskLogs: MoveRefReport() is not given .err files.
by Alexandre Julliard 06 Feb '20

06 Feb '20

Module: tools Branch: master Commit: 4c5ed9bbc5f9fbb1fbee33522fd8fde98d687578 URL: https://source.winehq.org/git/tools.git/?a=commit;h=4c5ed9bbc5f9fbb1fbee335… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Feb 6 15:12:44 2020 +0100 testbot/UpdateTaskLogs: MoveRefReport() is not given .err files. So there is no point allowing for a .err extension in the regexp splitting the report filename. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/UpdateTaskLogs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/UpdateTaskLogs b/testbot/bin/UpdateTaskLogs index 4fe6ff3..051dbe5 100755 --- a/testbot/bin/UpdateTaskLogs +++ b/testbot/bin/UpdateTaskLogs @@ -270,7 +270,7 @@ sub MoveRefReport($$;$) $NewDir ||= $RefDir; my $NewName = $RefName; - if ($RefName =~ /^([a-zA-Z0-9_]+)_((?:exe|win|wow)(?:32|64)[a-zA-Z0-9_]*\.report(?:\.err)?)$/) + if ($RefName =~ /^([a-zA-Z0-9_]+)_((?:exe|win|wow)(?:32|64)[a-zA-Z0-9_]*\.report)$/) { # We don't know which job generated this reference log. # So use a fixed, arbitrary JobId.

1 0

Francois Gouget : testbot/UpdateTaskLogs: Fix deletion of the new per-task reference reports.
by Alexandre Julliard 06 Feb '20

06 Feb '20

Module: tools Branch: master Commit: 8ce2a0aca63da9f2c36b33f2c03405332908a2c2 URL: https://source.winehq.org/git/tools.git/?a=commit;h=8ce2a0aca63da9f2c36b33f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Feb 6 15:13:18 2020 +0100 testbot/UpdateTaskLogs: Fix deletion of the new per-task reference reports. $ReportNames had the wrong scope, causing it to be undefined when the time came to delete the per-task reference reports. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/UpdateTaskLogs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/UpdateTaskLogs b/testbot/bin/UpdateTaskLogs index 051dbe5..e1da826 100755 --- a/testbot/bin/UpdateTaskLogs +++ b/testbot/bin/UpdateTaskLogs @@ -321,7 +321,7 @@ sub ProcessTaskLogs($$$) { # Upgrade the naming scheme of the task's old reference reports, # delete those that are not meant to exist. - my ($ErrMessage, $ReportNames, $_TaskMissions) = $Task->GetReportNames(); + (my $ErrMessage, $ReportNames, my $_TaskMissions) = $Task->GetReportNames(); if ($ErrMessage) { Error "$ErrMessage\n";

1 0

Francois Gouget : testbot/UpdateTaskLogs: Fix error handling for the task.log and testbot.log renames.
by Alexandre Julliard 06 Feb '20

06 Feb '20

Module: tools Branch: master Commit: 1db323cfd1f448bc976342d3d293e1b1caeab995 URL: https://source.winehq.org/git/tools.git/?a=commit;h=1db323cfd1f448bc976342d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Feb 6 15:13:36 2020 +0100 testbot/UpdateTaskLogs: Fix error handling for the task.log and testbot.log renames. The code checks that the target filename does not exist (so rename() does not clobber it), so it's very unlikely that the error is that the destination already exists. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/UpdateTaskLogs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/testbot/bin/UpdateTaskLogs b/testbot/bin/UpdateTaskLogs index e1da826..c6f7b75 100755 --- a/testbot/bin/UpdateTaskLogs +++ b/testbot/bin/UpdateTaskLogs @@ -351,12 +351,17 @@ sub ProcessTaskLogs($$$) "old_log.err" => "old_testbot.log"); while (my ($OldName, $NewName) = each %LogMap) { - if (-f "$TaskDir/$OldName" and !-f "$TaskDir/$NewName" and - !rename("$TaskDir/$OldName", "$TaskDir/$NewName")) + next if (!-f "$TaskDir/$OldName"); + if (-f "$TaskDir/$NewName") { Error TaskKeyStr($Task) .": Could not rename $OldName because $NewName already exists\n"; $Rc = 1; } + elsif (!rename("$TaskDir/$OldName", "$TaskDir/$NewName")) + { + Error TaskKeyStr($Task) .": Could not rename $OldName to $NewName: $!\n"; + $Rc = 1; + } } # testbot.log is the only log which we expect to be empty.

1 0

Francois Gouget : testbot/doc: The procmail dependency is optional.
by Alexandre Julliard 06 Feb '20

06 Feb '20

Module: tools Branch: master Commit: ec2755424c49980e5421a1dcbf650a2a8af6e635 URL: https://source.winehq.org/git/tools.git/?a=commit;h=ec2755424c49980e5421a1d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Feb 6 15:13:46 2020 +0100 testbot/doc: The procmail dependency is optional. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/doc/INSTALL.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index 7ac155d..bd4f39b 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -4,11 +4,12 @@ Dependencies: - Apache2 with mod_perl - MySQL -- Sendmail and Procmail +- Sendmail - Bytes::Random::Secure (libbytes-random-secure-perl) - DBI::mysql (libdbd-mysql-perl) - Sys::Virt (libsys-virt-perl, see http://libvirt.org/) - Image::Magick (perlmagick) +- Optional: Procmail (to process mailing list patches) - Optional: IO::Socket::IP (for IPv6, libio-socket-ip-perl) - Optional: Net::OpenSSH (for SSH tunneling, libnet-openssh-perl)

1 0

Rémi Bernon : ntdll: Reorder code to make the select logic clearer.
by Alexandre Julliard 05 Feb '20

05 Feb '20

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 05 Feb '20

05 Feb '20

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: Handle system APCs in a separate inner loop.
by Alexandre Julliard 05 Feb '20

05 Feb '20

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

Jacek Caban : guiddef.h: Improve __uuidof implementation.
by Alexandre Julliard 05 Feb '20

05 Feb '20

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