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

Alistair Leslie-Hughes : shell32/tests: Use standard wine_dbgstr_longlong.
by Alexandre Julliard July 5, 2017

July 5, 2017

Module: wine Branch: master Commit: 771d3514e92d78d18aef6d9cb14b3cd2d09ad6cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=771d3514e92d78d18aef6d9cb… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jul 5 02:36:39 2017 +0000 shell32/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/shell32/tests/recyclebin.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/dlls/shell32/tests/recyclebin.c b/dlls/shell32/tests/recyclebin.c index a5ac1dc..50e262e 100644 --- a/dlls/shell32/tests/recyclebin.c +++ b/dlls/shell32/tests/recyclebin.c @@ -28,18 +28,6 @@ static int (WINAPI *pSHQueryRecycleBinA)(LPCSTR,LPSHQUERYRBINFO); static int (WINAPI *pSHFileOperationA)(LPSHFILEOPSTRUCTA); -static char int64_buffer[65]; -/* Note: This function uses a single buffer for the return value.*/ -static const char* str_from_int64(__int64 ll) -{ - - if (sizeof(ll) > sizeof(unsigned long) && ll >> 32) - sprintf(int64_buffer,"%lx%08lx",(unsigned long)(ll >> 32),(unsigned long)ll); - else - sprintf(int64_buffer,"%lx",(unsigned long)ll); - return int64_buffer; -} - static void setup_pointers(void) { HMODULE hshell32 = GetModuleHandleA("shell32.dll"); @@ -88,8 +76,8 @@ static void test_query_recyclebin(void) ok(!pSHFileOperationA(&shfo), "Deletion was not successful\n"); hr = pSHQueryRecycleBinA(buf,&info2); ok(hr == S_OK, "SHQueryRecycleBinA failed with error 0x%x\n", hr); - ok(info2.i64Size==info1.i64Size+written,"Expected recycle bin to have 0x%s bytes\n",str_from_int64(info1.i64Size+written)); - ok(info2.i64NumItems==info1.i64NumItems+1,"Expected recycle bin to have 0x%s items\n",str_from_int64(info1.i64NumItems+1)); + ok(info2.i64Size==info1.i64Size+written,"Expected recycle bin to have 0x%s bytes\n",wine_dbgstr_longlong(info1.i64Size+written)); + ok(info2.i64NumItems==info1.i64NumItems+1,"Expected recycle bin to have 0x%s items\n",wine_dbgstr_longlong(info1.i64NumItems+1)); }

1 0

Jacek Caban : server: Make fd_queue_async infallible.
by Alexandre Julliard July 5, 2017

July 5, 2017

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

Alistair Leslie-Hughes : webservices/tests: Use standard wine_dbgstr_longlong.
by Alexandre Julliard July 5, 2017

July 5, 2017

Module: wine Branch: master Commit: 75c0879826dbcf0b21b0c5a25c2b96f3a9d288e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75c0879826dbcf0b21b0c5a25… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jul 5 02:36:28 2017 +0000 webservices/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/webservices/tests/reader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index a62a069..66151ff 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -3546,7 +3546,7 @@ static void test_datetime(void) ok( hr == tests[i].hr, "%u: got %08x\n", i, hr ); if (hr == S_OK) { - ok( date.ticks == tests[i].ticks, "%u: got %x%08x\n", i, (ULONG)(date.ticks >> 32), (ULONG)date.ticks ); + ok( date.ticks == tests[i].ticks, "%u: got %s\n", i, wine_dbgstr_longlong(date.ticks) ); ok( date.format == tests[i].format, "%u: got %u\n", i, date.format ); } } @@ -3622,14 +3622,14 @@ static void test_WsFileTimeToDateTime(void) dt.format = 0xdeadbeef; hr = WsFileTimeToDateTime( &ft, &dt, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - ok( dt.ticks == 0x701ce1722770000, "got %x%08x\n", (ULONG)(dt.ticks >> 32), (ULONG)dt.ticks ); + ok( dt.ticks == 0x701ce1722770000, "got %s\n", wine_dbgstr_longlong(dt.ticks) ); ok( dt.format == WS_DATETIME_FORMAT_UTC, "got %u\n", dt.format ); ft.dwLowDateTime = 0xd1c03fff; ft.dwHighDateTime = 0x24c85a5e; hr = WsFileTimeToDateTime( &ft, &dt, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - ok( dt.ticks == 0x2bca2875f4373fff, "got %x%08x\n", (ULONG)(dt.ticks >> 32), (ULONG)dt.ticks ); + ok( dt.ticks == 0x2bca2875f4373fff, "got %s\n", wine_dbgstr_longlong(dt.ticks) ); ok( dt.format == WS_DATETIME_FORMAT_UTC, "got %u\n", dt.format ); ft.dwLowDateTime++; @@ -3734,7 +3734,7 @@ static void test_double(void) hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_DOUBLE_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val, sizeof(val), NULL ); ok( hr == tests[i].hr, "%u: got %08x\n", i, hr ); - if (hr == tests[i].hr) ok( val == tests[i].val, "%u: got %x%08x\n", i, (ULONG)(val >> 32), (ULONG)val ); + if (hr == tests[i].hr) ok( val == tests[i].val, "%u: got %s\n", i, wine_dbgstr_longlong(val) ); } WsFreeReader( reader );

1 0

Alistair Leslie-Hughes : pdh/tests: Use standard wine_dbgstr_longlong.
by Alexandre Julliard July 5, 2017

July 5, 2017

Module: wine Branch: master Commit: 39378faddf203ca3fc8121ab9bfb35fb637709d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39378faddf203ca3fc8121ab9… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jul 5 02:36:49 2017 +0000 pdh/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/pdh/tests/pdh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/pdh/tests/pdh.c b/dlls/pdh/tests/pdh.c index f492d5a..573bcc3 100644 --- a/dlls/pdh/tests/pdh.c +++ b/dlls/pdh/tests/pdh.c @@ -854,7 +854,7 @@ static void test_PdhCollectQueryDataEx(void) status = PdhGetFormattedCounterValue( counter, PDH_FMT_LARGE, NULL, &value ); ok(status == ERROR_SUCCESS, "PdhGetFormattedCounterValue failed 0x%08x\n", status); - trace( "uptime %x%08x\n", (DWORD)(U(value).largeValue >> 32), (DWORD)U(value).largeValue ); + trace( "uptime %s\n", wine_dbgstr_longlong(U(value).largeValue) ); } }

1 0

Rosanne DiMesio : Remove inactive user check
by Jeremy Newman July 5, 2017

July 5, 2017

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

Hugh McMaster : regedit: Do not remove lines beginning with '#' from the read buffer.
by Alexandre Julliard July 4, 2017

July 4, 2017

Module: wine Branch: master Commit: 5d8a1283f2037c0cb70377afc8fcad6896134fed URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d8a1283f2037c0cb70377afc… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jul 4 12:46:36 2017 +0000 regedit: Do not remove lines beginning with '#' from the read buffer. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 4 ++-- programs/regedit/tests/regedit.c | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index f13c21e..92c30e9 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -991,7 +991,7 @@ static WCHAR *get_lineA(FILE *fp) next = p + 1; if (*p == '\r' && *(p + 1) == '\n') next++; *p = 0; - if (*line == ';' || *line == '#') + if (*line == ';') { line = next; continue; @@ -1054,7 +1054,7 @@ static WCHAR *get_lineW(FILE *fp) next = p + 1; if (*p == '\r' && *(p + 1) == '\n') next++; *p = 0; - if (*line == ';' || *line == '#') + if (*line == ';') { line = next; continue; diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 61f136a..5e127de 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -909,7 +909,7 @@ static void test_invalid_import(void) verify_reg_nonexist(hkey, "Wine25c"); verify_reg_nonexist(hkey, "Wine25d"); verify_reg_nonexist(hkey, "Wine25e"); - todo_wine verify_reg(hkey, "Wine25f", REG_SZ, "Test value", 11, 0); + verify_reg(hkey, "Wine25f", REG_SZ, "Test value", 11, 0); verify_reg_nonexist(hkey, "Wine25g"); verify_reg_nonexist(hkey, "Wine25h"); verify_reg_nonexist(hkey, "Wine25i"); @@ -938,7 +938,7 @@ static void test_invalid_import(void) verify_reg_nonexist(hkey, "Wine26c"); verify_reg_nonexist(hkey, "Wine26d"); verify_reg_nonexist(hkey, "Wine26e"); - todo_wine verify_reg(hkey, "Wine26f", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg(hkey, "Wine26f", REG_DWORD, &dword, sizeof(dword), 0); verify_reg_nonexist(hkey, "Wine26g"); verify_reg_nonexist(hkey, "Wine26h"); verify_reg_nonexist(hkey, "Wine26i"); @@ -967,7 +967,7 @@ static void test_invalid_import(void) verify_reg_nonexist(hkey, "Wine27c"); verify_reg_nonexist(hkey, "Wine27d"); verify_reg_nonexist(hkey, "Wine27e"); - todo_wine verify_reg(hkey, "Wine27f", REG_EXPAND_SZ, "%PATH%", 7, 0); + verify_reg(hkey, "Wine27f", REG_EXPAND_SZ, "%PATH%", 7, 0); verify_reg_nonexist(hkey, "Wine27g"); verify_reg_nonexist(hkey, "Wine27h"); verify_reg_nonexist(hkey, "Wine27i"); @@ -994,10 +994,10 @@ static void test_invalid_import(void) "#comment\n" "@=\"Default value 3\"\n\n"); verify_reg_nonexist(hkey, "Wine28c"); - todo_wine verify_reg(hkey, NULL, REG_SZ, "Default value 3", 16, 0); + verify_reg(hkey, NULL, REG_SZ, "Default value 3", 16, 0); lr = RegDeleteValueW(hkey, NULL); - todo_wine ok(lr == ERROR_SUCCESS, "RegDeleteValue failed: %u\n", lr); + ok(lr == ERROR_SUCCESS, "RegDeleteValue failed: %u\n", lr); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -1326,7 +1326,7 @@ static void test_comments(void) "#comment\n" " 65,6e,\\;comment\n" " 61,74,69,6f,6e,00,00\n\n"); - todo_wine verify_reg_nonexist(hkey, "Wine29c"); + verify_reg_nonexist(hkey, "Wine29c"); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"

1 0

Hugh McMaster : regedit: Skip blank and whitespace-only lines during hex data concatenation.
by Alexandre Julliard July 4, 2017

July 4, 2017

Module: wine Branch: master Commit: e336c863597bb05a6de784fd6f26e7d3ca104b03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e336c863597bb05a6de784fd6… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jul 4 12:46:26 2017 +0000 regedit: Skip blank and whitespace-only lines during hex data concatenation. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 2 +- programs/regedit/tests/regedit.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index b933f03..f13c21e 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -896,7 +896,7 @@ static WCHAR *hex_multiline_state(struct parser *parser, WCHAR *pos) } while (*line == ' ' || *line == '\t') line++; - if (*line == ';') return line; + if (!*line || *line == ';') return line; if (!isxdigitW(*line)) goto invalid; diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index cd21b61..61f136a 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -911,7 +911,7 @@ static void test_invalid_import(void) verify_reg_nonexist(hkey, "Wine25e"); todo_wine verify_reg(hkey, "Wine25f", REG_SZ, "Test value", 11, 0); verify_reg_nonexist(hkey, "Wine25g"); - todo_wine verify_reg_nonexist(hkey, "Wine25h"); + verify_reg_nonexist(hkey, "Wine25h"); verify_reg_nonexist(hkey, "Wine25i"); verify_reg(hkey, "Wine25j", REG_SZ, "Test value", 11, 0); @@ -940,7 +940,7 @@ static void test_invalid_import(void) verify_reg_nonexist(hkey, "Wine26e"); todo_wine verify_reg(hkey, "Wine26f", REG_DWORD, &dword, sizeof(dword), 0); verify_reg_nonexist(hkey, "Wine26g"); - todo_wine verify_reg_nonexist(hkey, "Wine26h"); + verify_reg_nonexist(hkey, "Wine26h"); verify_reg_nonexist(hkey, "Wine26i"); verify_reg(hkey, "Wine26j", REG_DWORD, &dword, sizeof(dword), 0); @@ -969,7 +969,7 @@ static void test_invalid_import(void) verify_reg_nonexist(hkey, "Wine27e"); todo_wine verify_reg(hkey, "Wine27f", REG_EXPAND_SZ, "%PATH%", 7, 0); verify_reg_nonexist(hkey, "Wine27g"); - todo_wine verify_reg_nonexist(hkey, "Wine27h"); + verify_reg_nonexist(hkey, "Wine27h"); verify_reg_nonexist(hkey, "Wine27i"); verify_reg(hkey, "Wine27j", REG_EXPAND_SZ, "%PATH%", 7, 0); @@ -1004,7 +1004,7 @@ static void test_invalid_import(void) "\"Wine28d\"=hex(2):4c,69,6e,65,20,\\\n\n" "@=\"Default value 4\"\n\n"); verify_reg_nonexist(hkey, "Wine28d"); - todo_wine verify_reg_nonexist(hkey, NULL); + verify_reg_nonexist(hkey, NULL); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -1267,7 +1267,7 @@ static void test_comments(void) " 63,61,74,\\\n\n" " 65,6e,\\;comment\n\n" " 61,74,69,6f,6e,00,00\n\n"); - todo_wine verify_reg(hkey, "Multi-Line6", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + verify_reg(hkey, "Multi-Line6", REG_MULTI_SZ, "Line concatenation\0", 20, 0); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -1472,7 +1472,7 @@ static void test_import_with_whitespace(void) " 63,61,74,\\\n\n\n" " 65,6e,\\\n\n\n\n" " 61,74,69,6f,6e,00,00\n\n"); - todo_wine verify_reg(hkey, "Wine10a", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + verify_reg(hkey, "Wine10a", REG_MULTI_SZ, "Line concatenation\0", 20, 0); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -1481,7 +1481,7 @@ static void test_import_with_whitespace(void) " 63,61,74,\\\n\t\n\t\n" " 65,6e,\\\n\t \t\n\t \t\n\t \t\n" " 61,74,69,6f,6e,00,00\n\n"); - todo_wine verify_reg(hkey, "Wine10b", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + verify_reg(hkey, "Wine10b", REG_MULTI_SZ, "Line concatenation\0", 20, 0); lr = RegCloseKey(hkey); ok(lr == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", lr);

1 0

Hugh McMaster : regedit/tests: Test whether the "0x" prefix is valid when importing hex data.
by Alexandre Julliard July 4, 2017

July 4, 2017

Module: wine Branch: master Commit: 50fee455c4acee1d3d07a727d9bb23def6ed3a1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=50fee455c4acee1d3d07a727d… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jul 4 12:45:59 2017 +0000 regedit/tests: Test whether the "0x" prefix is valid when importing hex data. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index b6f1a2e..3a08ec0 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -455,7 +455,9 @@ static void test_basic_import(void) "\"Wine13f\"=hex(ffff):56,61,6c,75,65,00\n" "\"Wine13g\"=hex(7fffffff):56,61,6c,75,65,00\n" "\"Wine13h\"=hex(ffffffff):56,61,6c,75,65,00\n" - "\"Wine13i\"=hex(100000000):56,61,6c,75,65,00\n\n"); + "\"Wine13i\"=hex(100000000):56,61,6c,75,65,00\n" + "\"Wine13j\"=hex(0x2):56,61,6c,75,65,00\n" + "\"Wine13k\"=hex(x2):56,61,6c,75,65,00\n\n"); verify_reg(hkey, "Wine13a", REG_NONE, "Value", 6, 0); verify_reg(hkey, "Wine13b", 0x10, "Value", 6, 0); verify_reg(hkey, "Wine13c", 0x100, "Value", 6, 0); @@ -465,6 +467,8 @@ static void test_basic_import(void) verify_reg(hkey, "Wine13g", 0x7fffffff, "Value", 6, 0); verify_reg(hkey, "Wine13h", 0xffffffff, "Value", 6, 0); verify_reg_nonexist(hkey, "Wine13i"); + todo_wine verify_reg_nonexist(hkey, "Wine13j"); + verify_reg_nonexist(hkey, "Wine13k"); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"

1 0

Hugh McMaster : reg/tests: Test whether registry keys ending with trailing backslashes are imported and created.
by Alexandre Julliard July 4, 2017

July 4, 2017

Module: wine Branch: master Commit: c50a1d9431deb759d45a542b7ff3ac90bc941879 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c50a1d9431deb759d45a542b7… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jul 4 12:45:34 2017 +0000 reg/tests: Test whether registry keys ending with trailing backslashes are imported and created. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 316a3f6..0c17f37 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1645,6 +1645,48 @@ static void test_import(void) err = RegDeleteKeyA(hkey, "Subkey1d\t"); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1e\\]\n" + "\"Wine\"=\"Test value\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(hkey, "Subkey1e\\"); + todo_wine verify_key(hkey, "Subkey1e"); + err = RegOpenKeyExA(hkey, "Subkey1e", 0, KEY_READ, &subkey); + todo_wine ok(err == ERROR_SUCCESS, "RegOpenKeyExA failed: got %u, expected 0\n", err); + todo_wine verify_reg(subkey, "Wine", REG_SZ, "Test value", 11, 0); + RegCloseKey(subkey); + err = RegDeleteKeyA(hkey, "Subkey1e"); + todo_wine ok(err == ERROR_SUCCESS, "RegDeleteKeyA failed: got %u, expected 0\n", err); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1f\\\\]\n" + "\"Wine\"=\"Test value\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(hkey, "Subkey1f\\\\"); + todo_wine verify_key(hkey, "Subkey1f\\"); + todo_wine verify_key(hkey, "Subkey1f"); + err = RegOpenKeyExA(hkey, "Subkey1f\\\\", 0, KEY_READ, &subkey); + todo_wine ok(err == ERROR_SUCCESS, "RegOpenKeyExA failed: got %u, expected 0\n", err); + todo_wine verify_reg(subkey, "Wine", REG_SZ, "Test value", 11, 0); + RegCloseKey(subkey); + err = RegDeleteKeyA(hkey, "Subkey1f\\\\"); + todo_wine ok(err == ERROR_SUCCESS, "RegDeleteKeyA failed: got %u, expected 0\n", err); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1g\\\\\\\\]\n" + "\"Wine\"=\"Test value\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(hkey, "Subkey1g\\\\\\\\"); + todo_wine verify_key(hkey, "Subkey1g\\\\"); + todo_wine verify_key(hkey, "Subkey1g\\"); + todo_wine verify_key(hkey, "Subkey1g"); + err = RegOpenKeyExA(hkey, "Subkey1g\\\\", 0, KEY_READ, &subkey); + todo_wine ok(err == ERROR_SUCCESS, "RegOpenKeyExA failed: got %u, expected 0\n", err); + todo_wine verify_reg(subkey, "Wine", REG_SZ, "Test value", 11, 0); + RegCloseKey(subkey); + err = RegDeleteKeyA(hkey, "Subkey1g\\\\"); + todo_wine ok(err == ERROR_SUCCESS, "RegDeleteKeyA failed: got %u, expected 0\n", err); + /* Test key deletion. We start by creating some registry keys. */ test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n\n" @@ -2936,6 +2978,48 @@ static void test_unicode_import(void) todo_wine err = RegDeleteKeyA(hkey, "Subkey1d\t"); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1e\\]\n" + "\"Wine\"=\"Test value\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(hkey, "Subkey1e\\"); + todo_wine verify_key(hkey, "Subkey1e"); + err = RegOpenKeyExA(hkey, "Subkey1e", 0, KEY_READ, &subkey); + todo_wine ok(err == ERROR_SUCCESS, "RegOpenKeyExA failed: got %u, expected 0\n", err); + todo_wine verify_reg(subkey, "Wine", REG_SZ, "Test value", 11, 0); + RegCloseKey(subkey); + err = RegDeleteKeyA(hkey, "Subkey1e"); + todo_wine ok(err == ERROR_SUCCESS, "RegDeleteKeyA failed: got %u, expected 0\n", err); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1f\\\\]\n" + "\"Wine\"=\"Test value\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(hkey, "Subkey1f\\\\"); + todo_wine verify_key(hkey, "Subkey1f\\"); + todo_wine verify_key(hkey, "Subkey1f"); + err = RegOpenKeyExA(hkey, "Subkey1f\\\\", 0, KEY_READ, &subkey); + todo_wine ok(err == ERROR_SUCCESS, "RegOpenKeyExA failed: got %u, expected 0\n", err); + todo_wine verify_reg(subkey, "Wine", REG_SZ, "Test value", 11, 0); + RegCloseKey(subkey); + err = RegDeleteKeyA(hkey, "Subkey1f\\\\"); + todo_wine ok(err == ERROR_SUCCESS, "RegDeleteKeyA failed: got %u, expected 0\n", err); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1g\\\\\\\\]\n" + "\"Wine\"=\"Test value\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(hkey, "Subkey1g\\\\\\\\"); + todo_wine verify_key(hkey, "Subkey1g\\\\"); + todo_wine verify_key(hkey, "Subkey1g\\"); + todo_wine verify_key(hkey, "Subkey1g"); + err = RegOpenKeyExA(hkey, "Subkey1g\\\\", 0, KEY_READ, &subkey); + todo_wine ok(err == ERROR_SUCCESS, "RegOpenKeyExA failed: got %u, expected 0\n", err); + todo_wine verify_reg(subkey, "Wine", REG_SZ, "Test value", 11, 0); + RegCloseKey(subkey); + err = RegDeleteKeyA(hkey, "Subkey1g\\\\"); + todo_wine ok(err == ERROR_SUCCESS, "RegDeleteKeyA failed: got %u, expected 0\n", err); + /* Test key deletion. We start by creating some registry keys. */ test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n\n"

1 0

Jactry Zeng : ucrtbase: Implement wcstoull and _wcstoull_l.
by Alexandre Julliard July 4, 2017

July 4, 2017

Module: wine Branch: master Commit: ca7ef97994ac96b1b4ab5586cc8ba414dc7cdec1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca7ef97994ac96b1b4ab5586c… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Jul 3 14:11:20 2017 +0800 ucrtbase: Implement wcstoull and _wcstoull_l. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr120_app/msvcr120_app.spec | 4 ++-- dlls/ucrtbase/ucrtbase.spec | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec b/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec index 29b7a4c..e055c21 100644 --- a/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec +++ b/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec @@ -63,7 +63,7 @@ @ cdecl -ret64 _wcstoui64(wstr ptr long) ucrtbase._wcstoui64 @ cdecl -ret64 _wcstoui64_l(wstr ptr long ptr) ucrtbase._wcstoui64_l @ cdecl _wcstoul_l(wstr ptr long ptr) ucrtbase._wcstoul_l -@ stub _wcstoull_l +@ cdecl -ret64 _wcstoull_l(wstr ptr long ptr) ucrtbase._wcstoull_l @ stub _wcstoumax_l @ cdecl _wctomb_l(ptr long ptr) ucrtbase._wctomb_l @ cdecl _wctomb_s_l(ptr ptr long long ptr) ucrtbase._wctomb_s_l @@ -114,7 +114,7 @@ @ cdecl wcstombs(ptr ptr long) ucrtbase.wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) ucrtbase.wcstombs_s @ cdecl wcstoul(wstr ptr long) ucrtbase.wcstoul -@ stub wcstoull +@ cdecl -ret64 wcstoull(wstr ptr long) ucrtbase.wcstoull @ stub wcstoumax @ cdecl wctob(long) ucrtbase.wctob @ cdecl wctomb(ptr long) ucrtbase.wctomb diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 5a2f9c9..15cfe60 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1900,7 +1900,7 @@ @ cdecl -ret64 _wcstoui64(wstr ptr long) MSVCRT__wcstoui64 @ cdecl -ret64 _wcstoui64_l(wstr ptr long ptr) MSVCRT__wcstoui64_l @ cdecl _wcstoul_l(wstr ptr long ptr) MSVCRT__wcstoul_l -@ stub _wcstoull_l +@ cdecl -ret64 _wcstoull_l(wstr ptr long ptr) MSVCRT__wcstoui64_l @ stub _wcstoumax_l @ cdecl _wcsupr(wstr) ntdll._wcsupr @ cdecl _wcsupr_l(wstr ptr) MSVCRT__wcsupr_l @@ -2480,7 +2480,7 @@ @ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) MSVCRT_wcstombs_s @ cdecl wcstoul(wstr ptr long) MSVCRT_wcstoul -@ stub wcstoull +@ cdecl -ret64 wcstoull(wstr ptr long) MSVCRT__wcstoui64 @ stub wcstoumax @ cdecl wcsxfrm(ptr wstr long) MSVCRT_wcsxfrm @ cdecl wctob(long) MSVCRT_wctob diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 5c6093c..9690d4d 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1593,7 +1593,7 @@ @ cdecl -ret64 _wcstoui64(wstr ptr long) msvcr120._wcstoui64 @ cdecl -ret64 _wcstoui64_l(wstr ptr long ptr) msvcr120._wcstoui64_l @ cdecl _wcstoul_l(wstr ptr long ptr) msvcr120._wcstoul_l -@ stub _wcstoull_l +@ cdecl -ret64 _wcstoull_l(wstr ptr long ptr) msvcr120._wcstoull_l @ stub _wcstoumax_l @ cdecl _wcsupr(wstr) msvcr120._wcsupr @ cdecl _wcsupr_l(wstr ptr) msvcr120._wcsupr_l @@ -2142,7 +2142,7 @@ @ cdecl wcstombs(ptr ptr long) msvcr120.wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) msvcr120.wcstombs_s @ cdecl wcstoul(wstr ptr long) msvcr120.wcstoul -@ stub wcstoull +@ cdecl -ret64 wcstoull(wstr ptr long) msvcr120.wcstoull @ stub wcstoumax @ cdecl wcsxfrm(ptr wstr long) msvcr120.wcsxfrm @ cdecl wctob(long) msvcr120.wctob diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 5d13712..a27a2c6 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2049,7 +2049,7 @@ @ cdecl -ret64 _wcstoui64(wstr ptr long) MSVCRT__wcstoui64 @ cdecl -ret64 _wcstoui64_l(wstr ptr long ptr) MSVCRT__wcstoui64_l @ cdecl _wcstoul_l(wstr ptr long ptr) MSVCRT__wcstoul_l -@ stub _wcstoull_l +@ cdecl -ret64 _wcstoull_l(wstr ptr long ptr) MSVCRT__wcstoui64_l @ stub _wcstoumax_l @ cdecl _wcsupr(wstr) ntdll._wcsupr @ cdecl _wcsupr_l(wstr ptr) MSVCRT__wcsupr_l @@ -2587,7 +2587,7 @@ @ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) MSVCRT_wcstombs_s @ cdecl wcstoul(wstr ptr long) MSVCRT_wcstoul -@ stub wcstoull +@ cdecl -ret64 wcstoull(wstr ptr long) MSVCRT__wcstoui64 @ stub wcstoumax @ cdecl wcsxfrm(ptr wstr long) MSVCRT_wcsxfrm @ cdecl wctob(long) MSVCRT_wctob

1 0