July 2017 - Wine-commits - list.winehq.org

Jacek Caban : server: Store completion in async object instead of async_queue.
by Alexandre Julliard 05 Jul '17

05 Jul '17

Module: wine Branch: master Commit: 7f17bae74ee519c004220d3d2ecbad0f30e6030f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f17bae74ee519c004220d3d2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 4 15:26:05 2017 +0200 server: Store completion in async object instead of async_queue. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/server/async.c b/server/async.c index ed85899..e612669 100644 --- a/server/async.c +++ b/server/async.c @@ -51,6 +51,8 @@ struct async struct iosb *iosb; /* I/O status block */ obj_handle_t wait_handle; /* pre-allocated wait handle */ int direct_result; /* a flag if we're passing result directly from request instead of APC */ + struct completion *completion; /* completion associated with fd */ + apc_param_t comp_key; /* completion key associated with fd */ }; static void async_dump( struct object *obj, int verbose ); @@ -85,8 +87,6 @@ struct async_queue { struct object obj; /* object header */ struct fd *fd; /* file descriptor owning this queue */ - struct completion *completion; /* completion associated with a recently closed file descriptor */ - apc_param_t comp_key; /* completion key associated with a recently closed file descriptor */ struct list queue; /* queue of async objects */ }; @@ -170,6 +170,7 @@ static void async_destroy( struct object *obj ) else if (async->fd) release_object( async->fd ); if (async->timeout) remove_timeout_user( async->timeout ); + if (async->completion) release_object( async->completion ); if (async->event) release_object( async->event ); if (async->iosb) release_object( async->iosb ); release_object( async->thread ); @@ -184,9 +185,7 @@ static void async_queue_dump( struct object *obj, int verbose ) static void async_queue_destroy( struct object *obj ) { - struct async_queue *async_queue = (struct async_queue *)obj; assert( obj->ops == &async_queue_ops ); - if (async_queue->completion) release_object( async_queue->completion ); } /* notifies client thread of new status of its async request */ @@ -241,7 +240,6 @@ struct async_queue *create_async_queue( struct fd *fd ) if (queue) { queue->fd = fd; - queue->completion = NULL; list_init( &queue->queue ); } return queue; @@ -253,8 +251,11 @@ void free_async_queue( struct async_queue *queue ) struct async *async; if (!queue) return; - if (queue->fd) queue->completion = fd_get_completion( queue->fd, &queue->comp_key ); - LIST_FOR_EACH_ENTRY( async, &queue->queue, struct async, queue_entry ) async->fd = NULL; + LIST_FOR_EACH_ENTRY( async, &queue->queue, struct async, queue_entry ) + { + async->completion = fd_get_completion( async->fd, &async->comp_key ); + async->fd = NULL; + } queue->fd = NULL; async_wake_up( queue, STATUS_HANDLES_CLOSED ); release_object( queue ); @@ -297,6 +298,7 @@ struct async *create_async( struct fd *fd, struct thread *thread, const async_da async->signaled = 0; async->wait_handle = 0; async->direct_result = 0; + async->completion = NULL; if (iosb) async->iosb = (struct iosb *)grab_object( iosb ); else async->iosb = NULL; @@ -386,19 +388,8 @@ void async_set_timeout( struct async *async, timeout_t timeout, unsigned int sta static void add_async_completion( struct async *async, apc_param_t cvalue, unsigned int status, apc_param_t information ) { - if (async->fd) - { - apc_param_t ckey; - struct completion *completion = fd_get_completion( async->fd, &ckey ); - - if (completion) - { - add_completion( completion, ckey, cvalue, status, information ); - release_object( completion ); - } - } - else if (async->queue && async->queue->completion) - add_completion( async->queue->completion, async->queue->comp_key, cvalue, status, information ); + if (async->fd && !async->completion) async->completion = fd_get_completion( async->fd, &async->comp_key ); + if (async->completion) add_completion( async->completion, async->comp_key, cvalue, status, information ); } /* store the result of the client-side async callback */

1 0

Jacek Caban : server: Make async_queue object a simple list instead of a server object.
by Alexandre Julliard 05 Jul '17

05 Jul '17

Module: wine Branch: master Commit: 0b4c8bf93f48e3d1792c88d7117ff34d749ae598 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b4c8bf93f48e3d1792c88d71… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 4 15:26:19 2017 +0200 server: Make async_queue object a simple list instead of a server object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 72 ++++------------------------------------------------- server/fd.c | 53 +++++++++++++++++++-------------------- server/file.h | 11 +++++++- server/named_pipe.c | 43 ++++++++++++++------------------ server/sock.c | 53 +++++++++++++++++++-------------------- 5 files changed, 83 insertions(+), 149 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0b4c8bf93f48e3d1792c8…

1 0

Jacek Caban : server: Remove no longer needed NULL checks.
by Alexandre Julliard 05 Jul '17

05 Jul '17

Module: wine Branch: master Commit: 99dfb290481783768ba7d7277905185c3c36d101 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99dfb290481783768ba7d7277… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 4 15:26:26 2017 +0200 server: Remove no longer needed NULL checks. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 11 +---------- server/file.h | 7 ++++++- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/server/async.c b/server/async.c index 2bf00b6..0205807 100644 --- a/server/async.c +++ b/server/async.c @@ -381,19 +381,12 @@ void async_set_result( struct object *obj, unsigned int status, apc_param_t tota } } -/* check if there are any queued async operations */ -int async_queued( struct async_queue *queue ) -{ - return queue && list_head( &queue->queue ); -} - /* check if an async operation is waiting to be alerted */ int async_waiting( struct async_queue *queue ) { struct list *ptr; struct async *async; - if (!queue) return 0; if (!(ptr = list_head( &queue->queue ))) return 0; async = LIST_ENTRY( ptr, struct async, queue_entry ); return async->status == STATUS_PENDING; @@ -430,8 +423,6 @@ void async_wake_up( struct async_queue *queue, unsigned int status ) { struct list *ptr, *next; - if (!queue) return; - LIST_FOR_EACH_SAFE( ptr, next, &queue->queue ) { struct async *async = LIST_ENTRY( ptr, struct async, queue_entry ); @@ -516,7 +507,7 @@ int async_is_blocking( struct async *async ) struct async *find_pending_async( struct async_queue *queue ) { struct async *async; - if (queue) LIST_FOR_EACH_ENTRY( async, &queue->queue, struct async, queue_entry ) + LIST_FOR_EACH_ENTRY( async, &queue->queue, struct async, queue_entry ) if (async->status == STATUS_PENDING) return (struct async *)grab_object( async ); return NULL; } diff --git a/server/file.h b/server/file.h index 506ef17..0633b87 100644 --- a/server/file.h +++ b/server/file.h @@ -185,7 +185,6 @@ extern obj_handle_t async_handoff( struct async *async, int success, data_size_t extern void queue_async( struct async_queue *queue, struct async *async ); extern void async_set_timeout( struct async *async, timeout_t timeout, unsigned int status ); extern void async_set_result( struct object *obj, unsigned int status, apc_param_t total ); -extern int async_queued( struct async_queue *queue ); extern int async_waiting( struct async_queue *queue ); extern void async_terminate( struct async *async, unsigned int status ); extern void async_wake_up( struct async_queue *queue, unsigned int status ); @@ -202,6 +201,12 @@ static inline void init_async_queue( struct async_queue *queue ) list_init( &queue->queue ); } +static inline int async_queued( struct async_queue *queue ) +{ + return !list_empty( &queue->queue ); +} + + /* access rights that require Unix read permission */ #define FILE_UNIX_READ_ACCESS (FILE_READ_DATA|FILE_READ_ATTRIBUTES|FILE_READ_EA)

1 0

Jacek Caban : server: Make fd_queue_async infallible.
by Alexandre Julliard 05 Jul '17

05 Jul '17

Module: wine Branch: master Commit: 7b33613fc4d74a5d13629f20e4b818fc8000a115 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b33613fc4d74a5d13629f20e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 4 15:26:35 2017 +0200 server: Make fd_queue_async infallible. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/change.c | 4 ++-- server/device.c | 2 +- server/fd.c | 6 +++--- server/file.h | 2 +- server/mailslot.c | 10 ++++------ server/named_pipe.c | 16 ++++++---------- server/serial.c | 8 +++----- 7 files changed, 20 insertions(+), 28 deletions(-) diff --git a/server/change.c b/server/change.c index 88423fe..4dd7933 100644 --- a/server/change.c +++ b/server/change.c @@ -1247,7 +1247,7 @@ DECL_HANDLER(read_directory_changes) /* requests don't timeout */ if (!(async = create_async( dir->fd, current, &req->async, NULL ))) goto end; - if (!fd_queue_async( dir->fd, async, ASYNC_TYPE_WAIT )) goto end; + fd_queue_async( dir->fd, async, ASYNC_TYPE_WAIT ); /* assign it once */ if (!dir->filter) @@ -1269,8 +1269,8 @@ DECL_HANDLER(read_directory_changes) set_error(STATUS_PENDING); + release_object( async ); end: - if (async) release_object( async ); release_object( dir ); } diff --git a/server/device.c b/server/device.c index fc5bcbe..0443185 100644 --- a/server/device.c +++ b/server/device.c @@ -464,7 +464,7 @@ static void set_file_user_ptr( struct device_file *file, client_ptr_t ptr ) /* queue an irp to the device */ static int queue_irp( struct device_file *file, struct irp_call *irp, struct async *async ) { - if (!fd_queue_async( file->fd, async, ASYNC_TYPE_WAIT )) return 0; + fd_queue_async( file->fd, async, ASYNC_TYPE_WAIT ); irp->async = (struct async *)grab_object( async ); add_irp_to_queue( file, irp, current ); diff --git a/server/fd.c b/server/fd.c index 4a746c9..9322e2c 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2030,7 +2030,7 @@ void default_poll_event( struct fd *fd, int event ) else if (!fd->inode) set_fd_events( fd, fd->fd_ops->get_poll_events( fd ) ); } -int fd_queue_async( struct fd *fd, struct async *async, int type ) +void fd_queue_async( struct fd *fd, struct async *async, int type ) { struct async_queue *queue; @@ -2059,7 +2059,6 @@ int fd_queue_async( struct fd *fd, struct async *async, int type ) else /* regular files are always ready for read and write */ async_wake_up( queue, STATUS_ALERTED ); } - return 1; } void fd_async_wake_up( struct fd *fd, int type, unsigned int status ) @@ -2092,7 +2091,8 @@ void no_fd_queue_async( struct fd *fd, struct async *async, int type, int count void default_fd_queue_async( struct fd *fd, struct async *async, int type, int count ) { - if (fd_queue_async( fd, async, type )) set_error( STATUS_PENDING ); + fd_queue_async( fd, async, type ); + set_error( STATUS_PENDING ); } /* default reselect_async() fd routine */ diff --git a/server/file.h b/server/file.h index 0633b87..fa41654 100644 --- a/server/file.h +++ b/server/file.h @@ -102,7 +102,7 @@ extern int default_fd_signaled( struct object *obj, struct wait_queue_entry *ent extern unsigned int default_fd_map_access( struct object *obj, unsigned int access ); extern int default_fd_get_poll_events( struct fd *fd ); extern void default_poll_event( struct fd *fd, int event ); -extern int fd_queue_async( struct fd *fd, struct async *async, int type ); +extern void fd_queue_async( struct fd *fd, struct async *async, int type ); extern void fd_async_wake_up( struct fd *fd, int type, unsigned int status ); extern void fd_reselect_async( struct fd *fd, struct async_queue *queue ); extern int no_fd_read( struct fd *fd, struct async *async, file_pos_t pos ); diff --git a/server/mailslot.c b/server/mailslot.c index 643577c..d7affa5 100644 --- a/server/mailslot.c +++ b/server/mailslot.c @@ -331,12 +331,10 @@ static void mailslot_queue_async( struct fd *fd, struct async *async, int type, assert(mailslot->obj.ops == &mailslot_ops); - if (fd_queue_async( fd, async, type )) - { - async_set_timeout( async, mailslot->read_timeout ? mailslot->read_timeout : -1, - STATUS_IO_TIMEOUT ); - set_error( STATUS_PENDING ); - } + fd_queue_async( fd, async, type ); + async_set_timeout( async, mailslot->read_timeout ? mailslot->read_timeout : -1, + STATUS_IO_TIMEOUT ); + set_error( STATUS_PENDING ); } static void mailslot_device_dump( struct object *obj, int verbose ) diff --git a/server/named_pipe.c b/server/named_pipe.c index 0be0fcb..80363cb 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -653,8 +653,7 @@ static int pipe_end_flush( struct pipe_end *pipe_end, struct async *async ) if (use_server_io( pipe_end ) && (!pipe_end->connection || list_empty( &pipe_end->connection->message_queue ))) return 1; - if (!fd_queue_async( pipe_end->fd, async, ASYNC_TYPE_WAIT )) return 0; - + fd_queue_async( pipe_end->fd, async, ASYNC_TYPE_WAIT ); set_error( STATUS_PENDING ); return 1; } @@ -933,14 +932,11 @@ static int pipe_server_ioctl( struct fd *fd, ioctl_code_t code, struct async *as { case ps_idle_server: case ps_wait_connect: - if (fd_queue_async( server->ioctl_fd, async, ASYNC_TYPE_WAIT )) - { - set_server_state( server, ps_wait_open ); - async_wake_up( &server->pipe->waiters, STATUS_SUCCESS ); - set_error( STATUS_PENDING ); - return 1; - } - break; + fd_queue_async( server->ioctl_fd, async, ASYNC_TYPE_WAIT ); + set_server_state( server, ps_wait_open ); + async_wake_up( &server->pipe->waiters, STATUS_SUCCESS ); + set_error( STATUS_PENDING ); + return 1; case ps_connected_server: set_error( STATUS_PIPE_CONNECTED ); break; diff --git a/server/serial.c b/server/serial.c index 396ca22..85dd104 100644 --- a/server/serial.c +++ b/server/serial.c @@ -244,11 +244,9 @@ static void serial_queue_async( struct fd *fd, struct async *async, int type, in break; } - if (fd_queue_async( fd, async, type )) - { - if (timeout) async_set_timeout( async, timeout * -10000, STATUS_TIMEOUT ); - set_error( STATUS_PENDING ); - } + fd_queue_async( fd, async, type ); + if (timeout) async_set_timeout( async, timeout * -10000, STATUS_TIMEOUT ); + set_error( STATUS_PENDING ); } static void serial_read_timeout( void *arg )

1 0

Rosanne DiMesio : Remove inactive user check
by Jeremy Newman 05 Jul '17

05 Jul '17

Module: appdb Branch: master Commit: 3abe0426ce6be3b6190a53ac4767150e3b9e4fe8 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=3abe0426ce6be3b6190a53ac… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Wed Jul 5 13:30:29 2017 -0500 Remove inactive user check Fixes bug 19201. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- cron/cleanup.php | 121 +------------------------------------------------------ include/user.php | 44 -------------------- 2 files changed, 1 insertion(+), 164 deletions(-) diff --git a/cron/cleanup.php b/cron/cleanup.php index 4be3b9b..4f44660 100644 --- a/cron/cleanup.php +++ b/cron/cleanup.php @@ -11,7 +11,7 @@ require_once(BASE."include/mail.php"); $sEmailSubject = "[Cron maintenance] - "; -inactiveUserCheck(); +notifyAdminsOfCleanupStart(); /* check to see if there are orphaned versions in the database */ orphanVersionCheck(); @@ -34,102 +34,6 @@ cleanupVotes(); /* Updates the rating info for all versions based on test results */ //updateRatings(); -/* - * Warn users that have been inactive for some number of months - * If it has been some period of time since the user was warned - * the user is deleted if they don't have any pending appdb data - */ -function inactiveUserCheck() -{ - $usersWarned = 0; - $usersUnwarnedWithData = 0; /* users we would normally warn but who have data */ - $usersDeleted = 0; - $usersWithData = 0; /* users marked for deletion that have data */ - - notifyAdminsOfCleanupStart(); - - /* users inactive for 6 months that haven't been warned already */ - $hUsersToWarn = unwarnedAndInactiveSince(6); - if($hUsersToWarn) - { - while($oRow = query_fetch_object($hUsersToWarn)) - { - $oUser = new User($oRow->userid); - - /* if we get back true the user was warned and flagged as being warned */ - /* if we get back false we didn't warn the user and didn't flag the user as warned */ - /* because they have data associated with their account */ - if($oUser->warnForInactivity()) - { - $usersWarned++; - } else - { - $usersUnwarnedWithData++; - } - } - } - - /* warned >= 1 month ago */ - $hUsersToDelete = warnedSince(1); - if($hUsersToDelete) - { - while($oRow = query_fetch_object($hUsersToDelete)) - { - $oUser = new User($oRow->userid); - if(!$oUser->hasDataAssociated()) - { - $usersDeleted++; - deleteUser($oRow->userid); - } else - { - /* is the user a maintainer? if so remove their maintainer privileges */ - if($oUser->isMaintainer()) - { - Maintainer::deleteMaintainer($oUser); - } - - $usersWithData++; - } - } - } - - notifyAdminsOfCleanupExecution($usersWarned, $usersUnwarnedWithData, $usersDeleted, $usersWithData); -} - -/* Users that are unwarned and inactive since $iMonths */ -function unwarnedAndInactiveSince($iMonths) -{ - $sQuery = "SELECT userid FROM user_list WHERE DATE_SUB(CURDATE(),INTERVAL $iMonths MONTH) >= stamp AND inactivity_warned='false'"; - $hResult = query_appdb($sQuery); - return $hResult; -} - -/* users that were warned at least $iMonths ago */ -function warnedSince($iMonths) -{ - $sQuery = "SELECT userid FROM user_list WHERE DATE_SUB(CURDATE(),INTERVAL $iMonths MONTH) >= inactivity_warn_stamp "; - $sQuery .= "AND inactivity_warned='true'"; - $hResult = query_appdb($sQuery); - return $hResult; -} - -function deleteUser($iUserId) -{ - $oUser = new User($iUserId); - warnUserDeleted($oUser->sEmail); - $oUser->delete(); - echo "user ".$oUser->sEmail." deleted.\n"; -} - -function warnUserDeleted($sEmail) -{ - $sSubject = "Warning: account removed"; - $sMsg = "You didn't log in in the past seven months to the AppDB.\r\n"; - $sMsg .= "As you don't have any data associated to your account we have removed it.\r\n"; - $sMsg .= "Please feel free to recreate an account anytime.\r\n"; - - mail_appdb($sEmail, $sSubject, $sMsg); -} function notifyAdminsOfCleanupStart() { @@ -142,29 +46,6 @@ function notifyAdminsOfCleanupStart() mail_appdb($sEmail, $sSubject, $sMsg); } -/* email all admins that the appdb cleanup script is executing */ -/* so we admins have some visibility into the background cleanup */ -/* events of the appdb */ -function notifyAdminsOfCleanupExecution($usersWarned, $usersUnwarnedWithData, $usersDeleted, $usersWithData) -{ - global $sEmailSubject; - - $warnedUsers = User::get_inactive_users_pending_deletion(); - - $sSubject = $sEmailSubject."Inactive users\r\n"; - $sMsg = "Appdb inactive users cleanup executed.\r\n"; - $sMsg .= "Status\r\n"; - $sMsg .= "--------------------------\r\n"; - $sMsg .= "Users warned:".$usersWarned."\r\n"; - $sMsg .= "Users we would warn, but don't because they have data associated:".$usersUnwarnedWithData."\r\n"; - $sMsg .= "Warned users pending deletion:".$warnedUsers."\r\n"; - $sMsg .= "Users deleted:".$usersDeleted."\r\n"; - $sMsg .= "Users pending deletion but have appdb data:".$usersWithData."\r\n"; - $sEmail = User::get_notify_email_address_list(null, null); /* get list admins */ - if($sEmail) - mail_appdb($sEmail, $sSubject, $sMsg); -} - /* check for and report orphaned versions in the database */ /* we don't report anything if no orphans are found */ function orphanVersionCheck() diff --git a/include/user.php b/include/user.php index 2d62ea5..073f6e7 100644 --- a/include/user.php +++ b/include/user.php @@ -413,38 +413,6 @@ class User { return false; } - /* warn the user that their account has been marked as inactive */ - function warnForInactivity() - { - /* we don't want to warn users that have data associated with them */ - if($this->hasDataAssociated()) - { - return false; - } - - if($this->isMaintainer()) - { - $sSubject = "Warning: inactivity detected"; - $sMsg = "You didn't log in in the past six months to the AppDB.\r\n"; - $sMsg .= "As a maintainer we would be pleased to see you once in a while.\r\n"; - $sMsg .= "Please log in or you will lose your maintainer's abilities in one month.\r\n"; - } else - { - $sSubject = "Warning: inactivity detected"; - $sMsg = "You didn't log in in the past six months to the AppDB.\r\n"; - $sMsg .= "Please log in or your account will automatically be deleted in one month.\r\n"; - } - $sMsg .= APPDB_ROOT."account.php?sCmd=login\r\n"; - - mail_appdb($this->sEmail, $sSubject, $sMsg); - - /* mark this user as being inactive and set the appropriate timestamp */ - $sQuery = "update user_list set inactivity_warned='true', inactivity_warn_stamp=NOW() where userid='?'"; - query_parameters($sQuery, $this->iUserId); - - return true; - } - /** * Creates a new random password. @@ -502,18 +470,6 @@ class User { } /** - * Get the count of users who have been warned for inactivity and are - * pending deletion after the X month grace period - */ - public static function get_inactive_users_pending_deletion() - { - /* retrieve the number of users that have been warned and are pending deletion */ - $hResult = query_parameters("select count(*) as count from user_list where inactivity_warned = 'true'"); - $oRow = query_fetch_object($hResult); - return $oRow->count; - } - - /** * Get the email address of people to notify for this appId and versionId. */ public static function get_notify_email_address_list($iAppId = null, $iVersionId = null)

1 0

Alistair Leslie-Hughes : iphlpapi/tests: Use standard wine_dbgstr_longlong.
by Alexandre Julliard 04 Jul '17

04 Jul '17

Module: wine Branch: master Commit: 3548b25108ce3fbc018c3ab8ac3e274e8f11d0af URL: http://source.winehq.org/git/wine.git/?a=commit;h=3548b25108ce3fbc018c3ab8a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jul 3 22:29:10 2017 +0000 iphlpapi/tests: Use standard wine_dbgstr_longlong. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/tests/iphlpapi.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index d8c319e..dd0cb90 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -167,16 +167,6 @@ static const char *ntoa( DWORD ip ) return buffer; } -static inline const char* debugstr_longlong(ULONGLONG ll) -{ - static char string[17]; - if (sizeof(ll) > sizeof(unsigned long) && ll >> 32) - sprintf(string, "%lx%08lx", (unsigned long)(ll >> 32), (unsigned long)ll); - else - sprintf(string, "%lx", (unsigned long)ll); - return string; -} - /* still-to-be-tested 98-only functions: GetUniDirectionalAdapterInfo @@ -1513,8 +1503,8 @@ static void test_GetAdaptersAddresses(void) } if (S(U(*aa)).Length < sizeof(IP_ADAPTER_ADDRESSES_LH)) continue; - trace("TransmitLinkSpeed: %s\n", debugstr_longlong(aa->TransmitLinkSpeed)); - trace("ReceiveLinkSpeed: %s\n", debugstr_longlong(aa->ReceiveLinkSpeed)); + trace("TransmitLinkSpeed: %s\n", wine_dbgstr_longlong(aa->TransmitLinkSpeed)); + trace("ReceiveLinkSpeed: %s\n", wine_dbgstr_longlong(aa->ReceiveLinkSpeed)); trace("FirstWinsServerAddress:%p\n", aa->FirstWinsServerAddress); trace("FirstGatewayAddress: %p\n", aa->FirstGatewayAddress); trace("Ipv4Metric: %u\n", aa->Ipv4Metric);

1 0

Alistair Leslie-Hughes : quartz/tests: Use standard wine_dbgstr_longlong.
by Alexandre Julliard 04 Jul '17

04 Jul '17

Module: wine Branch: master Commit: 1234ae80240a2c339cf8064352c18d079adb8063 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1234ae80240a2c339cf806435… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jul 3 22:29:37 2017 +0000 quartz/tests: Use standard wine_dbgstr_longlong. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index eed7872..a895071 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -581,21 +581,21 @@ static void test_mediacontrol(void) pos = 0xdeadbeef; hr = IMediaSeeking_ConvertTimeFormat(seeking, &pos, NULL, 0x123456789a, NULL); ok(hr == S_OK, "ConvertTimeFormat failed: %08x\n", hr); - ok(pos == 0x123456789a, "ConvertTimeFormat: expected 123456789a, got (%x%08x)\n", (DWORD)(pos >> 32), (DWORD)pos); + ok(pos == 0x123456789a, "ConvertTimeFormat: expected 123456789a, got (%s)\n", wine_dbgstr_longlong(pos)); pos = 0xdeadbeef; hr = IMediaSeeking_ConvertTimeFormat(seeking, &pos, &TIME_FORMAT_MEDIA_TIME, 0x123456789a, NULL); ok(hr == S_OK, "ConvertTimeFormat failed: %08x\n", hr); - ok(pos == 0x123456789a, "ConvertTimeFormat: expected 123456789a, got (%x%08x)\n", (DWORD)(pos >> 32), (DWORD)pos); + ok(pos == 0x123456789a, "ConvertTimeFormat: expected 123456789a, got (%s)\n", wine_dbgstr_longlong(pos)); pos = 0xdeadbeef; hr = IMediaSeeking_ConvertTimeFormat(seeking, &pos, NULL, 0x123456789a, &TIME_FORMAT_MEDIA_TIME); ok(hr == S_OK, "ConvertTimeFormat failed: %08x\n", hr); - ok(pos == 0x123456789a, "ConvertTimeFormat: expected 123456789a, got (%x%08x)\n", (DWORD)(pos >> 32), (DWORD)pos); + ok(pos == 0x123456789a, "ConvertTimeFormat: expected 123456789a, got (%s)\n", wine_dbgstr_longlong(pos)); hr = IMediaSeeking_GetCurrentPosition(seeking, &pos); ok(hr == S_OK, "GetCurrentPosition failed: %08x\n", hr); - ok(pos == 0, "Position != 0 (%x%08x)\n", (DWORD)(pos >> 32), (DWORD)pos); + ok(pos == 0, "Position != 0 (%s)\n", wine_dbgstr_longlong(pos)); hr = IMediaSeeking_SetPositions(seeking, NULL, AM_SEEKING_ReturnTime, NULL, AM_SEEKING_NoPositioning); ok(hr == S_OK, "SetPositions failed: %08x\n", hr); @@ -606,7 +606,7 @@ static void test_mediacontrol(void) pos = 0xdeadbeef; hr = IMediaSeeking_GetCurrentPosition(seeking, &pos); ok(hr == S_OK, "GetCurrentPosition failed: %08x\n", hr); - ok(pos == 0, "Position != 0 (%x%08x)\n", (DWORD)(pos >> 32), (DWORD)pos); + ok(pos == 0, "Position != 0 (%s)\n", wine_dbgstr_longlong(pos)); hr = IMediaControl_GetState(control, 1000, NULL); ok(hr == E_POINTER, "GetState expected %08x, got %08x\n", E_POINTER, hr);

1 0

Alistair Leslie-Hughes : apphelp/tests: Use standard wine_dbgstr_longlong.
by Alexandre Julliard 04 Jul '17

04 Jul '17

Module: wine Branch: master Commit: 97b6221c716ee8793a6b6599a8a9ef238ab7eaa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97b6221c716ee8793a6b6599a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jul 3 22:29:55 2017 +0000 apphelp/tests: Use standard wine_dbgstr_longlong. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/apphelp/tests/apphelp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/apphelp/tests/apphelp.c b/dlls/apphelp/tests/apphelp.c index 8b264e9..81104d2 100644 --- a/dlls/apphelp/tests/apphelp.c +++ b/dlls/apphelp/tests/apphelp.c @@ -64,14 +64,14 @@ static void test_ApphelpCheckShellObject(void) flags = 0xdeadbeef; SetLastError(0xdeadbeef); res = pApphelpCheckShellObject(objects[i], FALSE, &flags); - ok(res && (flags == 0), "%s 0: got %d and 0x%x%08x with 0x%x (expected TRUE and 0)\n", - wine_dbgstr_guid(objects[i]), res, (ULONG)(flags >> 32), (ULONG)flags, GetLastError()); + ok(res && (flags == 0), "%s 0: got %d and %s with 0x%x (expected TRUE and 0)\n", + wine_dbgstr_guid(objects[i]), res, wine_dbgstr_longlong(flags), GetLastError()); flags = 0xdeadbeef; SetLastError(0xdeadbeef); res = pApphelpCheckShellObject(objects[i], TRUE, &flags); - ok(res && (flags == 0), "%s 1: got %d and 0x%x%08x with 0x%x (expected TRUE and 0)\n", - wine_dbgstr_guid(objects[i]), res, (ULONG)(flags >> 32), (ULONG)flags, GetLastError()); + ok(res && (flags == 0), "%s 1: got %d and %s with 0x%x (expected TRUE and 0)\n", + wine_dbgstr_guid(objects[i]), res, wine_dbgstr_longlong(flags), GetLastError()); } @@ -86,7 +86,7 @@ static void test_ApphelpCheckShellObject(void) flags = 0xdeadbeef; SetLastError(0xdeadbeef); res = pApphelpCheckShellObject(NULL, FALSE, &flags); - trace("NULL as CLSID*: got %d and 0x%x%08x with 0x%x\n", res, (ULONG)(flags >> 32), (ULONG)flags, GetLastError()); + trace("NULL as CLSID*: got %d and %s with 0x%x\n", res, wine_dbgstr_longlong(flags), GetLastError()); } }

1 0

Alistair Leslie-Hughes : shlwapi/tests: Use standard wine_dbgstr_longlong.
by Alexandre Julliard 04 Jul '17

04 Jul '17

Module: wine Branch: master Commit: ee778749e39813911fcae0698b53782fd3e099fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee778749e39813911fcae0698… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jul 3 22:30:02 2017 +0000 shlwapi/tests: Use standard wine_dbgstr_longlong. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/tests/string.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index f23ae3f..7f069a4 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -570,8 +570,8 @@ static void test_StrToInt64ExA(void) ok(!bRet || return_val != -1, "No result returned from '%s'\n", result->string); if (bRet) - ok(return_val == result->str_to_int64_ex, "converted '%s' wrong (%08x%08x)\n", - result->string, (DWORD)(return_val >> 32), (DWORD)return_val); + ok(return_val == result->str_to_int64_ex, "converted '%s' wrong (%s)\n", + result->string, wine_dbgstr_longlong(return_val)); result++; } @@ -583,8 +583,8 @@ static void test_StrToInt64ExA(void) ok(!bRet || return_val != -1, "No result returned from '%s'\n", result->string); if (bRet) - ok(return_val == result->str_to_int64_hex, "converted '%s' wrong (%08x%08x)\n", - result->string, (DWORD)(return_val >> 32), (DWORD)return_val); + ok(return_val == result->str_to_int64_hex, "converted '%s' wrong (%s)\n", + result->string, wine_dbgstr_longlong(return_val)); result++; } } @@ -610,8 +610,8 @@ static void test_StrToInt64ExW(void) ok(!bRet || return_val != -1, "No result returned from '%s'\n", result->string); if (bRet) - ok(return_val == result->str_to_int64_ex, "converted '%s' wrong (%08x%08x)\n", - result->string, (DWORD)(return_val >> 32), (DWORD)return_val); + ok(return_val == result->str_to_int64_ex, "converted '%s' wrong (%s)\n", + result->string, wine_dbgstr_longlong(return_val)); result++; } @@ -624,8 +624,8 @@ static void test_StrToInt64ExW(void) ok(!bRet || return_val != -1, "No result returned from '%s'\n", result->string); if (bRet) - ok(return_val == result->str_to_int64_hex, "converted '%s' wrong (%08x%08x)\n", - result->string, (DWORD)(return_val >> 32), (DWORD)return_val); + ok(return_val == result->str_to_int64_hex, "converted '%s' wrong (%s)\n", + result->string, wine_dbgstr_longlong(return_val)); result++; } } @@ -672,8 +672,8 @@ static void test_StrFormatByteSize64A(void) pStrFormatByteSize64A(result->value, szBuff, 256); ok(!strcmp(result->byte_size_64, szBuff), - "Formatted %x%08x wrong: got %s, expected %s\n", - (LONG)(result->value >> 32), (LONG)result->value, szBuff, result->byte_size_64); + "Formatted %s wrong: got %s, expected %s\n", + wine_dbgstr_longlong(result->value), szBuff, result->byte_size_64); result++; } @@ -696,8 +696,8 @@ static void test_StrFormatKBSizeW(void) pStrFormatKBSizeW(result->value, szBuffW, 256); WideCharToMultiByte(CP_ACP,0,szBuffW,-1,szBuff,sizeof(szBuff)/sizeof(WCHAR),NULL,NULL); - ok(!strcmp(result->kb_size, szBuff), "Formatted %x%08x wrong: got %s, expected %s\n", - (LONG)(result->value >> 32), (LONG)result->value, szBuff, result->kb_size); + ok(!strcmp(result->kb_size, szBuff), "Formatted %s wrong: got %s, expected %s\n", + wine_dbgstr_longlong(result->value), szBuff, result->kb_size); result++; } } @@ -721,8 +721,8 @@ static void test_StrFormatKBSizeA(void) * and does not correctly handle extremely large values. */ ok(!strcmp(result->kb_size, szBuff) || (result->kb_size_broken && !strcmp(result->kb_size2, szBuff)), - "Formatted %x%08x wrong: got %s, expected %s\n", - (LONG)(result->value >> 32), (LONG)result->value, szBuff, result->kb_size); + "Formatted %s wrong: got %s, expected %s\n", + wine_dbgstr_longlong(result->value), szBuff, result->kb_size); result++; } }

1 0

Alistair Leslie-Hughes : wmiutils/tests: Use standard wine_dbgstr_longlong.
by Alexandre Julliard 04 Jul '17

04 Jul '17

Module: wine Branch: master Commit: 2c0a3b2a6c5cf32c244493f8eefea752575c01ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c0a3b2a6c5cf32c244493f8e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jul 3 22:29:44 2017 +0000 wmiutils/tests: Use standard wine_dbgstr_longlong. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmiutils/tests/path.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/wmiutils/tests/path.c b/dlls/wmiutils/tests/path.c index 99907a3..3709748 100644 --- a/dlls/wmiutils/tests/path.c +++ b/dlls/wmiutils/tests/path.c @@ -443,7 +443,7 @@ static void test_IWbemPath_SetClassName(void) ok( flags == (WBEMPATH_INFO_ANON_LOCAL_MACHINE | WBEMPATH_INFO_IS_CLASS_REF | WBEMPATH_INFO_HAS_SUBSCOPES | WBEMPATH_INFO_V2_COMPLIANT | WBEMPATH_INFO_CIM_COMPLIANT), - "got %lx%08lx\n", (unsigned long)(flags >> 32), (unsigned long)flags ); + "got %s\n", wine_dbgstr_longlong(flags) ); IWbemPath_Release( path ); } @@ -514,7 +514,7 @@ static void test_IWbemPath_GetInfo(void) hr = IWbemPath_GetInfo( path, 0, &resp ); ok( hr == S_OK, "got %08x\n", hr ); ok( resp == (WBEMPATH_INFO_ANON_LOCAL_MACHINE | WBEMPATH_INFO_SERVER_NAMESPACE_ONLY), - "got %lx%08lx\n", (unsigned long)(resp >> 32), (unsigned long)resp ); + "got %s\n", wine_dbgstr_longlong(resp) ); hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path17 ); ok( hr == S_OK, "got %08x\n", hr ); @@ -531,7 +531,7 @@ static void test_IWbemPath_GetInfo(void) ok( resp == (WBEMPATH_INFO_ANON_LOCAL_MACHINE | WBEMPATH_INFO_IS_INST_REF | WBEMPATH_INFO_HAS_SUBSCOPES | WBEMPATH_INFO_V2_COMPLIANT | WBEMPATH_INFO_CIM_COMPLIANT | WBEMPATH_INFO_PATH_HAD_SERVER), - "got %lx%08lx\n", (unsigned long)(resp >> 32), (unsigned long)resp ); + "got %s\n", wine_dbgstr_longlong(resp) ); IWbemPath_Release( path ); if (!(path = create_path())) return; @@ -545,7 +545,7 @@ static void test_IWbemPath_GetInfo(void) ok( resp == (WBEMPATH_INFO_ANON_LOCAL_MACHINE | WBEMPATH_INFO_IS_CLASS_REF | WBEMPATH_INFO_HAS_SUBSCOPES | WBEMPATH_INFO_V2_COMPLIANT | WBEMPATH_INFO_CIM_COMPLIANT), - "got %lx%08lx\n", (unsigned long)(resp >> 32), (unsigned long)resp ); + "got %s\n", wine_dbgstr_longlong(resp) ); hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path1 ); ok( hr == S_OK, "got %08x\n", hr ); @@ -554,7 +554,7 @@ static void test_IWbemPath_GetInfo(void) hr = IWbemPath_GetInfo( path, 0, &resp ); ok( hr == S_OK, "got %08x\n", hr ); ok( resp == (WBEMPATH_INFO_ANON_LOCAL_MACHINE | WBEMPATH_INFO_SERVER_NAMESPACE_ONLY), - "got %lx%08lx\n", (unsigned long)(resp >> 32), (unsigned long)resp ); + "got %s\n", wine_dbgstr_longlong(resp) ); IWbemPath_Release( path ); } @@ -596,7 +596,7 @@ static void test_IWbemPath_SetServer(void) ok( flags == (WBEMPATH_INFO_HAS_MACHINE_NAME | WBEMPATH_INFO_V1_COMPLIANT | WBEMPATH_INFO_V2_COMPLIANT | WBEMPATH_INFO_CIM_COMPLIANT | WBEMPATH_INFO_SERVER_NAMESPACE_ONLY | WBEMPATH_INFO_PATH_HAD_SERVER), - "got %lx%08lx\n", (unsigned long)(flags >> 32), (unsigned long)flags ); + "got %s\n", wine_dbgstr_longlong(flags) ); hr = IWbemPath_SetServer( path, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -609,7 +609,7 @@ static void test_IWbemPath_SetServer(void) hr = IWbemPath_GetInfo( path, 0, &flags ); ok( hr == S_OK, "got %08x\n", hr ); ok( flags == (WBEMPATH_INFO_ANON_LOCAL_MACHINE | WBEMPATH_INFO_SERVER_NAMESPACE_ONLY), - "got %lx%08lx\n", (unsigned long)(flags >> 32), (unsigned long)flags ); + "got %s\n", wine_dbgstr_longlong(flags) ); IWbemPath_Release( path ); } @@ -694,7 +694,7 @@ static void test_IWbemPath_RemoveAllNamespaces(void) hr = IWbemPath_GetInfo( path, 0, &flags ); ok( hr == S_OK, "got %08x\n", hr ); ok( flags == expected_flags, - "got %lx%08lx\n", (unsigned long)(flags >> 32), (unsigned long)flags ); + "got %s\n", wine_dbgstr_longlong(flags) ); hr = IWbemPath_RemoveAllNamespaces( path ); ok( hr == S_OK, "got %08x\n", hr ); @@ -703,7 +703,7 @@ static void test_IWbemPath_RemoveAllNamespaces(void) hr = IWbemPath_GetInfo( path, 0, &flags ); ok( hr == S_OK, "got %08x\n", hr ); ok( flags == expected_flags, - "got %lx%08lx\n", (unsigned long)(flags >> 32), (unsigned long)flags ); + "got %s\n", wine_dbgstr_longlong(flags) ); buf[0] = 0; len = sizeof(buf) / sizeof(buf[0]); @@ -738,7 +738,7 @@ static void test_IWbemPath_RemoveNamespaceAt(void) hr = IWbemPath_GetInfo( path, 0, &flags ); ok( hr == S_OK, "got %08x\n", hr ); ok( flags == expected_flags, - "got %lx%08lx\n", (unsigned long)(flags >> 32), (unsigned long)flags ); + "got %s\n", wine_dbgstr_longlong(flags) ); count = 0xdeadbeef; hr = IWbemPath_GetNamespaceCount( path, &count ); @@ -752,7 +752,7 @@ static void test_IWbemPath_RemoveNamespaceAt(void) hr = IWbemPath_GetInfo( path, 0, &flags ); ok( hr == S_OK, "got %08x\n", hr ); ok( flags == expected_flags, - "got %lx%08lx\n", (unsigned long)(flags >> 32), (unsigned long)flags ); + "got %s\n", wine_dbgstr_longlong(flags) ); count = 0xdeadbeef; hr = IWbemPath_GetNamespaceCount( path, &count ); @@ -773,7 +773,7 @@ static void test_IWbemPath_RemoveNamespaceAt(void) hr = IWbemPath_GetInfo( path, 0, &flags ); ok( hr == S_OK, "got %08x\n", hr ); ok( flags == expected_flags, - "got %lx%08lx\n", (unsigned long)(flags >> 32), (unsigned long)flags ); + "got %s\n", wine_dbgstr_longlong(flags) ); count = 0xdeadbeef; hr = IWbemPath_GetNamespaceCount( path, &count ); @@ -822,7 +822,7 @@ static void test_IWbemPath_SetNamespaceAt(void) hr = IWbemPath_GetInfo( path, 0, &flags ); ok( hr == S_OK, "got %08x\n", hr ); ok( flags == expected_flags, - "got %lx%08lx\n", (unsigned long)(flags >> 32), (unsigned long)flags ); + "got %s\n", wine_dbgstr_longlong(flags) ); buf[0] = 0; len = sizeof(buf) / sizeof(buf[0]); @@ -838,7 +838,7 @@ static void test_IWbemPath_SetNamespaceAt(void) hr = IWbemPath_GetInfo( path, 0, &flags ); ok( hr == S_OK, "got %08x\n", hr ); ok( flags == expected_flags, - "got %lx%08lx\n", (unsigned long)(flags >> 32), (unsigned long)flags ); + "got %s\n", wine_dbgstr_longlong(flags) ); count = 0xdeadbeef; hr = IWbemPath_GetNamespaceCount( path, &count );

1 0