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

Rosanne DiMesio : Remove default text from screenshots reply edit box
by Jeremy Newman June 15, 2017

June 15, 2017

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 June 15, 2017

June 15, 2017

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 June 15, 2017

June 15, 2017

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 June 15, 2017

June 15, 2017

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 June 15, 2017

June 15, 2017

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 June 15, 2017

June 15, 2017

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 June 15, 2017

June 15, 2017

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

Hans Leidekker : webservices: Store buffer encoding and character set.
by Alexandre Julliard June 14, 2017

June 14, 2017

Module: wine Branch: master Commit: 1ba18219491aa5a03aceee1d8c2bfecaa7f5f4da URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ba18219491aa5a03aceee1d8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 14 11:07:31 2017 +0200 webservices: Store buffer encoding and character set. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/heap.c | 9 ++++-- dlls/webservices/reader.c | 59 ++++++++++++++-------------------- dlls/webservices/webservices_private.h | 10 +++--- dlls/webservices/writer.c | 42 ++++++++++++++++-------- 4 files changed, 66 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1ba18219491aa5a03acee…

1 0

Hans Leidekker : webservices: Restore the current pointer after reading ahead in read_move_to.
by Alexandre Julliard June 14, 2017

June 14, 2017

Module: wine Branch: master Commit: 087631bbbca574e718d08f09efc451cb9c2482d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=087631bbbca574e718d08f09e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 14 11:07:29 2017 +0200 webservices: Restore the current pointer after reading ahead in read_move_to. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 125c3bd..cb9dd8c 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -2999,8 +2999,10 @@ static HRESULT read_move_to( struct reader *reader, WS_MOVE_TO move, BOOL *found if (!read_end_of_data( reader )) { + struct node *saved_current = reader->current; while (reader->state != READER_STATE_EOF && (hr = read_node( reader )) == S_OK) { /* nothing */ }; if (hr != S_OK) return hr; + reader->current = saved_current; } switch (move) {

1 0

Hans Leidekker : webservices/tests: Add a test for WsCopyNode.
by Alexandre Julliard June 14, 2017

June 14, 2017

Module: wine Branch: master Commit: f2b399784d65ee849314cff2c0db2783e2fa8db3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2b399784d65ee849314cff2c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 14 11:07:28 2017 +0200 webservices/tests: Add a test for WsCopyNode. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 3bf0886..03a9788 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -136,7 +136,7 @@ static void test_WsCreateWriter(void) bytes.length = 0xdeadbeef; bytes.bytes = (BYTE *)0xdeadbeef; - size = sizeof(buffers); + size = sizeof(bytes); hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_BYTES, &bytes, size, NULL ); ok( hr == S_OK, "got %08x\n", hr ); ok( !bytes.length, "got %u\n", bytes.length ); @@ -1971,17 +1971,9 @@ static void test_WsWriteNode(void) static HRESULT set_input( WS_XML_READER *reader, const char *data, ULONG size ) { - WS_XML_READER_TEXT_ENCODING enc; - WS_XML_READER_BUFFER_INPUT input; - - enc.encoding.encodingType = WS_XML_READER_ENCODING_TYPE_TEXT; - enc.charSet = WS_CHARSET_AUTO; - - input.input.inputType = WS_XML_READER_INPUT_TYPE_BUFFER; - input.encodedData = (void *)data; - input.encodedDataSize = size; - - return WsSetInput( reader, &enc.encoding, &input.input, NULL, 0, NULL ); + WS_XML_READER_TEXT_ENCODING text = {{WS_XML_READER_ENCODING_TYPE_TEXT}, WS_CHARSET_AUTO}; + WS_XML_READER_BUFFER_INPUT buf = {{WS_XML_READER_INPUT_TYPE_BUFFER}, (void *)data, size}; + return WsSetInput( reader, &text.encoding, &buf.input, NULL, 0, NULL ); } static void test_WsCopyNode(void) @@ -2090,6 +2082,20 @@ static void test_WsCopyNode(void) ok( bufs.bufferCount == 1, "got %u\n", bufs.bufferCount ); ok( bufs.buffers != NULL, "buffers not set\n" ); + /* reader positioned at BOF, single text node */ + hr = set_input( reader, "text", sizeof("text") - 1 ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node->nodeType == WS_XML_NODE_TYPE_BOF, "got %u\n", node->nodeType ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCopyNode( writer, reader, NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + WsFreeReader( reader ); WsFreeWriter( writer ); WsFreeHeap( heap );

1 0