wine-commits July 2017

wine-commits@winehq.org

2 participants
632 discussions

Jacek Caban : server: Keep weak fd reference in async object when async is queued.
by Alexandre Julliard 05 Jul '17

05 Jul '17

Module: wine Branch: master Commit: 9df88c305507672aea65f40c1fc499335276f6ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=9df88c305507672aea65f40c1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 4 15:25:51 2017 +0200 server: Keep weak fd reference in async object when async is queued. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/server/async.c b/server/async.c index 3a83a63..ed85899 100644 --- a/server/async.c +++ b/server/async.c @@ -118,7 +118,7 @@ static const struct object_ops async_queue_ops = static inline void async_reselect( struct async *async ) { - if (async->queue && async->queue->fd) fd_reselect_async( async->queue->fd, async->queue ); + if (async->queue && async->fd) fd_reselect_async( async->fd, async->queue ); } static void async_dump( struct object *obj, int verbose ) @@ -167,8 +167,8 @@ static void async_destroy( struct object *obj ) async_reselect( async ); release_object( async->queue ); } + else if (async->fd) release_object( async->fd ); - if (async->fd) release_object( async->fd ); if (async->timeout) remove_timeout_user( async->timeout ); if (async->event) release_object( async->event ); if (async->iosb) release_object( async->iosb ); @@ -250,8 +250,11 @@ struct async_queue *create_async_queue( struct fd *fd ) /* free an async queue, cancelling all async operations */ 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; queue->fd = NULL; async_wake_up( queue, STATUS_HANDLES_CLOSED ); release_object( queue ); @@ -259,14 +262,14 @@ void free_async_queue( struct async_queue *queue ) void queue_async( struct async_queue *queue, struct async *async ) { + /* fd will be set to NULL in free_async_queue when fd is destroyed */ release_object( async->fd ); - async->fd = NULL; async->queue = (struct async_queue *)grab_object( queue ); grab_object( async ); list_add_tail( &queue->queue, &async->queue_entry ); - if (queue->fd) set_fd_signaled( queue->fd, 0 ); + if (async->fd) set_fd_signaled( async->fd, 0 ); } /* create an async on a given queue of a fd */ @@ -383,12 +386,10 @@ 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 ) { - struct fd *fd = async->queue ? async->queue->fd : async->fd; - - if (fd) + if (async->fd) { apc_param_t ckey; - struct completion *completion = fd_get_completion( fd, &ckey ); + struct completion *completion = fd_get_completion( async->fd, &ckey ); if (completion) { @@ -443,7 +444,6 @@ void async_set_result( struct object *obj, unsigned int status, apc_param_t tota if (async->event) set_event( async->event ); else if (async->fd) set_fd_signaled( async->fd, 1 ); - else if (async->queue && async->queue->fd) set_fd_signaled( async->queue->fd, 1 ); if (!async->signaled) { async->signaled = 1; @@ -473,15 +473,13 @@ int async_waiting( struct async_queue *queue ) static int cancel_async( struct process *process, struct object *obj, struct thread *thread, client_ptr_t iosb ) { struct async *async; - struct fd *fd; int woken = 0; restart: LIST_FOR_EACH_ENTRY( async, &process->asyncs, struct async, process_entry ) { if (async->status == STATUS_CANCELLED) continue; - fd = async->queue ? async->queue->fd : async->fd; - if ((!obj || (fd && get_fd_user( fd ) == obj)) && + if ((!obj || (async->fd && get_fd_user( async->fd ) == obj)) && (!thread || async->thread == thread) && (!iosb || async->data.iosb == iosb)) {

1 0

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

05 Jul '17

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

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

05 Jul '17

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

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

05 Jul '17

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

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

Hugh McMaster : regedit: Do not remove lines beginning with '#' from the read buffer.
by Alexandre Julliard 04 Jul '17

04 Jul '17

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 04 Jul '17

04 Jul '17

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: Skip lines that do not begin with a hexadecimal character during hex data concatenation.
by Alexandre Julliard 04 Jul '17

04 Jul '17

Module: wine Branch: master Commit: 6ffa89ebd3ad16cb887df78351e3a04798671eea URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ffa89ebd3ad16cb887df7835… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jul 4 12:46:18 2017 +0000 regedit: Skip lines that do not begin with a hexadecimal character 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 | 10 ++++++++++ programs/regedit/tests/regedit.c | 18 +++++++++--------- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 527959a..b933f03 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -898,8 +898,18 @@ static WCHAR *hex_multiline_state(struct parser *parser, WCHAR *pos) while (*line == ' ' || *line == '\t') line++; if (*line == ';') return line; + if (!isxdigitW(*line)) goto invalid; + set_state(parser, HEX_DATA); return line; + +invalid: + HeapFree(GetProcessHeap(), 0, parser->data); + parser->data = NULL; + parser->data_size = 0; + + set_state(parser, LINE_START); + return line; } /* handler for parser UNKNOWN_DATA state */ diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 3a08ec0..cd21b61 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -910,7 +910,7 @@ static void test_invalid_import(void) verify_reg_nonexist(hkey, "Wine25d"); verify_reg_nonexist(hkey, "Wine25e"); todo_wine verify_reg(hkey, "Wine25f", REG_SZ, "Test value", 11, 0); - todo_wine verify_reg_nonexist(hkey, "Wine25g"); + verify_reg_nonexist(hkey, "Wine25g"); todo_wine verify_reg_nonexist(hkey, "Wine25h"); verify_reg_nonexist(hkey, "Wine25i"); verify_reg(hkey, "Wine25j", REG_SZ, "Test value", 11, 0); @@ -939,7 +939,7 @@ static void test_invalid_import(void) verify_reg_nonexist(hkey, "Wine26d"); verify_reg_nonexist(hkey, "Wine26e"); todo_wine verify_reg(hkey, "Wine26f", REG_DWORD, &dword, sizeof(dword), 0); - todo_wine verify_reg_nonexist(hkey, "Wine26g"); + verify_reg_nonexist(hkey, "Wine26g"); todo_wine verify_reg_nonexist(hkey, "Wine26h"); verify_reg_nonexist(hkey, "Wine26i"); verify_reg(hkey, "Wine26j", REG_DWORD, &dword, sizeof(dword), 0); @@ -968,7 +968,7 @@ static void test_invalid_import(void) verify_reg_nonexist(hkey, "Wine27d"); verify_reg_nonexist(hkey, "Wine27e"); todo_wine verify_reg(hkey, "Wine27f", REG_EXPAND_SZ, "%PATH%", 7, 0); - todo_wine verify_reg_nonexist(hkey, "Wine27g"); + verify_reg_nonexist(hkey, "Wine27g"); todo_wine verify_reg_nonexist(hkey, "Wine27h"); verify_reg_nonexist(hkey, "Wine27i"); verify_reg(hkey, "Wine27j", REG_EXPAND_SZ, "%PATH%", 7, 0); @@ -1003,7 +1003,7 @@ static void test_invalid_import(void) "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Wine28d\"=hex(2):4c,69,6e,65,20,\\\n\n" "@=\"Default value 4\"\n\n"); - todo_wine verify_reg_nonexist(hkey, "Wine28d"); + verify_reg_nonexist(hkey, "Wine28d"); todo_wine verify_reg_nonexist(hkey, NULL); exec_import_str("REGEDIT4\n\n" @@ -1021,8 +1021,8 @@ static void test_invalid_import(void) "\"Wine29b\"=hex:11,22,33,\\\n" " \\\n" " 44,55,66\n\n"); - todo_wine verify_reg_nonexist(hkey, "Wine29a"); - todo_wine verify_reg_nonexist(hkey, "Wine29b"); + verify_reg_nonexist(hkey, "Wine29a"); + verify_reg_nonexist(hkey, "Wine29b"); 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"); - verify_reg(hkey, "Multi-Line6", REG_MULTI_SZ, "Line concatenation\0", 20, TODO_REG_SIZE); + todo_wine 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"); - verify_reg(hkey, "Wine10a", REG_MULTI_SZ, "Line concatenation\0", 20, TODO_REG_SIZE); + todo_wine 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"); - verify_reg(hkey, "Wine10b", REG_MULTI_SZ, "Line concatenation\0", 20, TODO_REG_SIZE); + todo_wine 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: Simplify a while loop for skipping whitespace.
by Alexandre Julliard 04 Jul '17

04 Jul '17

Module: wine Branch: master Commit: 50caf838b6f3e93463834e7dbd5bac97e78098f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50caf838b6f3e93463834e7db… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jul 4 12:46:09 2017 +0000 regedit: Simplify a while loop for skipping whitespace. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 512ddb4..527959a 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -506,7 +506,7 @@ static enum reg_versions parse_file_header(const WCHAR *s) 'R','e','g','i','s','t','r','y',' ','E','d','i','t','o','r',' ', 'V','e','r','s','i','o','n',' ','5','.','0','0',0}; - while (*s && (*s == ' ' || *s == '\t')) s++; + while (*s == ' ' || *s == '\t') s++; if (!strcmpW(s, header_31)) return REG_VERSION_31;

1 0

Hugh McMaster : regedit/tests: Test whether the "0x" prefix is valid when importing hex data.
by Alexandre Julliard 04 Jul '17

04 Jul '17

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

← Newer
1
...
55
56
57
58
59
60
61
...
64
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2017