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

Hugh McMaster : regedit: Re-implement favourite registry key handling.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 27b2519ca47192349fdcb5e09fe9eee10d00526f URL: http://source.winehq.org/git/wine.git/?a=commit;h=27b2519ca47192349fdcb5e09… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jun 5 00:57:53 2017 +0000 regedit: Re-implement favourite registry key handling. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/framewnd.c | 77 +++++++++++++++++++++++++++------------------ programs/regedit/regproc.c | 13 -------- programs/regedit/regproc.h | 9 ++++++ 3 files changed, 56 insertions(+), 43 deletions(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index cd7dad0..e654d48 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -198,38 +198,55 @@ static void UpdateMenuItems(HMENU hMenu) { HeapFree(GetProcessHeap(), 0, keyName); } -static void OnInitMenuPopup(HWND hWnd, HMENU hMenu, short wItem) +static void add_favourite_key_menu_items(HMENU hMenu) { - if (wItem == 3) { - HKEY hKey; - while(GetMenuItemCount(hMenu)>2) + HKEY hkey; + LONG rc; + DWORD num_values, max_value_len, value_len, type, i; + WCHAR *value_name; + + rc = RegOpenKeyExW(HKEY_CURRENT_USER, favoritesKey, 0, KEY_READ, &hkey); + if (rc != ERROR_SUCCESS) return; + + rc = RegQueryInfoKeyW(hkey, NULL, NULL, NULL, NULL, NULL, NULL, &num_values, + &max_value_len, NULL, NULL, NULL); + if (rc != ERROR_SUCCESS) + { + ERR("RegQueryInfoKey failed: %d\n", rc); + goto exit; + } + + if (!num_values) goto exit; + + max_value_len++; + value_name = HeapAlloc(GetProcessHeap(), 0, max_value_len * sizeof(WCHAR)); + CHECK_ENOUGH_MEMORY(value_name); + + AppendMenuW(hMenu, MF_SEPARATOR, 0, 0); + + for (i = 0; i < num_values; i++) + { + value_len = max_value_len; + rc = RegEnumValueW(hkey, i, value_name, &value_len, NULL, &type, NULL, NULL); + if (rc == ERROR_SUCCESS && type == REG_SZ) + AppendMenuW(hMenu, MF_ENABLED | MF_STRING, ID_FAVORITE_FIRST + i, value_name); + } + + HeapFree(GetProcessHeap(), 0, value_name); +exit: + RegCloseKey(hkey); +} + +static void OnInitMenuPopup(HWND hWnd, HMENU hMenu) +{ + if (hMenu == GetSubMenu(hMenuFrame, ID_FAVORITES_MENU)) + { + while (GetMenuItemCount(hMenu) > 2) DeleteMenu(hMenu, 2, MF_BYPOSITION); - if (RegOpenKeyExW(HKEY_CURRENT_USER, favoritesKey, - 0, KEY_READ, &hKey) == ERROR_SUCCESS) { - WCHAR namebuf[KEY_MAX_LEN]; - BYTE valuebuf[4096]; - int i = 0; - BOOL sep = FALSE; - DWORD ksize, vsize, type; - LONG error; - do { - ksize = KEY_MAX_LEN; - vsize = sizeof(valuebuf); - error = RegEnumValueW(hKey, i, namebuf, &ksize, NULL, &type, valuebuf, &vsize); - if (error != ERROR_SUCCESS) - break; - if (type == REG_SZ) { - if (!sep) { - AppendMenuW(hMenu, MF_SEPARATOR, -1, NULL); - sep = TRUE; - } - AppendMenuW(hMenu, MF_STRING, ID_FAVORITE_FIRST+i, namebuf); - } - i++; - } while(error == ERROR_SUCCESS); - RegCloseKey(hKey); - } + + add_favourite_key_menu_items(hMenu); } + UpdateMenuItems(hMenu); } @@ -1056,7 +1073,7 @@ LRESULT CALLBACK FrameWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa break; case WM_INITMENUPOPUP: if (!HIWORD(lParam)) - OnInitMenuPopup(hWnd, (HMENU)wParam, LOWORD(lParam)); + OnInitMenuPopup(hWnd, (HMENU)wParam); break; case WM_MENUSELECT: OnMenuSelect(hWnd, LOWORD(wParam), HIWORD(wParam), (HMENU)lParam); diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 10b4a38..d5be72f 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -50,19 +50,6 @@ static HKEY reg_class_keys[] = { #define ARRAY_SIZE(A) (sizeof(A)/sizeof(*A)) -/* return values */ -#define NOT_ENOUGH_MEMORY 1 - -/* processing macros */ - -/* common check of memory allocation results */ -#define CHECK_ENOUGH_MEMORY(p) \ -if (!(p)) \ -{ \ - output_message(STRING_OUT_OF_MEMORY, __FILE__, __LINE__); \ - exit(NOT_ENOUGH_MEMORY); \ -} - /****************************************************************************** * Allocates memory and converts input from multibyte to wide chars * Returned string must be freed by the caller diff --git a/programs/regedit/regproc.h b/programs/regedit/regproc.h index aff4bee..72e6b38 100644 --- a/programs/regedit/regproc.h +++ b/programs/regedit/regproc.h @@ -24,6 +24,15 @@ #define REG_FORMAT_5 1 #define REG_FORMAT_4 2 +#define NOT_ENOUGH_MEMORY 1 + +#define CHECK_ENOUGH_MEMORY(p) \ +if (!(p)) \ +{ \ + output_message(STRING_OUT_OF_MEMORY, __FILE__, __LINE__); \ + exit(NOT_ENOUGH_MEMORY); \ +} + void __cdecl output_message(unsigned int id, ...); BOOL export_registry_key(WCHAR *file_name, WCHAR *reg_key_name, DWORD format);

1 0

Hugh McMaster : regedit: Use the treeview item label in the 'Favourites' menu instead of the key path.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 46bff016ab9b6f698a5934d044a7c981704bf72e URL: http://source.winehq.org/git/wine.git/?a=commit;h=46bff016ab9b6f698a5934d04… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jun 5 00:58:04 2017 +0000 regedit: Use the treeview item label in the 'Favourites' menu instead of the key path. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/framewnd.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index e654d48..7e48513 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -646,15 +646,21 @@ static INT_PTR CALLBACK addtofavorites_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM w switch(uMsg) { case WM_INITDIALOG: { - HKEY hKeyRoot = NULL; - LPWSTR ItemPath = GetItemPath(g_pChildWnd->hTreeWnd, NULL, &hKeyRoot); + HTREEITEM selected; + TVITEMW item; + WCHAR buf[128]; + + selected = (HTREEITEM)SendMessageW(g_pChildWnd->hTreeWnd, TVM_GETNEXTITEM, TVGN_CARET, 0); + + item.mask = TVIF_HANDLE | TVIF_TEXT; + item.hItem = selected; + item.pszText = buf; + item.cchTextMax = COUNT_OF(buf); + SendMessageW(g_pChildWnd->hTreeWnd, TVM_GETITEMW, 0, (LPARAM)&item); - if(!ItemPath || !*ItemPath) - ItemPath = GetItemFullPath(g_pChildWnd->hTreeWnd, NULL, FALSE); EnableWindow(GetDlgItem(hwndDlg, IDOK), FALSE); - SetWindowTextW(hwndValue, ItemPath); + SetWindowTextW(hwndValue, buf); SendMessageW(hwndValue, EM_SETLIMITTEXT, 127, 0); - HeapFree(GetProcessHeap(), 0, ItemPath); return TRUE; } case WM_COMMAND:

1 0

Jeremy Newman : changes went live
by Jeremy Newman 05 Jun '17

05 Jun '17

Module: appdb Branch: master Commit: 160b16a39334d26186f3d56875216c6a744ea43b URL: http://source.winehq.org/git/appdb.git/?a=commit;h=160b16a39334d26186f3d568… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Jun 5 15:55:13 2017 -0500 changes went live --- tables/alter.sql | 1 - 1 file changed, 1 deletion(-) diff --git a/tables/alter.sql b/tables/alter.sql index b8187cd..457f8d9 100644 --- a/tables/alter.sql +++ b/tables/alter.sql @@ -1,3 +1,2 @@ /* append to this file when changes are required to the live db */ /* it will be cleared when the changes go live */ -ALTER TABLE testResults ADD column staging tinyint(1) not null default '0' AFTER testedRelease;

1 0

Rosanne DiMesio : Identify wine-staging versions in test data
by Jeremy Newman 05 Jun '17

05 Jun '17

Module: appdb Branch: master Commit: b40e6593fa26587f1bf2b1929358c137287a0beb URL: http://source.winehq.org/git/appdb.git/?a=commit;h=b40e6593fa26587f1bf2b192… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Mon Jun 5 15:49:51 2017 -0500 Identify wine-staging versions in test data Adds a "staging" field to the testResults table and a checkbox for wine-staging to the tested release section of the test submission form. Appends -staging to the version displayed in the test results table when it is checked. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/testData.php | 37 +++++++++++++++++++++++++++---------- tables/alter.sql | 1 + tables/testResults.sql | 1 + 3 files changed, 29 insertions(+), 10 deletions(-) diff --git a/include/testData.php b/include/testData.php index 07918bb..6a375ba 100644 --- a/include/testData.php +++ b/include/testData.php @@ -13,6 +13,7 @@ class testData{ var $shWhatDoesnt; var $shWhatNotTested; var $sTestedRelease; + var $iStaging; var $iDistributionId; var $sTestedDate; var $sInstalls; @@ -50,6 +51,7 @@ class testData{ $this->sTestedDate = $oRow->testedDate; $this->iDistributionId = $oRow->distributionId; $this->sTestedRelease = $oRow->testedRelease; + $this->iStaging = $oRow->staging; $this->sInstalls = $oRow->installs; $this->sRuns = $oRow->runs; $this->sTestedRating = $oRow->testedRating; @@ -71,16 +73,17 @@ class testData{ $hResult = query_parameters("INSERT INTO testResults (versionId, whatWorks, whatDoesnt,". "whatNotTested, testedDate, distributionId, testedRelease,". - "installs, runs, testedRating, comments,". + "staging, installs, runs, testedRating, comments,". "submitTime, submitterId, state)". "VALUES('?', '?', '?', '?', '?', '?', '?',". - "'?', '?', '?', '?',". + "'?', '?', '?', '?', '?',". "?, '?', '?')", $this->iVersionId, $this->shWhatWorks, $this->shWhatDoesnt, $this->shWhatNotTested, $this->sTestedDate, $this->iDistributionId, - $this->sTestedRelease, $this->sInstalls, + $this->sTestedRelease, $this->iStaging, + $this->sInstalls, $this->sRuns, $this->sTestedRating, $this->sComments, "NOW()", @@ -201,6 +204,7 @@ class testData{ testedDate = '?', distributionId = '?', testedRelease = '?', + staging = '?', installs = '?', runs = '?', testedRating = '?', @@ -214,6 +218,7 @@ class testData{ $this->sTestedDate, $this->iDistributionId, $this->sTestedRelease, + $this->iStaging, $this->sInstalls, $this->sRuns, $this->sTestedRating, @@ -588,7 +593,7 @@ class testData{ $oTableRow->AddCell($oTableCell); $oTableRow->AddTextCell($oDistribution->objectMakeLink()); $oTableRow->AddTextCell(date("M d Y", mysqldatetime_to_unixtimestamp($this->sTestedDate))); - $oTableRow->AddTextCell($this->sTestedRelease.' '); + $oTableRow->AddTextCell(($this->sTestedRelease).($this->iStaging != 0 ? '-staging':'')); $oTableRow->AddTextCell($this->sInstalls.' '); $oTableRow->AddTextCell($this->sRuns.' '); $oTableCell = new TableCell($this->sTestedRating); @@ -728,7 +733,7 @@ class testData{ The $sDate parameter can be used to calculate the rating at a given point in time */ public static function getRatingInfoForVersionId($iVersionId, $sDate = 'NOW()') { - $sQuery = "SELECT testedRating,testedDate,testedRelease,versions.id as versionId + $sQuery = "SELECT testedRating,testedDate,testedRelease,staging,versions.id as versionId FROM testResults, ?.versions WHERE versions.value = testResults.testedRelease AND @@ -885,7 +890,15 @@ class testData{ echo '<tr><td class=color1><b>Tested release</b></td><td class=color0>',"\n"; echo make_bugzilla_version_list("sTestedRelease", $this->sTestedRelease); // Give the user some information about our available versions - echo "<span>Version not listed? Your Wine is too old, <a href=\"//winehq.org/download\">upgrade!</a></span>"; + echo "<span>Version not listed? Your Wine is too old, <a href=\"//winehq.org/download\">upgrade!</a></span><br>"; + // Checkbox for Wine-staging + echo '<label class="btn btn-secondary">'; + if($this->iStaging != 0) + echo '<input type="checkbox" name="iStaging" value="1" checked>'; + else + echo '<input type="checkbox" name="iStaging" value="1">'; + echo ' Wine-staging'; + echo '</label>'; echo '</td></tr>',"\n"; // Installs @@ -911,7 +924,8 @@ class testData{ // Display confirmation box for changing the Wine version $oOldTest = new testData($this->iTestingId); - if($this->iTestingId && $oOldTest->sTestedRelease != $this->sTestedRelease) + if($this->iTestingId && $oOldTest->sTestedRelease != $this->sTestedRelease + || $this-iTestingId && $oOldTest->iStaging != $this->iStaging) { if(getInput('bConfirmTestedVersionChange', $aClean) != 'true') { @@ -957,7 +971,9 @@ class testData{ // to submit new reports instead of updating existing ones when testing new Wines $oOldTest = new testData($this->iTestingId); if($this->iTestingId && $oOldTest->sTestedRelease != getInput('sTestedRelease', $aValues) && - getInput('bConfirmTestedVersionChange', $aValues) != 'true') + getInput('bConfirmTestedVersionChange', $aValues) != 'true' + || $this->iTestingId && $oOldTest->iStaging != getInput('iStaging', $aValues) && + getInput('bConfirmTestedVersionChange', $aValues) != 'true') { $errors .= '<li>Are you sure you want to change the Wine version of the report? Please submit a new '. 'test report for every Wine version you test; this is useful for tracking Wine\'s progress. '. @@ -1013,6 +1029,7 @@ class testData{ $this->sTestedDate = $aValues['sTestedDate']; $this->iDistributionId = $aValues['iDistributionId']; $this->sTestedRelease = $aValues['sTestedRelease']; + $this->iStaging = $aValues['iStaging']; $this->sInstalls = $aValues['sInstalls']; $this->sRuns = $aValues['sRuns']; $this->sTestedRating = $aValues['sTestedRating']; @@ -1079,7 +1096,7 @@ class testData{ /* List test data submitted by a given user. Ignore test results for queued applications/versions */ public static function listSubmittedBy($iUserId, $bQueued = true) { - $hResult = query_parameters("SELECT testResults.versionId, testResults.testedDate, testResults.testedRelease, testResults.testedRating, testResults.submitTime, testResults.testingId, appFamily.appName, appVersion.versionName from testResults, appFamily, appVersion WHERE testResults.versionId = appVersion.versionId AND appVersion.appId = appFamily.appId AND testResults.submitterId = '?' AND testResults.state = '?' ORDER BY testResults.testingId", $iUserId, $bQueued ? 'queued' : 'accepted'); + $hResult = query_parameters("SELECT testResults.versionId, testResults.testedDate, testResults.testedRelease, testResults.testedRating, testResults.staging, testResults.submitTime, testResults.testingId, appFamily.appName, appVersion.versionName from testResults, appFamily, appVersion WHERE testResults.versionId = appVersion.versionId AND appVersion.appId = appFamily.appId AND testResults.submitterId = '?' AND testResults.state = '?' ORDER BY testResults.testingId", $iUserId, $bQueued ? 'queued' : 'accepted'); if(!$hResult || !query_num_rows($hResult)) return false; @@ -1371,7 +1388,7 @@ class testData{ $oTableRow->AddCell(new TableCell($oUser->objectMakeLink())); $oTableRow->AddCell(new TableCell($oApp->objectMakeLink())); $oTableRow->AddCell(new TableCell($oVersion->objectMakeLink())); - $oTableRow->AddCell(new TableCell($this->sTestedRelease)); + $oTableRow->AddCell(new TableCell(($this->sTestedRelease) . ($this->iStaging != 0 ? '-staging':''))); $oTableRow->AddCell(new TableCell($bHasMaintainer ? "YES" : "no")); $oTableRow->AddCell(new TableCell($this->sTestedRating)); diff --git a/tables/alter.sql b/tables/alter.sql index 457f8d9..b8187cd 100644 --- a/tables/alter.sql +++ b/tables/alter.sql @@ -1,2 +1,3 @@ /* append to this file when changes are required to the live db */ /* it will be cleared when the changes go live */ +ALTER TABLE testResults ADD column staging tinyint(1) not null default '0' AFTER testedRelease; diff --git a/tables/testResults.sql b/tables/testResults.sql index 7f88a54..44a52ae 100644 --- a/tables/testResults.sql +++ b/tables/testResults.sql @@ -14,6 +14,7 @@ create table testResults ( testedDate datetime not null, distributionId int not null, testedRelease tinytext, + staging tinyint(1) not null default '0', installs enum('Yes','No','No, but has workaround','N/A') NOT NULL default 'Yes', runs enum('Yes','No','Not Installable') NOT NULL default 'Yes', testedRating enum('Platinum','Gold','Silver','Bronze','Garbage') NOT NULL,

1 0

Francois Gouget : testbot/WineRunTask: Add consistency checks for todo and skip messages.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: tools Branch: master Commit: 031792f30bc9cac6c3ed5cde070050fe997bc740 URL: http://source.winehq.org/git/tools.git/?a=commit;h=031792f30bc9cac6c3ed5cde… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Jun 4 00:39:03 2017 +0200 testbot/WineRunTask: Add consistency checks for todo and skip messages. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunTask.pl | 38 +++++++++++++++++++++++++++++++------- 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 12b83f2..7122c57 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -467,9 +467,11 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) if (open(my $LogFile, "<", $FullLogFileName)) { # There is more than one test unit when running the full test suite so keep - # track of the current one. Also note that for the TestBot we don't really - # care about the todos and skips - my ($CurrentDll, $CurrentUnit, $LineFailures, $SummaryFailures) = ("", "", 0, 0); + # track of the current one. Note that for the TestBot we don't count or + # complain about misplaced skips. + my ($CurrentDll, $CurrentUnit) = ("", ""); + my ($LineFailures, $LineTodos, $LineSkips) = (0, 0, 0); + my ($SummaryFailures, $SummaryTodos, $SummarySkips) = (0, 0, 0); my ($CurrentIsBroken, %CurrentPids, $CurrentRc, $LogFailures); sub CheckUnit($$) @@ -513,6 +515,8 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) if (!$CurrentIsBroken) { CheckSummaryCounter($LineFailures, $SummaryFailures, "failure"); + CheckSummaryCounter($LineTodos, $SummaryTodos, "todo"); + CheckSummaryCounter($LineSkips, $SummarySkips, "skip"); } # Note that the summary lines may count some failures twice @@ -556,7 +560,8 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) $LogFailures += $LineFailures; $CurrentDll = $CurrentUnit = ""; - $LineFailures = $SummaryFailures = 0; + $LineFailures = $LineTodos = $LineSkips = 0; + $SummaryFailures = $SummaryTodos = $SummarySkips = 0; $CurrentIsBroken = 0; $CurrentRc = undef; %CurrentPids = (); @@ -583,6 +588,23 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) CheckUnit($1, "failure"); $LineFailures++; } + elsif ($Line =~ /^([_a-z0-9]+)\.c:\d+: Test marked todo: / or + ($CurrentUnit ne "" and + $Line =~ /($CurrentUnit)\.c:\d+: Test marked todo: /)) + { + CheckUnit($1, "todo"); + $LineTodos++; + } + # TestLauncher's skip message is quite broken + elsif ($Line =~ /^([_a-z0-9]+)(?:\.c)?:\d+:? Tests? skipped: / or + ($CurrentUnit ne "" and + $Line =~ /($CurrentUnit)(?:\.c)?:\d+:? Tests? skipped: /)) + { + # Don't complain and don't count misplaced skips. Only complain if they + # are misreported (see CloseTestUnit). Also TestLauncher uses the wrong + # name in its skip message when skipping tests. + $LineSkips++ if ($1 eq $CurrentUnit or $1 eq $CurrentDll); + } elsif ($Line =~ /^Fatal: test '([_a-z0-9]+)' does not exist/) { # This also replaces a test summary line. @@ -607,11 +629,11 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) CheckUnit($Unit, "unhandled exception"); $LineFailures++; } - elsif ($Line =~ /^(?:([0-9a-f]+):)?([_a-z0-9]+): \d+ tests? executed $(\d+) marked as todo, (\d+) failures?$, \d+ skipped\./ or + elsif ($Line =~ /^(?:([0-9a-f]+):)?([_a-z0-9]+): \d+ tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./ or ($CurrentUnit ne "" and - $Line =~ /(?:([0-9a-f]+):)?($CurrentUnit): \d+ tests? executed $(\d+) marked as todo, (\d+) failures?$, \d+ skipped\./)) + $Line =~ /(?:([0-9a-f]+):)?($CurrentUnit): \d+ tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./)) { - my ($Pid, $Unit, $Todos, $Failures) = ($1, $2, $3, $4); + my ($Pid, $Unit, $Todos, $Failures, $Skips) = ($1, $2, $3, $4, $5); # Dlls that have only one test unit will run it even if there is # no argument. Also TestLauncher uses the wrong name in its test @@ -621,6 +643,8 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) # There may be more than one summary line due to child processes $CurrentPids{$Pid || 0} = 1; $SummaryFailures += $Failures; + $SummaryTodos += $Todos; + $SummarySkips += $Skips; $IsWineTest = 1; } else

1 0

Francois Gouget : winetest: Improve error reporting.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: tools Branch: master Commit: 91e530aba800b9146b16e5e6c5b466932da2da34 URL: http://source.winehq.org/git/tools.git/?a=commit;h=91e530aba800b9146b16e5e6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Jun 4 00:39:49 2017 +0200 winetest: Improve error reporting. Add a function to report errors. Always report renaming errors and the reason for the error. Standardize the file open error messages. die, and by extension mydie, does not need a trailing new-line. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-errors | 14 ++++++++++++- winetest/build-index | 33 +++++++++++++++++++++++------ winetest/dissect | 57 +++++++++++++++++++++++++++++---------------------- winetest/gather | 45 ++++++++++++++++++++++++++++------------ 4 files changed, 104 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=91e530aba800b9146b16…

1 0

Francois Gouget : winetest/dissect: Require the platform fields to be present.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: tools Branch: master Commit: 99a550fb03cc67fd9985bbfb3d329f18755e6c7f URL: http://source.winehq.org/git/tools.git/?a=commit;h=99a550fb03cc67fd9985bbfb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Jun 4 00:40:05 2017 +0200 winetest/dissect: Require the platform fields to be present. Without them we were getting a lot of undefined value perl errors. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/winetest/dissect b/winetest/dissect index ccfb15f..36ab635 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -236,6 +236,10 @@ while (($_ = <IN>) =~ /^\s*([0-9a-zA-Z ]+)=(.*?)\r?$/) { } $box->{data} .= "</table>\n"; +if (!defined $plid or !defined $major or !defined $minor or !defined $product) { + mydie "missing a PlatformId, dwMajorVersion, dwMinorVersion or wProductType field"; +} + my @idmatch = ( # Describes how to match a platform's version information # with a dissect platform id: @@ -284,7 +288,7 @@ if ($wine) { "Darwin" => "mac", "FreeBSD" => "bsd", "SunOS" => "solaris" ); - $version = $host && defined($known_hosts{$host}) ? $known_hosts{$host} : "wine"; + $version = $known_hosts{$host || ""} || "wine"; } if ($wine_build) { my $wine_commit;

1 0

Francois Gouget : winetest/dissect: Provide more information when rejecting a report.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: tools Branch: master Commit: 3de458939d5bc9fdd2e03f55027ab4e7da42f342 URL: http://source.winehq.org/git/tools.git/?a=commit;h=3de458939d5bc9fdd2e03f55… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Jun 4 00:40:17 2017 +0200 winetest/dissect: Provide more information when rejecting a report. Log the test unit where the error occurred and the value of the limit that was exceeded. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 36ab635..99e50fb 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -334,7 +334,7 @@ while ($_ = <IN>) { elsif ($2 eq "skipped") { print SUM "- $module - skipped - - - - -\n"; - mydie "too many dlls skipped by user request" if ++$user_skips > $maxuserskips; + mydie "too many dlls skipped by user request (>$maxuserskips at $module)" if ++$user_skips > $maxuserskips; } } @@ -365,8 +365,8 @@ while (<IN>) { { $testbox->{data} .= "<div class=\"test result skipped\">Skipped by user request.</div>\n"; print SUM "- $dll $unit skipped - - - $source $rev\n"; + mydie "too many test units skipped by user request (>$maxuserskips at $dll:$unit)" if ++$user_skips > $maxuserskips; $dll = undef; - mydie "too many tests skipped by user request" if ++$user_skips > $maxuserskips; } } elsif (/^((?:[0-9a-f]+:)?$unit: (\d+) tests executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\.)\r?$/) { $lines++; @@ -388,11 +388,11 @@ while (<IN>) { if ($1 == 258) { $reason = "test failed: timed out"; } elsif ($1 < 0) { $reason = "test failed: crash"; } $testbox->{data} .= "<div class=\"test end\">$reason</div>\n"; - mydie "too many test failures" if ++$failed_tests > $maxfailedtests; + mydie "too many failed test units (>$maxfailedtests at $dll:$unit)" if ++$failed_tests > $maxfailedtests; } else { $result = "$total $todo $failed $skipped"; if ($failed && ++$failed_tests > $maxfailedtests) { - mydie "too many test failures"; + mydie "too many failed test units (>$maxfailedtests at $dll:$unit)"; } } print SUM "- $dll $unit $result $source $rev\n"; @@ -422,9 +422,9 @@ while (<IN>) { if (defined $dll) { # Either winetest crashed or the report file was cut off if ($filesize == $maxfilesize) { - mydie "report reached file limit (runaway test?)"; + mydie "report reached file size limit (>$maxfilesize bytes at $dll:$unit, runaway test?)"; } else { - mydie "report truncated (winetest crash?)"; + mydie "report truncated at $dll:$unit (winetest crash?)"; } } close SUM or mydie "error writing to '$tmpdir/summary.txt': $!";

1 0

Owen Rudge : wsdapi: Implement AddNameToNamespace.
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: 9bf2f6b2afccd5342e7cc105f8a960e8eedb719e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bf2f6b2afccd5342e7cc105f… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue May 30 23:05:50 2017 +0100 wsdapi: Implement AddNameToNamespace. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/xml.c | 20 ++++----- dlls/wsdapi/xml.c | 113 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 121 insertions(+), 12 deletions(-) diff --git a/dlls/wsdapi/tests/xml.c b/dlls/wsdapi/tests/xml.c index 68742fe..c83f07b 100644 --- a/dlls/wsdapi/tests/xml.c +++ b/dlls/wsdapi/tests/xml.c @@ -413,24 +413,24 @@ static void XMLContext_AddNameToNamespace_tests(void) /* Test calling AddNameToNamespace with invalid arguments */ hr = IWSDXMLContext_AddNameToNamespace(context, NULL, NULL, NULL); - todo_wine ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08x\n", hr); + ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08x\n", hr); hr = IWSDXMLContext_AddNameToNamespace(context, ns1Uri, NULL, NULL); - todo_wine ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08x\n", hr); + ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08x\n", hr); hr = IWSDXMLContext_AddNameToNamespace(context, NULL, name1Text, NULL); - todo_wine ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08x\n", hr); + ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08x\n", hr); /* Test calling AddNameToNamespace without the ppName parameter */ hr = IWSDXMLContext_AddNameToNamespace(context, ns1Uri, name1Text, NULL); - todo_wine ok(hr == S_OK, "AddNameToNamespace failed with %08x\n", hr); + ok(hr == S_OK, "AddNameToNamespace failed with %08x\n", hr); /* Now retrieve the created name */ hr = IWSDXMLContext_AddNameToNamespace(context, ns1Uri, name1Text, &name1); - todo_wine ok(hr == S_OK, "AddNameToNamespace failed with %08x\n", hr); + ok(hr == S_OK, "AddNameToNamespace failed with %08x\n", hr); /* Check the returned structure */ - todo_wine ok(name1 != NULL, "name1 == NULL\n"); + ok(name1 != NULL, "name1 == NULL\n"); if (name1 != NULL) { @@ -447,10 +447,10 @@ static void XMLContext_AddNameToNamespace_tests(void) /* Test calling AddNamespace with parameters that are too large */ hr = IWSDXMLContext_AddNameToNamespace(context, largeText, name1Text, &name2); - todo_wine ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08x\n", hr); + ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08x\n", hr); hr = IWSDXMLContext_AddNameToNamespace(context, ns1Uri, largeText, &name2); - todo_wine ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08x\n", hr); + ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08x\n", hr); /* Try creating a namespace explicitly */ hr = IWSDXMLContext_AddNamespace(context, ns2Uri, prefix2, &ns2); @@ -458,10 +458,10 @@ static void XMLContext_AddNameToNamespace_tests(void) /* Now add a name to it */ hr = IWSDXMLContext_AddNameToNamespace(context, ns2Uri, name2Text, &name2); - todo_wine ok(hr == S_OK, "AddNameToNamespace failed with %08x\n", hr); + ok(hr == S_OK, "AddNameToNamespace failed with %08x\n", hr); /* Check the returned structure */ - todo_wine ok(name2 != NULL, "name2 == NULL\n"); + ok(name2 != NULL, "name2 == NULL\n"); if (name2 != NULL) { diff --git a/dlls/wsdapi/xml.c b/dlls/wsdapi/xml.c index 9fba638..a6d0b07 100644 --- a/dlls/wsdapi/xml.c +++ b/dlls/wsdapi/xml.c @@ -270,6 +270,64 @@ static WSDXML_NAMESPACE *find_namespace(struct list *namespaces, LPCWSTR uri) return NULL; } +static WSDXML_NAME *find_name(WSDXML_NAMESPACE *ns, LPCWSTR name) +{ + int i; + + for (i = 0; i < ns->NamesCount; i++) + { + if (lstrcmpW(ns->Names[i].LocalName, name) == 0) + { + return &ns->Names[i]; + } + } + + return NULL; +} + +static WSDXML_NAME *add_name(WSDXML_NAMESPACE *ns, LPCWSTR name) +{ + WSDXML_NAME *names; + WSDXML_NAME *newName; + int i; + + names = WSDAllocateLinkedMemory(ns, sizeof(WSDXML_NAME) * (ns->NamesCount + 1)); + + if (names == NULL) + { + return NULL; + } + + if (ns->NamesCount > 0) + { + /* Copy the existing names array over to the new allocation */ + memcpy(names, ns->Names, sizeof(WSDXML_NAME) * ns->NamesCount); + + for (i = 0; i < ns->NamesCount; i++) + { + /* Attach the local name memory to the new names allocation */ + WSDAttachLinkedMemory(names, names[i].LocalName); + } + + WSDFreeLinkedMemory(ns->Names); + } + + ns->Names = names; + + newName = &names[ns->NamesCount]; + + newName->LocalName = duplicate_string(names, name); + newName->Space = ns; + + if (newName->LocalName == NULL) + { + return NULL; + } + + ns->NamesCount++; + return newName; +} + static BOOL is_prefix_unique(struct list *namespaces, LPCWSTR prefix) { struct xmlNamespace *ns; @@ -461,8 +519,59 @@ static HRESULT WINAPI IWSDXMLContextImpl_AddNamespace(IWSDXMLContext *iface, LPC static HRESULT WINAPI IWSDXMLContextImpl_AddNameToNamespace(IWSDXMLContext *iface, LPCWSTR pszUri, LPCWSTR pszName, WSDXML_NAME **ppName) { - FIXME("(%p, %s, %s, %p)\n", iface, debugstr_w(pszUri), debugstr_w(pszName), ppName); - return E_NOTIMPL; + IWSDXMLContextImpl *This = impl_from_IWSDXMLContext(iface); + WSDXML_NAMESPACE *ns; + WSDXML_NAME *name; + + TRACE("(%p, %s, %s, %p)\n", This, debugstr_w(pszUri), debugstr_w(pszName), ppName); + + if ((pszUri == NULL) || (pszName == NULL) || (lstrlenW(pszUri) > WSD_MAX_TEXT_LENGTH) || (lstrlenW(pszName) > WSD_MAX_TEXT_LENGTH)) + { + return E_INVALIDARG; + } + + ns = find_namespace(This->namespaces, pszUri); + + if (ns == NULL) + { + /* The namespace doesn't exist, add it */ + ns = add_namespace(This->namespaces, pszUri); + + if (ns == NULL) + { + return E_OUTOFMEMORY; + } + + ns->PreferredPrefix = generate_namespace_prefix(This, ns, pszUri); + if (ns->PreferredPrefix == NULL) + { + return E_FAIL; + } + } + + name = find_name(ns, pszName); + + if (name == NULL) + { + name = add_name(ns, pszName); + + if (name == NULL) + { + return E_OUTOFMEMORY; + } + } + + if (ppName != NULL) + { + *ppName = duplicate_name(NULL, name); + + if (*ppName == NULL) + { + return E_OUTOFMEMORY; + } + } + + return S_OK; } static HRESULT WINAPI IWSDXMLContextImpl_SetNamespaces(IWSDXMLContext *iface, const PCWSDXML_NAMESPACE *pNamespaces, WORD wNamespacesCount, BYTE bLayerNumber)

1 0

Owen Rudge : wsdapi: Create default XML context in WSDCreateDiscoveryPublisher if required.
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: 9c9180f60677f05824e10f604952a95699dcf5cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c9180f60677f05824e10f604… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue May 30 23:05:56 2017 +0100 wsdapi: Create default XML context in WSDCreateDiscoveryPublisher if required. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/discovery.c | 12 ++++++++-- dlls/wsdapi/tests/discovery.c | 51 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 2 deletions(-) diff --git a/dlls/wsdapi/discovery.c b/dlls/wsdapi/discovery.c index ea0f34b..c9ef9c2 100644 --- a/dlls/wsdapi/discovery.c +++ b/dlls/wsdapi/discovery.c @@ -360,10 +360,18 @@ HRESULT WINAPI WSDCreateDiscoveryPublisher(IWSDXMLContext *pContext, IWSDiscover obj->IWSDiscoveryPublisher_iface.lpVtbl = &publisher_vtbl; obj->ref = 1; - obj->xmlContext = pContext; - if (pContext != NULL) + if (pContext == NULL) { + if (FAILED(WSDXMLCreateContext(&obj->xmlContext))) + { + WARN("Unable to create XML context\n"); + return E_OUTOFMEMORY; + } + } + else + { + obj->xmlContext = pContext; IWSDXMLContext_AddRef(pContext); } diff --git a/dlls/wsdapi/tests/discovery.c b/dlls/wsdapi/tests/discovery.c index ffe64b0..db5947d 100644 --- a/dlls/wsdapi/tests/discovery.c +++ b/dlls/wsdapi/tests/discovery.c @@ -162,6 +162,56 @@ static void CreateDiscoveryPublisher_tests(void) ok(ref == 0, "IWSDiscoveryPublisher_Release() has %d references, should have 0\n", ref); } +static void CreateDiscoveryPublisher_XMLContext_tests(void) +{ + IWSDiscoveryPublisher *publisher = NULL; + IWSDXMLContext *xmlContext, *returnedContext; + HRESULT rc; + int ref; + + /* Test creating an XML context and supplying it to WSDCreateDiscoveryPublisher */ + rc = WSDXMLCreateContext(&xmlContext); + ok(rc == S_OK, "WSDXMLCreateContext failed: %08x\n", rc); + + rc = WSDCreateDiscoveryPublisher(xmlContext, &publisher); + ok(rc == S_OK, "WSDCreateDiscoveryPublisher(xmlContext, &publisher) failed: %08x\n", rc); + ok(publisher != NULL, "WSDCreateDiscoveryPublisher(xmlContext, &publisher) failed: publisher == NULL\n"); + + rc = IWSDiscoveryPublisher_GetXMLContext(publisher, NULL); + ok(rc == E_INVALIDARG, "GetXMLContext returned unexpected value with NULL argument: %08x\n", rc); + + rc = IWSDiscoveryPublisher_GetXMLContext(publisher, &returnedContext); + ok(rc == S_OK, "GetXMLContext failed: %08x\n", rc); + + ok(xmlContext == returnedContext, "GetXMLContext returned unexpected value: returnedContext == %p\n", returnedContext); + + ref = IWSDXMLContext_Release(returnedContext); + ok(ref == 2, "IWSDXMLContext_Release() has %d references, should have 2\n", ref); + + ref = IWSDiscoveryPublisher_Release(publisher); + ok(ref == 0, "IWSDiscoveryPublisher_Release() has %d references, should have 0\n", ref); + + ref = IWSDXMLContext_Release(returnedContext); + ok(ref == 0, "IWSDXMLContext_Release() has %d references, should have 0\n", ref); + + /* Test using a default XML context */ + publisher = NULL; + returnedContext = NULL; + + rc = WSDCreateDiscoveryPublisher(NULL, &publisher); + ok(rc == S_OK, "WSDCreateDiscoveryPublisher(NULL, &publisher) failed: %08x\n", rc); + ok(publisher != NULL, "WSDCreateDiscoveryPublisher(NULL, &publisher) failed: publisher == NULL\n"); + + rc = IWSDiscoveryPublisher_GetXMLContext(publisher, &returnedContext); + ok(rc == S_OK, "GetXMLContext failed: %08x\n", rc); + + ref = IWSDXMLContext_Release(returnedContext); + ok(ref == 1, "IWSDXMLContext_Release() has %d references, should have 1\n", ref); + + ref = IWSDiscoveryPublisher_Release(publisher); + ok(ref == 0, "IWSDiscoveryPublisher_Release() has %d references, should have 0\n", ref); +} + static void Publish_tests(void) { IWSDiscoveryPublisher *publisher = NULL; @@ -231,6 +281,7 @@ START_TEST(discovery) CoInitialize(NULL); CreateDiscoveryPublisher_tests(); + CreateDiscoveryPublisher_XMLContext_tests(); Publish_tests(); CoUninitialize();

1 0