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

Hugh McMaster : reg: Dynamically allocate memory for the value name buffer when deleting all registry values in a specified key.
by Alexandre Julliard Aug. 8, 2017

Aug. 8, 2017

Module: wine Branch: master Commit: 8abec73530bff8129b3a4a07d196b44e8cf4fa5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8abec73530bff8129b3a4a07d… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Aug 7 12:28:44 2017 +0000 reg: Dynamically allocate memory for the value name buffer when deleting all registry values in a specified key. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index c086763..37ac193 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -482,40 +482,35 @@ static int reg_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name if (value_all) { - LPWSTR szValue; - DWORD maxValue; - DWORD count; + DWORD max_value_len = 256, value_len; + WCHAR *value_name; LONG rc; - rc = RegQueryInfoKeyW(key, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, &maxValue, NULL, NULL, NULL); - if (rc != ERROR_SUCCESS) - { - RegCloseKey(key); - output_message(STRING_GENERAL_FAILURE); - return 1; - } - maxValue++; - szValue = heap_xalloc(maxValue * sizeof(WCHAR)); + value_name = heap_xalloc(max_value_len * sizeof(WCHAR)); while (1) { - count = maxValue; - rc = RegEnumValueW(key, 0, szValue, &count, NULL, NULL, NULL, NULL); + value_len = max_value_len; + rc = RegEnumValueW(key, 0, value_name, &value_len, NULL, NULL, NULL, NULL); if (rc == ERROR_SUCCESS) { - rc = RegDeleteValueW(key, szValue); + rc = RegDeleteValueW(key, value_name); if (rc != ERROR_SUCCESS) { - heap_free(szValue); + heap_free(value_name); RegCloseKey(key); output_message(STRING_VALUEALL_FAILED, key_name); return 1; } } + else if (rc == ERROR_MORE_DATA) + { + max_value_len *= 2; + value_name = heap_xrealloc(value_name, max_value_len * sizeof(WCHAR)); + } else break; } - heap_free(szValue); + heap_free(value_name); } else if (value_name || value_empty) {

1 0

Rosanne DiMesio : Update Downloads page
by Jeremy Newman Aug. 4, 2017

Aug. 4, 2017

Module: website Branch: master Commit: ea13329d250bd6f81a16aac4836ee74db9ce0231 URL: http://source.winehq.org/git/website.git/?a=commit;h=ea13329d250bd6f81a16aa… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Fri Aug 4 14:03:24 2017 -0500 Update Downloads page Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- templates/en/download.template | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/templates/en/download.template b/templates/en/download.template index 04fa9c9..d275068 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -73,11 +73,9 @@ <b><a href="https://wiki.winehq.org/Ubuntu">Ubuntu</a></b> - WineHQ binary packages for Ubuntu 14.04, 16.04, 16.10, and 17.04</p> <p><b><a href="https://wiki.winehq.org/Debian">Debian</a></b> - - WineHQ binary packages for Debian Wheezy, Jessie, Stretch, and Sid</p> + - WineHQ binary packages for Debian Wheezy, Jessie, Stretch, Buster, and Sid</p> <p><b><a href="https://wiki.winehq.org/Fedora">Fedora</a></b> - - WineHQ binary packages for Fedora 24 and 25 </p> - <p><b><a href="https://wiki.winehq.org/Mageia">Mageia</a></b> - - WineHQ binary packages for Mageia 5</p> + - WineHQ binary packages for Fedora 24, 25, and 26 </p> <p><b><a href="https://wiki.winehq.org/MacOSX">macOS</a></b> - WineHQ binary packages for macOS 10.8 and higher</p> </div>

1 0

Rosanne DiMesio : Add admins as recipient group for contact form
by Jeremy Newman Aug. 4, 2017

Aug. 4, 2017

Module: appdb Branch: master Commit: 8774129b840d890dcbdc7993cbff485bc02dc0ac URL: http://source.winehq.org/git/appdb.git/?a=commit;h=8774129b840d890dcbdc7993… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Fri Aug 4 12:44:40 2017 -0500 Add admins as recipient group for contact form Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- contact.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/contact.php b/contact.php index 9bbb4fd..a1b5c1d 100644 --- a/contact.php +++ b/contact.php @@ -37,6 +37,13 @@ if($sRecipientGroup) if($sRecipients === FALSE) util_show_error_page_and_exit("Failed to get list of maintainers"); break; + + case 'admins'; + $sRecipientText = 'all AppDB admins'; + $sRecipients = user::getAdminEmails(); + if($sRecipients === FALSE) + util_show_error_page_and_exit("Failed to get list of admins"); + break; default: util_show_error_page_and_exit("Invalid recipient group");

1 0

Rosanne DiMesio : Add function for admin-only emails
by Jeremy Newman Aug. 4, 2017

Aug. 4, 2017

Module: appdb Branch: master Commit: a8bf13a7359cd75b355461761b8d45b906cb74fd URL: http://source.winehq.org/git/appdb.git/?a=commit;h=a8bf13a7359cd75b35546176… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Fri Aug 4 12:43:35 2017 -0500 Add function for admin-only emails Adds function getAdminEmails to handle emails meant specifically for admins and removes the check for appId/versionId from get_notify_email_address_list that was sending emails to admins when it shouldn't. Fixes bug 28661. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- cron/cleanup.php | 8 ++++---- include/error_log.php | 2 +- include/user.php | 24 ++++++++++++++++++++---- 3 files changed, 25 insertions(+), 9 deletions(-) diff --git a/cron/cleanup.php b/cron/cleanup.php index 4f44660..08ba100 100644 --- a/cron/cleanup.php +++ b/cron/cleanup.php @@ -41,7 +41,7 @@ function notifyAdminsOfCleanupStart() $sSubject = $sEmailSubject."Cleanup script starting\r\n"; $sMsg = "Appdb cleanup cron script started.\r\n"; - $sEmail = User::get_notify_email_address_list(null, null); /* get list admins */ + $sEmail = user::getAdminEmails(); /* get list admins */ if($sEmail) mail_appdb($sEmail, $sSubject, $sMsg); } @@ -71,7 +71,7 @@ function orphanVersionCheck() $sSubject = $sEmailSubject."Orphan version cleanup\r\n"; - $sEmail = User::get_notify_email_address_list(null, null); /* get list admins */ + $sEmail = user::getAdminEmails(); /* get list admins */ if($sEmail) mail_appdb($sEmail, $sSubject, $sMsg); } @@ -148,7 +148,7 @@ function removeScreenshotsWithMissingFiles() $sSubject = $sEmailSubject."Missing screenshot cleanup\r\n"; - $sEmail = User::get_notify_email_address_list(null, null); /* get list admins */ + $sEmail = user::getAdminEmails(); /* get list admins */ if($sEmail) mail_appdb($sEmail, $sSubject, $sMsg); @@ -200,7 +200,7 @@ function cleanupVotes() $iFailed++; } - $sEmails = user::get_notify_email_address_list(null, null); // only admins + $sEmails = user::getAdminEmails(); // only admins if($sEmails) { diff --git a/include/error_log.php b/include/error_log.php index 1bbbd0f..73ea208 100644 --- a/include/error_log.php +++ b/include/error_log.php @@ -64,7 +64,7 @@ class error_log function mail_admins_error_log($sSubject = "") { $sSubject .= "Database Error log\r\n"; - $sEmail = User::get_notify_email_address_list(null, null); /* get list admins */ + $sEmail = user::getAdminEmails(); /* get list admins */ $sQuery = "SELECT * from error_log WHERE deleted='0' ORDER BY submitTime"; $hResult = query_parameters($sQuery); diff --git a/include/user.php b/include/user.php index 073f6e7..ff6b0fa 100644 --- a/include/user.php +++ b/include/user.php @@ -537,11 +537,8 @@ class User { // if we didn't find this entry in the $aUserId // array then we should add it if the admin has // enabled global emails. - // If both appId and versionId are null we are especially - // requesting to email admins, so the mail should be sent - // regardless of global emails setting $oAdmin = new user($oRow->userid); - if($i === false && ($oAdmin->getPref('disable_global_emails','no') == 'no' || (!$iAppId && !$iVersionId))) + if($i === false && $oAdmin->getPref('disable_global_emails','no') == 'no') $aUserId[] = $oRow->userid; } } @@ -560,6 +557,25 @@ class User { return $sRetval; } + + public static function getAdminEmails() + { + $sRecipients = ''; + $sQuery = "SELECT DISTINCT(user_list.email) FROM user_privs, user_list WHERE + user_privs.userid = user_list.userId + AND + user_privs.priv= 'admin'"; + $hResult = query_parameters($sQuery); + if(!$hResult) + return FALSE; + for($i = 0; $oRow = query_fetch_object($hResult); $i++) + { + if($i) + $sRecipients .= ' '; + $sRecipients .= $oRow->email; + } + return $sRecipients; + } /************************/

1 0

Rosanne DiMesio : Control Center: add two functions and menu formatting
by Jeremy Newman Aug. 4, 2017

Aug. 4, 2017

Module: appdb Branch: master Commit: b931b59af4de8c59530373e38a37e451c4baf990 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=b931b59af4de8c59530373e3… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Thu Aug 3 09:04:02 2017 -0500 Control Center: add two functions and menu formatting Adds deleteInactiveMaintainers and deleteOldErrorLogs functions to the admin control center. Also formats the page menu as a list-group for improved readability. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- admin.php | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 59 insertions(+), 10 deletions(-) diff --git a/admin.php b/admin.php index f82fc2b..b608019 100644 --- a/admin.php +++ b/admin.php @@ -39,6 +39,24 @@ function updateVersionMaintainerStates() echo "Updated $i entries"; } +function deleteInactiveMaintainers() +{ + $hResult = maintainer::getInactiveMaintainers(24); + $i = 0; + while($oRow = query_fetch_object($hResult)) + { + $oMaintainer = new maintainer(null, $oRow); + $oMaintainer->delete(); + $oUser = new User($oRow->userid); + $sEmail = $oUser->sEmail; + $sSubject = "Maintainer status removed"; + $sMsg = "Your maintainer status has been removed because you have not logged into the AppDB in over 24 months."; + mail_appdb($sEmail, $sSubject, $sMsg); + $i++; + } + echo "Removed $i inactive maintainers."; +} + function fixNoteLinks() { // Notes shown for app and all versions @@ -236,6 +254,14 @@ function purgeRejectedVendors() echo "Removed " .query_affected_rows()." rejected vendors from database.<br>"; } +function deleteOldErrorLogs() +{ + $sQuery = "DELETE FROM error_log WHERE submitTime <= DATE_SUB(CURDATE(), INTERVAL '12' MONTH)"; + $hResult = query_parameters($sQuery); + + echo "Deleted " .query_affected_rows()." error log entries over 12 months old from database.<br>"; +} + function updateVersionRatings() { $hResult = version::objectGetEntries('accepted'); @@ -283,19 +309,34 @@ function viewAppdbAdmins() 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=purgeRejectedDistributions">Purge Rejected Distributions</a><br>'; - echo '<a href="admin.php?sAction=purgeRejectedVendors">Purge Rejected Vendors</a><br>'; - echo '<a href="admin.php?sAction=updateVersionRatings">Update Version Ratings</a><br>'; - echo '<a href="admin.php?sAction=viewAppdbAdmins">View AppDB Admins</a><br>'; + echo '<div class="list-group">'; + + echo '<a href="admin.php?sAction=fixNoteLinks" class="list-group-item"><h4>Fix/Show note links</h4></a>'; + + echo '<a href="admin.php?sAction=updateAppMaintainerStates" class="list-group-item"><h4>Update application maintainer states</h4></a>'; + + echo '<a href="admin.php?sAction=updateVersionMaintainerStates" class="list-group-item"><h4>Update version maintainer states</h4></a>'; + + echo '<a href="admin.php? sAction=deleteInactiveMaintainers" class="list-group-item"><h4>Delete inactive maintainers</h4></a>'; + + echo '<a href="admin.php?sAction=deleteOrphanComments" class="list-group-item"><h4>Delete orphan comments</h4></a>'; + + echo '<a href="admin.php?sAction=deleteOrphanVersions" class="list-group-item"><h4>Delete orphan versions</h4></a>'; + + echo '<a href="admin.php?sAction=purgeRejectedDistributions" class="list-group-item"><h4>Purge rejected distributions</h4></a>'; + + echo '<a href="admin.php?sAction=purgeRejectedVendors" class="list-group-item"><h4>Purge rejected vendors</h4></a>'; + + echo '<a href="admin.php?sAction=deleteOldErrorLogs" class="list-group-item"><h4>Delete Old Error Logs</h4></a>'; + + echo '<a href="admin.php?sAction=updateVersionRatings" class="list-group-item"><h4>Update version ratings</h4></a>'; + + echo '<a href="admin.php?sAction=viewAppdbAdmins" class="list-group-item"><h4>View AppDB admins</h4></a>'; + echo '</div>'; } switch(getInput('sAction', $aClean)) -{ +{ case 'updateAppMaintainerStates': updateAppMaintainerStates(); break; @@ -303,6 +344,10 @@ switch(getInput('sAction', $aClean)) case 'updateVersionMaintainerStates': updateVersionMaintainerStates(); break; + + case 'deleteInactiveMaintainers'; + deleteInactiveMaintainers(); + break; case 'fixNoteLinks': fixNoteLinks(); @@ -324,6 +369,10 @@ switch(getInput('sAction', $aClean)) purgeRejectedVendors(); break; + case 'deleteOldErrorLogs': + deleteOldErrorLogs(); + break; + case 'updateVersionRatings': updateVersionRatings(); break;

1 0

Rosanne DiMesio : Add getInactiveMaintainers function
by Jeremy Newman Aug. 4, 2017

Aug. 4, 2017

Module: appdb Branch: master Commit: f0d678e9be2df1efbc39c98ddd7e34011bb7a897 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=f0d678e9be2df1efbc39c98d… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Thu Aug 3 09:02:59 2017 -0500 Add getInactiveMaintainers function Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/maintainer.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/maintainer.php b/include/maintainer.php index f4fd822..f45c19d 100644 --- a/include/maintainer.php +++ b/include/maintainer.php @@ -545,6 +545,14 @@ class maintainer { return self::getMaintainerCountForUserId($oUser->iUserId, $bSuperMaintainer); } + + // gets maintainers who have not logged in in the specified number of months + public static function getInactiveMaintainers($iMonths) + { + $sQuery = "SELECT * FROM appMaintainers, user_list WHERE appMaintainers.userId = user_list.userid + AND stamp <= DATE_SUB(CURDATE(), INTERVAL $iMonths MONTH)"; + return query_parameters($sQuery); + } /** * get the applications and versions that this user maintains

1 0

Alexandre Julliard : Wine release 2.14
by Alexandre Julliard Aug. 3, 2017

Aug. 3, 2017

Module: website Branch: master Commit: c97958a1f1d3e73e0f3eb48602f45e31625ed20c URL: http://source.winehq.org/git/website.git/?a=commit;h=c97958a1f1d3e73e0f3eb4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 3 19:41:22 2017 +0200 Wine release 2.14 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2017080301.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2017080301.xml b/news/en/2017080301.xml new file mode 100644 index 0000000..42205bd --- /dev/null +++ b/news/en/2017080301.xml @@ -0,0 +1,16 @@ +<news> +<date>August 3, 2017</date> +<title>Wine 2.14 Released</title> +<body> +<p> The Wine development release 2.14 is now available.</p> +<p> <a href="{$root}/announce/2.14">What's new</a> in this release: +<ul> + <li>Mono engine updated with some bug fixes.</li> + <li>C++ calling convention workarounds in the IDL compiler.</li> + <li>Z-order support in the Android graphics driver.</li> + <li>Scalable mouse cursors on macOS.</li> + <li>Various bug fixes.</li> +</ul> +<p>The source is <a href="//dl.winehq.org/wine/source/2.x/wine-2.14.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</p></body></news>

1 0

Martin Storsjo : msvcrt: Export -f suffixed float functions functions on arm64.
by Alexandre Julliard Aug. 3, 2017

Aug. 3, 2017

Module: wine Branch: master Commit: a44b52d1021935e04a83080ce62f4f44f0d94b7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a44b52d1021935e04a83080ce… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Aug 2 15:21:52 2017 +0300 msvcrt: Export -f suffixed float functions functions on arm64. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-math-l1-1-0.spec | 44 ++++++++++---------- dlls/msvcr100/msvcr100.spec | 46 ++++++++++----------- dlls/msvcr110/msvcr110.spec | 48 +++++++++++----------- dlls/msvcr120/msvcr120.spec | 44 ++++++++++---------- dlls/msvcr120_app/msvcr120_app.spec | 44 ++++++++++---------- dlls/msvcr80/msvcr80.spec | 46 ++++++++++----------- dlls/msvcr90/msvcr90.spec | 44 ++++++++++---------- dlls/msvcrt/math.c | 4 +- dlls/msvcrt/msvcrt.spec | 48 +++++++++++----------- dlls/ucrtbase/ucrtbase.spec | 44 ++++++++++---------- 10 files changed, 206 insertions(+), 206 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a44b52d1021935e04a830…

1 0

Jacek Caban : msvcp: Added std::_Raise_handler implementation.
by Alexandre Julliard Aug. 3, 2017

Aug. 3, 2017

Module: wine Branch: master Commit: fa65ab3caa69f0d364e31e43caee2b4640b58b5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa65ab3caa69f0d364e31e43c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 3 16:05:30 2017 +0200 msvcp: Added std::_Raise_handler implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp100/msvcp100.spec | 4 ++-- dlls/msvcp110/msvcp110.spec | 4 ++-- dlls/msvcp120/msvcp120.spec | 4 ++-- dlls/msvcp120_app/msvcp120_app.spec | 4 ++-- dlls/msvcp140/msvcp140.spec | 4 ++-- dlls/msvcp80/msvcp80.spec | 4 ++-- dlls/msvcp90/exception.c | 2 ++ dlls/msvcp90/msvcp90.spec | 4 ++-- dlls/msvcp90/tests/misc.c | 19 +++++++++++++++++++ 9 files changed, 35 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fa65ab3caa69f0d364e31…

1 0

Nikolay Sivov : xmllite/tests: Added a test for output with code page 1200.
by Alexandre Julliard Aug. 3, 2017

Aug. 3, 2017

Module: wine Branch: master Commit: 4b6d8fb0637a95a6c3e5eb01b79af3ee05d75cad URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b6d8fb0637a95a6c3e5eb01b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 3 11:00:32 2017 +0300 xmllite/tests: Added a test for output with code page 1200. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/writer.c | 45 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 1add717..33c2f8f 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -42,6 +42,25 @@ static void _expect_ref(IUnknown *obj, ULONG ref, int line) ok_(__FILE__, line)(refcount == ref, "expected refcount %d, got %d\n", ref, refcount); } +static void check_output_raw(IStream *stream, const void *expected, SIZE_T size, int line) +{ + SIZE_T content_size; + HGLOBAL hglobal; + HRESULT hr; + char *ptr; + + hr = GetHGlobalFromStream(stream, &hglobal); + ok_(__FILE__, line)(hr == S_OK, "Failed to get the stream handle, hr %#x.\n", hr); + + content_size = GlobalSize(hglobal); + ok_(__FILE__, line)(size <= content_size, "Unexpected test output size.\n"); + ptr = GlobalLock(hglobal); + if (size <= content_size) + ok_(__FILE__, line)(!memcmp(expected, ptr, size), "Unexpected output content.\n"); + + GlobalUnlock(hglobal); +} + static void check_output(IStream *stream, const char *expected, BOOL todo, int line) { int len = strlen(expected), size; @@ -68,6 +87,7 @@ static void check_output(IStream *stream, const char *expected, BOOL todo, int l } #define CHECK_OUTPUT(stream, expected) check_output(stream, expected, FALSE, __LINE__) #define CHECK_OUTPUT_TODO(stream, expected) check_output(stream, expected, TRUE, __LINE__) +#define CHECK_OUTPUT_RAW(stream, expected, size) check_output_raw(stream, expected, size, __LINE__) static void writer_set_property(IXmlWriter *writer, XmlWriterProperty property) { @@ -377,6 +397,7 @@ static void test_writeroutput(void) static const WCHAR utf16W[] = {'u','t','f','-','1','6',0}; static const WCHAR usasciiW[] = {'u','s','-','a','s','c','i','i',0}; static const WCHAR dummyW[] = {'d','u','m','m','y',0}; + static const WCHAR utf16_outputW[] = {0xfeff,'<','a'}; IXmlWriterOutput *output; IXmlWriter *writer; IStream *stream; @@ -423,12 +444,32 @@ todo_wine ok(hr == S_OK, "got %08x\n", hr); IUnknown_Release(output); - /* Create output with meaningless code page value. */ + /* Output with codepage 1200. */ hr = CreateXmlWriter(&IID_IXmlWriter, (void **)&writer, NULL); ok(hr == S_OK, "Failed to create writer, hr %#x.\n", hr); hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Failed to create stream, hr %#x.\n", hr); + + hr = CreateXmlWriterOutputWithEncodingCodePage((IUnknown *)stream, NULL, 1200, &output); + ok(hr == S_OK, "Failed to create writer output, hr %#x.\n", hr); + + hr = IXmlWriter_SetOutput(writer, output); + ok(hr == S_OK, "Failed to set writer output, hr %#x.\n", hr); + + hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); + ok(hr == S_OK, "Write failed, hr %#x.\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); + + CHECK_OUTPUT_RAW(stream, utf16_outputW, sizeof(utf16_outputW)); + + IStream_Release(stream); + + /* Create output with meaningless code page value. */ + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "Failed to create stream, hr %#x.\n", hr); output = NULL; hr = CreateXmlWriterOutputWithEncodingCodePage((IUnknown *)stream, NULL, ~0u, &output);

1 0