wine-commits June 2017

wine-commits@winehq.org

2 participants
595 discussions

Rosanne DiMesio : Remove default text from screenshots reply edit box
by Jeremy Newman 15 Jun '17

15 Jun '17

Module: appdb Branch: master Commit: 8be8ec82ab9c2af0c6935cac09164cdbbe3cbd7c URL: http://source.winehq.org/git/appdb.git/?a=commit;h=8be8ec82ab9c2af0c6935cac… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Thu Jun 15 14:13:23 2017 -0500 Remove default text from screenshots reply edit box Fixes the last remaining problem mentioned in bug 26930. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/screenshot.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/include/screenshot.php b/include/screenshot.php index 1c14aed..a2f4da2 100644 --- a/include/screenshot.php +++ b/include/screenshot.php @@ -761,11 +761,6 @@ class screenshot return TRUE; } - function getDefaultReply() - { - return appData::getDefaultReply(); - } - function display() { /* STUB */

1 0

Rosanne DiMesio : Update appdb_tables
by Jeremy Newman 15 Jun '17

15 Jun '17

Module: appdb Branch: master Commit: 9fb59dab09876f41a8476f2223735f45ec5d6c7d URL: http://source.winehq.org/git/appdb.git/?a=commit;h=9fb59dab09876f41a8476f22… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Thu Jun 15 11:52:05 2017 -0500 Update appdb_tables Common reply tags are already in the live database; also added missing drop table statements. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- tables/appdb_tables.sql | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/tables/appdb_tables.sql b/tables/appdb_tables.sql index d60ee68..d4c5b6b 100644 --- a/tables/appdb_tables.sql +++ b/tables/appdb_tables.sql @@ -13,7 +13,10 @@ drop table if exists appData; drop table if exists appBundle; drop table if exists appVotes; drop table if exists appNotes; -drop table if exists tags; +drop table if exists tags_NoteVersion_assignments; +drop table if exists commonReplies; +drop table if exists tags_CommonReply; +drop table if exists tags_CommonReply_assignments; /* @@ -217,6 +220,13 @@ create table tags_CommonReply ( key(id) ); +INSERT INTO `tags_CommonReply` (`id`, `state`, `textId`, `name`, `description`, `multipleAssignments`) VALUES +(1, 'accepted', '_show_for_version_queue', 'Show when processing versions', '', 1), +(2, 'accepted', '_show_for_application_queue', 'Show when processing applications', '', 1), +(3, 'accepted', '_show_for_screenshot', 'Show when processing screenshots', '', 1), +(4, 'accepted', '_show_for_testData_queue', 'Show when processing test results', '', 1), +(5, 'accepted', '_show_for_bug', 'Show when processing bug links', '', 1), +(6, 'accepted', '_show_for_maintainer', 'Show when processing maintainer entries', '', 1); /* * Tags for CommonReply - assignments

1 0

Rosanne DiMesio : Add updateVersionRatings function
by Jeremy Newman 15 Jun '17

15 Jun '17

Module: appdb Branch: master Commit: 55d0546e94d725687a9b58641feb14181397fe6f URL: http://source.winehq.org/git/appdb.git/?a=commit;h=55d0546e94d725687a9b5864… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Wed Jun 14 09:41:41 2017 -0500 Add updateVersionRatings function Adds a function to the control center to enable admins to force an update of the version ratings cached in the appVersion table. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- admin.php | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/admin.php b/admin.php index f38924d..79fbd58 100644 --- a/admin.php +++ b/admin.php @@ -220,13 +220,29 @@ function deleteOrphanVersions() echo "Deleted ".query_affected_rows()." orphan versions.<br>"; } +function updateVersionRatings() +{ + $hResult = version::objectGetEntries('accepted'); + + $i = 0; + while($oRow = query_fetch_object($hResult)) + { + $oVersion = new version(null, $oRow); + $oVersion->updateRatingInfo(); + $i++; + } + + echo "Updated $i entries"; +} + function showChoices() { echo '<a href="admin.php?sAction=fixNoteLinks">Fix/Show note links</a><br />'; echo '<a href="admin.php?sAction=updateAppMaintainerStates">Update application maintainer states</a><br />'; echo '<a href="admin.php?sAction=updateVersionMaintainerStates">Update version maintainer states</a><br />'; echo '<a href="admin.php?sAction=deleteOrphanComments">Delete Orphan Comments</a><br>'; - echo '<a href="admin.php?sAction=deleteOrphanVersions">Delete Orphan Versions</a><br>'; + echo '<a href="admin.php?sAction=deleteOrphanVersions">Delete Orphan Versions</a><br>'; + echo '<a href="admin.php?sAction=updateVersionRatings">Update Version Ratings</a><br>'; } switch(getInput('sAction', $aClean)) @@ -249,7 +265,11 @@ switch(getInput('sAction', $aClean)) case 'deleteOrphanVersions': deleteOrphanVersions(); - break; + break; + + case 'updateVersionRatings': + updateVersionRatings(); + break; default: showChoices();

1 0

Rosanne DiMesio : Use latest test for version rating
by Jeremy Newman 15 Jun '17

15 Jun '17

Module: appdb Branch: master Commit: d96133072376c633f3f825b731bced7703b4af2d URL: http://source.winehq.org/git/appdb.git/?a=commit;h=d96133072376c633f3f825b7… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Wed Jun 14 09:03:22 2017 -0500 Use latest test for version rating Fixes bug 19377. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> --- include/testData.php | 84 ++++++++-------------------------------------------- include/version.php | 8 ++--- 2 files changed, 16 insertions(+), 76 deletions(-) diff --git a/include/testData.php b/include/testData.php index 61b23a0..bf5b727 100644 --- a/include/testData.php +++ b/include/testData.php @@ -185,6 +185,13 @@ class testData{ $sWhatChanged .= "Tested release was changed from ". $oOldTest->sTestedRelease." to $this->sTestedRelease.\n"; } + + if($this->iStaging != $oOldTest->iStaging) + { + $bUpdateRatingInfo = true; + $sWhatChanged .= "Staging checkbox was changed from ". + $oOldTest->iStaging." to $this->iStaging.\n"; + } if($this->iVersionId != $oOldTest->iVersionId) { @@ -729,79 +736,12 @@ class testData{ /* Gets rating info for the selected version: an array with the elements 0 - Rating - 1 - Wine version - The $sDate parameter can be used to calculate the rating at a given point in time */ - public static function getRatingInfoForVersionId($iVersionId, $sDate = 'NOW()') + 1 - Wine version (including staging info)*/ + public static function getRatingInfoForVersionId($iVersionId) { - $sQuery = "SELECT testedRating,testedDate,testedRelease,staging,versions.id as versionId - FROM testResults, ?.versions WHERE - versions.value = testResults.testedRelease - AND - versions.product_id = '?' - AND versionId = '?' - AND - state = '?' - AND - TO_DAYS(testedDate) > (TO_DAYS(?) - ?) - ORDER BY versions.id DESC,testedDate DESC"; - - $hResult = query_parameters($sQuery, BUGZILLA_DB, BUGZILLA_PRODUCT_ID, $iVersionId, 'accepted', $sDate, TESTDATA_AGED_THRESHOLD); - - $aEntries = array(); - - if($hResult) - { - $iPrevRelease = 0; - $iIndex = -1; - for($i = 0; $oRow = query_fetch_object($hResult); $i++) - { - if($iPrevRelease != $oRow->versionId) - { - $iIndex++; - $iPrevRelease = $oRow->versionId; - } - - if(!$aEntries[$iIndex]) - { - $aEntries[$iIndex] = array(); - $aEntries[$iIndex][0] = 0; - $aEntries[$iIndex][1] = 0; - $aEntries[$iIndex][2] = $oRow->testedRelease; - } - - $aEntries[$iIndex][0] += testData::RatingToNumber($oRow->testedRating); - $aEntries[$iIndex][1]++; - } - } - - $sRelease = ''; - - if(sizeof($aEntries)) - { - $fRating = 0.0; - - for($i = 0; $i < sizeof($aEntries); $i++) - { - /* Discard the rating if it's the only one for that Wine version - and its score is lower than previous averages */ - if(($aEntries[$i][1] < 2) && sizeof($aEntries) > ($i+1) && ($aEntries[$i][0] < ($aEntries[$i+1][0] / $aEntries[$i+1][1]))) - continue; - - $fRating = $aEntries[$i][0] / $aEntries[$i][1]; - $sRelease = $aEntries[$i][2]; - break; - } - - $sRating = testData::NumberToRating(round($fRating, 0)); - } - - if(!$sRelease) - { - $iNewestId = testData::getNewestTestIdFromVersionId($iVersionId); - $oTestData = new testData($iNewestId); - return array($oTestData->sTestedRating, $oTestData->sTestedRelease); - } - return array($sRating,$sRelease); + $iNewestId = testData::getNewestTestIdFromVersionId($iVersionId); + $oTestData = new testData($iNewestId); + return array($oTestData->sTestedRating, ($oTestData->sTestedRelease) . ($oTestData->iStaging != 0 ? '-staging':'')); } /* retrieve the latest test result for a given version id */ diff --git a/include/version.php b/include/version.php index 2c09be7..f75b711 100644 --- a/include/version.php +++ b/include/version.php @@ -1021,11 +1021,11 @@ class version { <td>{$shVoteText}</td> </tr> <tr> - <td><b>Rating:</b></td> + <td><b>Latest Rating:</b></td> <td>{$this->sTestedRating}</td> </tr> <tr> - <td><b>Wine Version:</b></td> + <td><b>Latest Wine Version Tested:</b></td> <td>{$this->sTestedRelease}</td> </tr> </tbody> @@ -1230,11 +1230,11 @@ EOT; $oTableRow->AddTextCell("Description"); - $oTableCell = new TableCell("Rating"); + $oTableCell = new TableCell("Latest Rating"); $oTableCell->SetWidth("80"); $oTableRow->AddCell($oTableCell); - $oTableCell = new TableCell("Wine version"); + $oTableCell = new TableCell("Latest Wine version tested"); $oTableCell->SetWidth("80"); $oTableRow->AddCell($oTableCell);

1 0

Francois Gouget : testbot/TestLauncher: Constify some variables.
by Alexandre Julliard 15 Jun '17

15 Jun '17

Module: tools Branch: master Commit: 97048a6013c588651cc36cdf4ad2c9268f350979 URL: http://source.winehq.org/git/tools.git/?a=commit;h=97048a6013c588651cc36cdf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 15 01:46:42 2017 +0200 testbot/TestLauncher: Constify some variables. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/TestLauncher/TestLauncher.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/testbot/src/TestLauncher/TestLauncher.c b/testbot/src/TestLauncher/TestLauncher.c index 53590f8..2e9a62f 100644 --- a/testbot/src/TestLauncher/TestLauncher.c +++ b/testbot/src/TestLauncher/TestLauncher.c @@ -53,9 +53,9 @@ static void _ReportError(const char *Format, ...) Failures++; } -static DWORD ConvertRVAToDiskOffset(DWORD RVA, DWORD SectionHeaderCount, PIMAGE_SECTION_HEADER SectionHeaders) +static DWORD ConvertRVAToDiskOffset(DWORD RVA, DWORD SectionHeaderCount, const IMAGE_SECTION_HEADER *SectionHeaders) { - PIMAGE_SECTION_HEADER SectionHeader; + const IMAGE_SECTION_HEADER *SectionHeader; for (SectionHeader = SectionHeaders; SectionHeader < SectionHeaders + SectionHeaderCount; SectionHeader++) { @@ -66,7 +66,7 @@ static DWORD ConvertRVAToDiskOffset(DWORD RVA, DWORD SectionHeaderCount, PIMAGE_ return 0; } -static BOOL DllPresent(char *DllName) +static BOOL DllPresent(const char *DllName) { HMODULE DllModule; @@ -91,15 +91,15 @@ static BOOL DllPresent(char *DllName) * So instead we just dive into the executable's import table, determine which modules are being * imported and check if they are present. */ -static BOOL AllImportedDllsPresent(char *TestExeName) +static BOOL AllImportedDllsPresent(const char *TestExeName) { HANDLE TestExe; IMAGE_DOS_HEADER DosHeader; IMAGE_NT_HEADERS NTHeaders; - PIMAGE_DATA_DIRECTORY DataDirectoryImportTable; - PIMAGE_SECTION_HEADER SectionHeaders; - PIMAGE_IMPORT_DESCRIPTOR ImportDescriptors; - PIMAGE_IMPORT_DESCRIPTOR ImportDescriptor; + const IMAGE_DATA_DIRECTORY *DataDirectoryImportTable; + IMAGE_SECTION_HEADER *SectionHeaders; + IMAGE_IMPORT_DESCRIPTOR *ImportDescriptors; + const IMAGE_IMPORT_DESCRIPTOR *ImportDescriptor; DWORD NR; DWORD NewPos; DWORD FileOffset; @@ -157,7 +157,7 @@ static BOOL AllImportedDllsPresent(char *TestExeName) return FALSE; } - SectionHeaders = (PIMAGE_SECTION_HEADER) malloc(NTHeaders.FileHeader.NumberOfSections * sizeof(IMAGE_SECTION_HEADER)); + SectionHeaders = (IMAGE_SECTION_HEADER*) malloc(NTHeaders.FileHeader.NumberOfSections * sizeof(IMAGE_SECTION_HEADER)); if (SectionHeaders == NULL) { CloseHandle(TestExe); @@ -173,7 +173,7 @@ static BOOL AllImportedDllsPresent(char *TestExeName) return FALSE; } - ImportDescriptors = (PIMAGE_IMPORT_DESCRIPTOR) malloc(DataDirectoryImportTable->Size); + ImportDescriptors = (IMAGE_IMPORT_DESCRIPTOR*) malloc(DataDirectoryImportTable->Size); if (ImportDescriptors == NULL) { free(SectionHeaders); @@ -287,8 +287,8 @@ int main(int argc, char *argv[]) BOOL UsageError; char TestExeFullName[_MAX_PATH]; char *TestExeFileName; - char *Suffix; - char *Subtest; + const char *Suffix; + const char *Subtest; int TestArg; char *CommandLine; int CommandLen;

1 0

Francois Gouget : winetest/build-index: Report invalid build directories.
by Alexandre Julliard 15 Jun '17

15 Jun '17

Module: tools Branch: master Commit: bb3c31eae70e81e593df3a2147e4baa9a1435e50 URL: http://source.winehq.org/git/tools.git/?a=commit;h=bb3c31eae70e81e593df3a21… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 15 01:44:21 2017 +0200 winetest/build-index: Report invalid build directories. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-index | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/winetest/build-index b/winetest/build-index index 2c1cbaf..f2e3dcf 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -199,8 +199,12 @@ my @too_old; opendir(DIR, "data") or die "could not open the 'data' directory: $!"; foreach my $build (readdir(DIR)) { - next if $build =~ /^\./; - next unless $build =~ /^[-.0-9a-zA-Z]+$/; + next if ($build =~ /^(\.\.?|index\.html|errors\.html|tests)$/); + if ($build !~ /^[0-9a-f]{40}$/) + { + error("'data/$build' is not a valid build directory\n"); + next; + } next unless -f "data/$build/index.html"; my ($date, $subject) = get_build_info($build);

1 0

Francois Gouget : winetest/dissect: Better defend against truncated reports.
by Alexandre Julliard 15 Jun '17

15 Jun '17

Module: tools Branch: master Commit: b4863f82dad8b5c9bbd5dbd26fe4ec2bb21cb0f6 URL: http://source.winehq.org/git/tools.git/?a=commit;h=b4863f82dad8b5c9bbd5dbd2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 15 01:44:04 2017 +0200 winetest/dissect: Better defend against truncated reports. Avoid manipulating undef values if we prematurely reach the end-of-file. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index fc1fe40..4cb31b0 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -239,12 +239,12 @@ open IN, "<:raw", $report or mydie "could not open '$report' for reading: $!"; # - <dll> <unit> <total> <todo> <failures> <skipped> <source> <rev> open SUM, ">$tmpdir/summary.txt" or mydie "could not open '$tmpdir/summary.txt' for writing: $!"; -my $line = <IN>; +my $line = <IN> || ""; $line =~ /^Version (\d+)\r?$/ or mydie "no version header: $line"; mydie "illegal version: $1" if ($1 lt $minimum_report_version); print SUM "Version $summary_version\n"; -$line = <IN>; +$line = <IN> || ""; $line =~ /^Tests from build ([-.0-9a-zA-Z]+)\r?$/ or mydie "no build header: $line"; my $testbuild = $1; $testbuild =~ /^[0-9a-f]{40}$/ or mydie "not a valid commit id $testbuild"; @@ -257,8 +257,8 @@ my $archive = "winetest-$shortbuild.exe"; my ($date, $_subject) = get_build_info($testbuild); my $short_date = short_date($date); -$line = <IN>; -$line = <IN> if ($line =~ /^Archive: /); # ignore Archive header +$line = <IN> || ""; +$line = <IN> || "" if ($line =~ /^Archive: /); # Ignore the Archive header $line =~ /^Tag: ([-.0-9a-zA-Z]*)\r?$/ or mydie "no tag line: $line"; $tag = $1; @@ -278,15 +278,15 @@ sub create_box($$$) return $box; } -$line = <IN>; -$line =~ /^Build info:\r?$/ or mydie "no Build info header: $line"; +$line = <IN> || ""; +$line =~ /^Build info:\r?$/ or mydie "no build info header: $line"; my $box = create_box( "version", "version", "$tag $short_date information" ); $box->{data} .= "<h2>Build version</h2>\n"; $box->{data} .= "<table class=\"output\">\n"; $box->{data} .= "<tr><td>Build</td><td><a title=\"$testbuild\" href=\"$gitweb/?a=shortlog;h=$testbuild\">$shortbuild</a></td></tr>\n"; $box->{data} .= "<tr><td>Tag</td><td><a title=\"Full report\" href=\"report.html\">$tag</a></td></tr></table>\n"; $box->{data} .= "<div class=\"output\"> </div>\n"; -while ($line = <IN>) +while ($line = <IN> || "") { last if ($line !~ s/^ //); chomp $line; @@ -299,7 +299,7 @@ $box->{data} .= "<h2>Operating system version</h2>\n"; $box->{data} .= "<table class=\"output\">\n"; my ($wine, $wine_build, $major, $minor, $plid, $product, $host); -while ($line = <IN>) +while ($line = <IN> || "") { last if ($line !~ /^\s*([0-9a-zA-Z ]+)=(.*?)\r?$/); if ($1 eq "URL") { @@ -412,7 +412,7 @@ $box->{data} .= "<h2>DLL version</h2>\n"; my $skipped_units; my %dllinfo; -while ($line = <IN>) +while ($line = <IN> || "") { last if ($line !~ /^\s+([^ =]+)=(.*?)\r?$/); my ($dll, $info) = ($1, $2);

1 0

Alistair Leslie-Hughes : oleaut32: Improve support for IDispatch in VarCat.
by Alexandre Julliard 14 Jun '17

14 Jun '17

Module: wine Branch: master Commit: 538e46adea88a3d6bdadd7f762eb620cd11cbeef URL: http://source.winehq.org/git/wine.git/?a=commit;h=538e46adea88a3d6bdadd7f76… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jun 13 22:35:06 2017 +0000 oleaut32: Improve support for IDispatch in VarCat. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartest.c | 20 ++++++-- dlls/oleaut32/variant.c | 103 ++++++++++++++++++++++++------------------ 2 files changed, 76 insertions(+), 47 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index a271c50..d8a6ebf 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -6093,7 +6093,7 @@ static void test_VarCat(void) SET_EXPECT(dispatch_invoke); hres = VarCat(&left, &right, &result); - todo_wine ok(hres == S_OK, "got 0x%08x\n", hres); + ok(hres == S_OK, "got 0x%08x\n", hres); ok(V_VT(&result) == VT_BSTR, "got %d\n", V_VT(&result)); ok(SysStringLen(V_BSTR(&result)) == 0, "got %d\n", SysStringLen(V_BSTR(&result))); CHECK_CALLED(dispatch_invoke); @@ -6108,7 +6108,7 @@ static void test_VarCat(void) SET_EXPECT(dispatch_invoke); hres = VarCat(&left, &right, &result); - todo_wine ok(hres == S_OK, "got 0x%08x\n", hres); + ok(hres == S_OK, "got 0x%08x\n", hres); ok(V_VT(&result) == VT_BSTR, "got %d\n", V_VT(&result)); ok(SysStringLen(V_BSTR(&result)) == 0, "got %d\n", SysStringLen(V_BSTR(&result))); CHECK_CALLED(dispatch_invoke); @@ -6140,7 +6140,21 @@ static void test_VarCat(void) SET_EXPECT(dispatch_invoke); hres = VarCat(&left, &right, &result); - todo_wine ok(hres == E_OUTOFMEMORY, "got 0x%08x\n", hres); + ok(hres == E_OUTOFMEMORY, "got 0x%08x\n", hres); + CHECK_CALLED(dispatch_invoke); + + VariantClear(&left); + VariantClear(&right); + VariantClear(&result); + + init_test_dispatch(VT_NULL, &dispatch); + dispatch.result = DISP_E_TYPEMISMATCH; + V_VT(&right) = VT_DISPATCH; + V_DISPATCH(&right) = &dispatch.IDispatch_iface; + + SET_EXPECT(dispatch_invoke); + hres = VarCat(&left, &right, &result); + ok(hres == DISP_E_TYPEMISMATCH, "got 0x%08x\n", hres); CHECK_CALLED(dispatch_invoke); VariantClear(&left); diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 2dcded5..ee203d7 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -515,6 +515,22 @@ static inline HRESULT VARIANT_CoerceArray(VARIANTARG* pd, VARIANTARG* ps, VARTYP return DISP_E_TYPEMISMATCH; } +static HRESULT VARIANT_FetchDispatchValue(LPVARIANT pvDispatch, LPVARIANT pValue) +{ + HRESULT hres; + static DISPPARAMS emptyParams = { NULL, NULL, 0, 0 }; + + if ((V_VT(pvDispatch) & VT_TYPEMASK) == VT_DISPATCH) { + if (NULL == V_DISPATCH(pvDispatch)) return DISP_E_TYPEMISMATCH; + hres = IDispatch_Invoke(V_DISPATCH(pvDispatch), DISPID_VALUE, &IID_NULL, + LOCALE_USER_DEFAULT, DISPATCH_PROPERTYGET, &emptyParams, pValue, + NULL, NULL); + } else { + hres = DISP_E_TYPEMISMATCH; + } + return hres; +} + /****************************************************************************** * Check if a variants type is valid. */ @@ -2503,7 +2519,7 @@ HRESULT WINAPI VarCat(LPVARIANT left, LPVARIANT right, LPVARIANT out) { VARTYPE leftvt,rightvt,resultvt; HRESULT hres; - static const WCHAR sz_empty[] = {'\0'}; + leftvt = V_VT(left); rightvt = V_VT(right); @@ -2581,64 +2597,79 @@ HRESULT WINAPI VarCat(LPVARIANT left, LPVARIANT right, LPVARIANT out) else { VARIANT bstrvar_left, bstrvar_right; + VARIANT *tmp; + VARIANT fetched; + V_VT(out) = VT_BSTR; VariantInit(&bstrvar_left); VariantInit(&bstrvar_right); + VariantInit(&fetched); /* Convert left side variant to string */ if (leftvt != VT_BSTR) { - /* Fill with empty string for later concat with right side */ - if (leftvt == VT_NULL) + tmp = left; + + if(leftvt == VT_DISPATCH) { - V_VT(&bstrvar_left) = VT_BSTR; - V_BSTR(&bstrvar_left) = SysAllocString(sz_empty); + hres = VARIANT_FetchDispatchValue(left, &fetched); + if(FAILED(hres)) + goto failed; + + tmp = &fetched; } - else + + hres = VariantChangeTypeEx(&bstrvar_left,tmp,0,VARIANT_ALPHABOOL|VARIANT_LOCALBOOL,VT_BSTR); + VariantClear(&fetched); + if (hres == DISP_E_TYPEMISMATCH) { - hres = VariantChangeTypeEx(&bstrvar_left,left,0,VARIANT_ALPHABOOL|VARIANT_LOCALBOOL,VT_BSTR); - if (hres != S_OK) { - VariantClear(&bstrvar_left); - VariantClear(&bstrvar_right); - return hres; - } + V_VT(&bstrvar_left) = VT_BSTR; + V_BSTR(&bstrvar_left) = SysAllocStringLen(NULL, 0); } + else if(hres != S_OK) + goto failed; } /* convert right side variant to string */ if (rightvt != VT_BSTR) { - /* Fill with empty string for later concat with right side */ - if (rightvt == VT_NULL) + tmp = right; + + if(rightvt == VT_DISPATCH) { - V_VT(&bstrvar_right) = VT_BSTR; - V_BSTR(&bstrvar_right) = SysAllocString(sz_empty); + hres = VARIANT_FetchDispatchValue(right, &fetched); + if(FAILED(hres)) + goto failed; + + tmp = &fetched; } - else + + hres = VariantChangeTypeEx(&bstrvar_right,tmp,0,VARIANT_ALPHABOOL|VARIANT_LOCALBOOL,VT_BSTR); + VariantClear(&fetched); + if (hres == DISP_E_TYPEMISMATCH) { - hres = VariantChangeTypeEx(&bstrvar_right,right,0,VARIANT_ALPHABOOL|VARIANT_LOCALBOOL,VT_BSTR); - if (hres != S_OK) { - VariantClear(&bstrvar_left); - VariantClear(&bstrvar_right); - return hres; - } + V_VT(&bstrvar_right) = VT_BSTR; + V_BSTR(&bstrvar_right) = SysAllocStringLen(NULL, 0); } + else if(hres != S_OK) + goto failed; } /* Concat the resulting strings together */ if (leftvt == VT_BSTR && rightvt == VT_BSTR) - VarBstrCat (V_BSTR(left), V_BSTR(right), &V_BSTR(out)); + hres = VarBstrCat (V_BSTR(left), V_BSTR(right), &V_BSTR(out)); else if (leftvt != VT_BSTR && rightvt != VT_BSTR) - VarBstrCat (V_BSTR(&bstrvar_left), V_BSTR(&bstrvar_right), &V_BSTR(out)); + hres = VarBstrCat (V_BSTR(&bstrvar_left), V_BSTR(&bstrvar_right), &V_BSTR(out)); else if (leftvt != VT_BSTR && rightvt == VT_BSTR) - VarBstrCat (V_BSTR(&bstrvar_left), V_BSTR(right), &V_BSTR(out)); + hres = VarBstrCat (V_BSTR(&bstrvar_left), V_BSTR(right), &V_BSTR(out)); else if (leftvt == VT_BSTR && rightvt != VT_BSTR) - VarBstrCat (V_BSTR(left), V_BSTR(&bstrvar_right), &V_BSTR(out)); + hres = VarBstrCat (V_BSTR(left), V_BSTR(&bstrvar_right), &V_BSTR(out)); +failed: VariantClear(&bstrvar_left); VariantClear(&bstrvar_right); - return S_OK; + return hres; } } @@ -2865,22 +2896,6 @@ HRESULT WINAPI VarCmp(LPVARIANT left, LPVARIANT right, LCID lcid, DWORD flags) #undef _VARCMP } -static HRESULT VARIANT_FetchDispatchValue(LPVARIANT pvDispatch, LPVARIANT pValue) -{ - HRESULT hres; - static DISPPARAMS emptyParams = { NULL, NULL, 0, 0 }; - - if ((V_VT(pvDispatch) & VT_TYPEMASK) == VT_DISPATCH) { - if (NULL == V_DISPATCH(pvDispatch)) return DISP_E_TYPEMISMATCH; - hres = IDispatch_Invoke(V_DISPATCH(pvDispatch), DISPID_VALUE, &IID_NULL, - LOCALE_USER_DEFAULT, DISPATCH_PROPERTYGET, &emptyParams, pValue, - NULL, NULL); - } else { - hres = DISP_E_TYPEMISMATCH; - } - return hres; -} - /********************************************************************** * VarAnd [OLEAUT32.142] *

1 0

Daniel Lehman : msvcrt: Support rethrowing SEH exceptions.
by Alexandre Julliard 14 Jun '17

14 Jun '17

Module: wine Branch: master Commit: 66b65474d1106c0e5ee07b9cc097b3d0f731df79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66b65474d1106c0e5ee07b9cc… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Jun 14 11:59:19 2017 +0200 msvcrt: Support rethrowing SEH exceptions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_x86_64.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index df99153..7e9c38d 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -118,6 +118,7 @@ typedef struct { ULONG64 dest_frame; ULONG64 orig_frame; + EXCEPTION_RECORD *seh_rec; DISPATCHER_CONTEXT *dispatch; const cxx_function_descr *descr; } se_translator_ctx; @@ -350,6 +351,7 @@ static void* WINAPI call_catch_block(EXCEPTION_RECORD *rec) ULONG64 frame = rec->ExceptionInformation[1]; const cxx_function_descr *descr = (void*)rec->ExceptionInformation[2]; EXCEPTION_RECORD *prev_rec = (void*)rec->ExceptionInformation[4]; + EXCEPTION_RECORD *untrans_rec = (void*)rec->ExceptionInformation[6]; void* (__cdecl *handler)(ULONG64 unk, ULONG64 rbp) = (void*)rec->ExceptionInformation[5]; int *unwind_help = rva_to_ptr(descr->unwind_help, frame); cxx_catch_ctx ctx; @@ -370,8 +372,17 @@ static void* WINAPI call_catch_block(EXCEPTION_RECORD *rec) TRACE("detect rethrow: exception code: %x\n", prev_rec->ExceptionCode); ctx.rethrow = TRUE; - RaiseException(prev_rec->ExceptionCode, prev_rec->ExceptionFlags, - prev_rec->NumberParameters, prev_rec->ExceptionInformation); + if (untrans_rec) + { + __DestructExceptionObject(prev_rec); + RaiseException(untrans_rec->ExceptionCode, untrans_rec->ExceptionFlags, + untrans_rec->NumberParameters, untrans_rec->ExceptionInformation); + } + else + { + RaiseException(prev_rec->ExceptionCode, prev_rec->ExceptionFlags, + prev_rec->NumberParameters, prev_rec->ExceptionInformation); + } } __ENDTRY } @@ -384,12 +395,12 @@ static void* WINAPI call_catch_block(EXCEPTION_RECORD *rec) static inline BOOL cxx_is_consolidate(const EXCEPTION_RECORD *rec) { - return rec->ExceptionCode==STATUS_UNWIND_CONSOLIDATE && rec->NumberParameters==6 && + return rec->ExceptionCode==STATUS_UNWIND_CONSOLIDATE && rec->NumberParameters==7 && rec->ExceptionInformation[0]==(ULONG_PTR)call_catch_block; } -static inline void find_catch_block(EXCEPTION_RECORD *rec, ULONG64 frame, - DISPATCHER_CONTEXT *dispatch, +static inline void find_catch_block(EXCEPTION_RECORD *rec, EXCEPTION_RECORD *untrans_rec, + ULONG64 frame, DISPATCHER_CONTEXT *dispatch, const cxx_function_descr *descr, cxx_exception_type *info, ULONG64 orig_frame) { @@ -465,7 +476,7 @@ static inline void find_catch_block(EXCEPTION_RECORD *rec, ULONG64 frame, memset(&catch_record, 0, sizeof(catch_record)); catch_record.ExceptionCode = STATUS_UNWIND_CONSOLIDATE; catch_record.ExceptionFlags = EXCEPTION_NONCONTINUABLE; - catch_record.NumberParameters = 6; + catch_record.NumberParameters = 7; catch_record.ExceptionInformation[0] = (ULONG_PTR)call_catch_block; catch_record.ExceptionInformation[1] = orig_frame; catch_record.ExceptionInformation[2] = (ULONG_PTR)descr; @@ -473,6 +484,7 @@ static inline void find_catch_block(EXCEPTION_RECORD *rec, ULONG64 frame, catch_record.ExceptionInformation[4] = (ULONG_PTR)rec; catch_record.ExceptionInformation[5] = (ULONG_PTR)rva_to_ptr(catchblock->handler, dispatch->ImageBase); + catch_record.ExceptionInformation[6] = (ULONG_PTR)untrans_rec; RtlUnwindEx((void*)frame, (void*)dispatch->ControlPc, &catch_record, NULL, &context, NULL); } } @@ -493,7 +505,7 @@ static LONG CALLBACK se_translation_filter(EXCEPTION_POINTERS *ep, void *c) } exc_type = (cxx_exception_type *)rec->ExceptionInformation[2]; - find_catch_block(rec, ctx->dest_frame, ctx->dispatch, + find_catch_block(rec, ctx->seh_rec, ctx->dest_frame, ctx->dispatch, ctx->descr, exc_type, ctx->orig_frame); __DestructExceptionObject(rec); @@ -590,6 +602,7 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, ctx.dest_frame = frame; ctx.orig_frame = orig_frame; + ctx.seh_rec = rec; ctx.dispatch = dispatch; ctx.descr = descr; __TRY @@ -605,7 +618,7 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, } } - find_catch_block(rec, frame, dispatch, descr, exc_type, orig_frame); + find_catch_block(rec, NULL, frame, dispatch, descr, exc_type, orig_frame); return ExceptionContinueSearch; }

1 0

Daniel Lehman : msvcrt: Only unwind current catch block when handling nested exception.
by Alexandre Julliard 14 Jun '17

14 Jun '17

Module: wine Branch: master Commit: f1d307cae5eb72e6f1ec3fd3faaf3bcbb08f4692 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1d307cae5eb72e6f1ec3fd3f… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Jun 14 11:59:05 2017 +0200 msvcrt: Only unwind current catch block when handling nested exception. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_x86_64.c | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index fffabbb..df99153 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -306,7 +306,7 @@ static void cxx_local_unwind(ULONG64 frame, DISPATCHER_CONTEXT *dispatch, } TRACE("current level: %d, last level: %d\n", trylevel, last_level); - while (trylevel != last_level) + while (trylevel > last_level) { if (trylevel<0 || trylevel>=descr->unwind_count) { @@ -321,7 +321,7 @@ static void cxx_local_unwind(ULONG64 frame, DISPATCHER_CONTEXT *dispatch, } trylevel = unwind_table[trylevel].prev; } - unwind_help[0] = last_level; + unwind_help[0] = trylevel; } static LONG CALLBACK cxx_rethrow_filter(PEXCEPTION_POINTERS eptrs, void *c) @@ -512,6 +512,7 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, DWORD throw_func_off; void *throw_func; UINT i, j; + int unwindlevel = -1; if (descr->magic<CXX_FRAME_MAGIC_VC6 || descr->magic>CXX_FRAME_MAGIC_VC8) { @@ -545,6 +546,7 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, if (rva_to_ptr(catchblock->handler, dispatch->ImageBase) == throw_func) { TRACE("nested exception detected\n"); + unwindlevel = tryblock->end_level; orig_frame = *(ULONG64*)rva_to_ptr(catchblock->frame, frame); TRACE("setting orig_frame to %lx\n", orig_frame); } @@ -554,23 +556,11 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, if (rec->ExceptionFlags & (EH_UNWINDING|EH_EXIT_UNWIND)) { - if (cxx_is_consolidate(rec)) - { - if (rec->ExceptionFlags & EH_TARGET_UNWIND) - { - const cxx_function_descr *orig_descr = (void*)rec->ExceptionInformation[2]; - int end_level = rec->ExceptionInformation[3]; - orig_frame = rec->ExceptionInformation[1]; - - cxx_local_unwind(orig_frame, dispatch, orig_descr, end_level); - } - else if(frame == orig_frame) - cxx_local_unwind(frame, dispatch, descr, -1); - return ExceptionContinueSearch; - } - - if (frame == orig_frame) - cxx_local_unwind(frame, dispatch, descr, rec->ExceptionFlags & EH_TARGET_UNWIND ? trylevel : -1); + if (rec->ExceptionFlags & EH_TARGET_UNWIND) + cxx_local_unwind(orig_frame, dispatch, descr, + cxx_is_consolidate(rec) ? rec->ExceptionInformation[3] : trylevel); + else + cxx_local_unwind(orig_frame, dispatch, descr, unwindlevel); return ExceptionContinueSearch; } if (!descr->tryblock_count) return ExceptionContinueSearch;

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
60
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 June 2017