wine-commits July 2017

wine-commits@winehq.org

2 participants
632 discussions

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 13 Jul '17

13 Jul '17

Module: wine Branch: master Commit: e7860b12f72531c298d65a53488235f6e00aec7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7860b12f72531c298d65a534… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 13 10:23:29 2017 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 54 ++++++------------------------------------------------ 1 file changed, 6 insertions(+), 48 deletions(-) diff --git a/po/ru.po b/po/ru.po index 495b1c2..f37831a 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-07-11 13:16+0300\n" +"PO-Revision-Date: 2017-07-13 09:32+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" @@ -12376,38 +12376,6 @@ msgid "Unable to import %1. The specified file is not a valid registry file." msgstr "Не удалось импортировать «%1». Некорректный файл реестра." #: regedit.rc:408 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " regedit [options] [filename] [reg_key]\n" -#| "\n" -#| "Options:\n" -#| " [no option] Launch the graphical version of this program.\n" -#| " /L:system.dat The location of the system.dat file to be modified.\n" -#| " Compatible with any other switch. Ignored.\n" -#| " /R:user.dat The location of the user.dat file to be modified.\n" -#| " Compatible with any other switch. Ignored.\n" -#| " /C Import the contents of a registry file.\n" -#| " /D Delete a specified registry key.\n" -#| " /E Export the contents of a specified registry key to a " -#| "file.\n" -#| " If no key is specified, the entire registry is " -#| "exported.\n" -#| " /S Silent mode. No messages will be displayed.\n" -#| " /V Launch the GUI in advanced mode. Ignored.\n" -#| " /? Display this information and exit.\n" -#| " [filename] The location of the file containing registry information " -#| "to\n" -#| " be imported. When used with [/E], this option specifies " -#| "the\n" -#| " file location where registry information will be " -#| "exported.\n" -#| " [reg_key] The registry key to be modified.\n" -#| "\n" -#| "Usage examples:\n" -#| " regedit \"import.reg\"\n" -#| " regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" -#| " regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" msgid "" "Usage:\n" " regedit [options] [filename] [reg_key]\n" @@ -12462,7 +12430,7 @@ msgstr "" "Примеры использования:\n" " regedit \"import.reg\"\n" " regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" -" regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" +" regedit /D \"HKEY_LOCAL_MACHINE\\Key\\Path\"\n" #: regedit.rc:409 msgid "regedit: Invalid or unrecognized switch [%1]\n" @@ -12533,21 +12501,17 @@ msgid "regedit: Unable to open the registry key '%1'.\n" msgstr "regedit: не удалось открыть ключ «%1».\n" #: regedit.rc:425 -#, fuzzy -#| msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" msgid "" "regedit: Unsupported registry data type [0x%1!x!] encountered in '%2'.\n" -msgstr "regedit: «%2» содержит неподдерживаемый тип данных [%1].\n" +msgstr "regedit: «%2» содержит неподдерживаемый тип данных [0x%1!x!].\n" #: regedit.rc:426 msgid "regedit: The registry value '%1' will be exported as binary data.\n" msgstr "regedit: значение «%1» будет экспортировано в бинарном виде.\n" #: regedit.rc:427 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "regedit: Invalid system key [%1]\n" -msgstr "reg: неверное имя раздела\n" +msgstr "regedit: неверный системный ключ [%1]\n" #: regedit.rc:428 msgid "" @@ -12555,10 +12519,8 @@ msgid "" msgstr "regedit: не удалось экспортировать «%1». Указанный ключ не найден.\n" #: regedit.rc:429 -#, fuzzy -#| msgid "regedit: Unable to delete the registry class '%1'.\n" msgid "regedit: Unable to delete the registry key '%1'.\n" -msgstr "regedit: не удалось удалить класс «%1».\n" +msgstr "regedit: не удалось удалить ключ «%1».\n" #: regedit.rc:431 msgid "regedit: The line contains invalid syntax.\n" @@ -12705,13 +12667,9 @@ msgid "Confirm Key Delete" msgstr "Подтверждение удаления ключа" #: regedit.rc:213 -#, fuzzy -#| msgid "" -#| "Are you sure you want to delete the registry key '%1' and all of its " -#| "subkeys?" msgid "" "Are you sure you want to delete this registry key and all of its subkeys?" -msgstr "Вы точно хотите удалить ключ реестра «%1» и все вложенные ключи?" +msgstr "Вы точно хотите удалить этот ключ реестра и все вложенные ключи?" #: regedit.rc:199 msgid "Expands or collapses the selected node"

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 13 Jul '17

13 Jul '17

Module: wine Branch: master Commit: a4f5b240e78d5fbc73179ca5ec1b75f6fbc84309 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4f5b240e78d5fbc73179ca5e… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Thu Jul 13 09:11:21 2017 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 55 +++++++------------------------------------------------ 1 file changed, 7 insertions(+), 48 deletions(-) diff --git a/po/lt.po b/po/lt.po index d6d3fbd..bc66381 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-07-11 12:11+0300\n" +"PO-Revision-Date: 2017-07-13 09:10+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -12380,38 +12380,6 @@ msgstr "" "Nepavyko importuoti %1. Nurodytas failas nėra teisingas registro failas." #: regedit.rc:408 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " regedit [options] [filename] [reg_key]\n" -#| "\n" -#| "Options:\n" -#| " [no option] Launch the graphical version of this program.\n" -#| " /L:system.dat The location of the system.dat file to be modified.\n" -#| " Compatible with any other switch. Ignored.\n" -#| " /R:user.dat The location of the user.dat file to be modified.\n" -#| " Compatible with any other switch. Ignored.\n" -#| " /C Import the contents of a registry file.\n" -#| " /D Delete a specified registry key.\n" -#| " /E Export the contents of a specified registry key to a " -#| "file.\n" -#| " If no key is specified, the entire registry is " -#| "exported.\n" -#| " /S Silent mode. No messages will be displayed.\n" -#| " /V Launch the GUI in advanced mode. Ignored.\n" -#| " /? Display this information and exit.\n" -#| " [filename] The location of the file containing registry information " -#| "to\n" -#| " be imported. When used with [/E], this option specifies " -#| "the\n" -#| " file location where registry information will be " -#| "exported.\n" -#| " [reg_key] The registry key to be modified.\n" -#| "\n" -#| "Usage examples:\n" -#| " regedit \"import.reg\"\n" -#| " regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" -#| " regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" msgid "" "Usage:\n" " regedit [options] [filename] [reg_key]\n" @@ -12466,7 +12434,7 @@ msgstr "" "Naudojimo pavyzdžiai:\n" " regedit \"importui.reg\"\n" " regedit /E \"eksportuota.reg\" \"HKEY_CURRENT_USER\\Console\"\n" -" regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" +" regedit /D \"HKEY_LOCAL_MACHINE\\Raktas\\Kelias\"\n" #: regedit.rc:409 msgid "regedit: Invalid or unrecognized switch [%1]\n" @@ -12537,11 +12505,10 @@ msgid "regedit: Unable to open the registry key '%1'.\n" msgstr "regedit: Nepavyko atverti registro rakto „%1“.\n" #: regedit.rc:425 -#, fuzzy -#| msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" msgid "" "regedit: Unsupported registry data type [0x%1!x!] encountered in '%2'.\n" -msgstr "regedit: Nepalaikomas registro duomenų tipas [%1] sutiktas „%2“.\n" +msgstr "" +"regedit: Nepalaikomas registro duomenų tipas [0x%1!x!] sutiktas „%2“.\n" #: regedit.rc:426 msgid "regedit: The registry value '%1' will be exported as binary data.\n" @@ -12549,10 +12516,8 @@ msgstr "" "regedit: Registro reikšmė „%1“ bus eksportuota kaip dvejetainiai duomenys.\n" #: regedit.rc:427 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "regedit: Invalid system key [%1]\n" -msgstr "reg: Netinkamas rakto vardas\n" +msgstr "regedit: Netinkamas sisteminis raktas [%1]\n" #: regedit.rc:428 msgid "" @@ -12561,10 +12526,8 @@ msgstr "" "regedit: Nepavyko eksportuoti „%1“. Nurodytas registro raktas nerastas.\n" #: regedit.rc:429 -#, fuzzy -#| msgid "regedit: Unable to delete the registry class '%1'.\n" msgid "regedit: Unable to delete the registry key '%1'.\n" -msgstr "regedit: Nepavyko pašalinti registro klasės „%1“.\n" +msgstr "regedit: Nepavyko pašalinti registro rakto „%1“.\n" #: regedit.rc:431 msgid "regedit: The line contains invalid syntax.\n" @@ -12711,13 +12674,9 @@ msgid "Confirm Key Delete" msgstr "Rakto šalinimo patvirtinimas" #: regedit.rc:213 -#, fuzzy -#| msgid "" -#| "Are you sure you want to delete the registry key '%1' and all of its " -#| "subkeys?" msgid "" "Are you sure you want to delete this registry key and all of its subkeys?" -msgstr "Ar tikrai norite pašalinti registro raktą „%1“ ir visus jo porakčius?" +msgstr "Ar tikrai norite pašalinti šį registro raktą ir visus jo porakčius?" #: regedit.rc:199 msgid "Expands or collapses the selected node"

1 0

Rosanne DiMesio : Make new distribution added notice more visible
by Jeremy Newman 13 Jul '17

13 Jul '17

Module: appdb Branch: master Commit: e878633435036dc498a0b166b6ce04bed4262251 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=e878633435036dc498a0b166… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Thu Jul 13 11:58:19 2017 -0500 Make new distribution added notice more visible Add a warning icon and background color to make the inline notice to maintainers/admins more visible on the form. Also changes one more instance of distribution to operating system. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/testData.php | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/include/testData.php b/include/testData.php index 84f87c7..cd3fc8b 100644 --- a/include/testData.php +++ b/include/testData.php @@ -811,14 +811,11 @@ class testData{ if(!$this->iDistributionId) { $sDistributionHelp = "If yours is not on the list, ". - "please add it using the form below."; + "please add it using the form below.<br>"; } else { - $sDistributionHelp = "The user added a new operating system; ". - "review it in the form below or replace ". - "it with one from the list."; + $sDistributionHelp = '<p class="bg-danger"><span class = "text-danger fa fa-exclamation-triangle" style="font-size:125%"></span> The user submitted a new operating system; please review it in the form below.</p>'; } - $sDistributionHelp .= "<br>\n"; } echo '<tr valign=top><td class="color0"><b>Operating system</b></td class="color0">',"\n"; @@ -928,7 +925,7 @@ class testData{ // No Distribution entered, and nothing in the list is selected if (empty($aValues['sDistribution']) && !$aValues['iTestDistributionId']) - $errors .= "<li>Please enter a distribution.</li>\n"; + $errors .= "<li>Please enter an operating system.</li>\n"; if (empty($aValues['sInstalls'])) $errors .= "<li>Please enter whether this application installs or not.</li>\n";

1 0

Rosanne DiMesio : Revise testData_queue outputEditor messages
by Jeremy Newman 13 Jul '17

13 Jul '17

Module: appdb Branch: master Commit: 719414b00e5eceab9d3c78f7b3acc18a35d74e6b URL: http://source.winehq.org/git/appdb.git/?a=commit;h=719414b00e5eceab9d3c78f7… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Thu Jul 13 12:35:28 2017 -0500 Revise testData_queue outputEditor messages Clarifies instructions for both users and maintainers/admins regarding adding/added distributions. Uses bootstrap alert to make the admin/maintainer message more visible. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/testData_queue.php | 39 ++++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/include/testData_queue.php b/include/testData_queue.php index 64c68b5..ee718b9 100644 --- a/include/testData_queue.php +++ b/include/testData_queue.php @@ -88,27 +88,36 @@ class testData_queue function outputEditor() { $this->oTestData->outputEditor(); + + echo "<table width='90%' border=0 cellpadding=2 cellspacing=0>\n"; + echo '<tr><td>'; - /* If we are processing queued test results with a queued distribution, - we display some additional help here */ - if($this->oDistribution->iDistributionId && - $this->oDistribution->objectGetState() != 'accepted' && $this->canEdit()) + //a new test report, not yet queued + if(!$this->oTestData->iTestingId) { - echo "The user submitted a new operating system, which will be un-queued ". - "together with the test data unless you select an existing one ". - "from the list above."; + echo '<b>Add new operating system:</b> use this form to add your operating system if it '; + echo 'is not in the dropdown list above.'; } + //queued test results with a queued distribution + if($this->oDistribution->iDistributionId && + $this->oDistribution->objectGetState() != 'accepted' + && $this->canEdit()) + { + echo '<div class="alert alert-danger" role="alert">'; + echo '<b>New operating system added:</b> You may correct this submission '; + echo 'by selecting an operating system from the list above '; + echo 'or editing the information in the textboxes below. '; + echo '</div>'; + } /* If the testData is already associated with a distribution and the distribution is un-queued, there is no need to display the - distribution form here */ - if(!$this->oTestData->iDistributionId or - $this->oDistribution->objectGetState() != 'accepted') - { - echo html_frame_start("New operating system", "90%"); - $this->oDistribution->outputEditor(); - echo html_frame_end(); - } + distribution form. */ + if(!$this->oTestData->iDistributionId || + $this->oDistribution->objectGetState() != 'accepted') + echo $this->oDistribution->outputEditor(); + + echo '</tr></td></table>'; } function getOutputEditorValues($aClean)

1 0

André Hentschel : winemaker: Remove trailing semicolon from PreprocessorDefinitions.
by Alexandre Julliard 12 Jul '17

12 Jul '17

Module: wine Branch: master Commit: 989a9dc91778c94d0cf0c769709f10dcc92a5ead URL: http://source.winehq.org/git/wine.git/?a=commit;h=989a9dc91778c94d0cf0c7697… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jul 12 19:49:06 2017 +0200 winemaker: Remove trailing semicolon from PreprocessorDefinitions. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winemaker/winemaker | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/winemaker/winemaker b/tools/winemaker/winemaker index d077061..ec5fb16 100755 --- a/tools/winemaker/winemaker +++ b/tools/winemaker/winemaker @@ -967,6 +967,7 @@ sub source_scan_project_file($$$) } if ($vc_compiler_tool->getName eq "PreprocessorDefinitions") { $configt=$vc_compiler_tool->getValue; + $configt=~s/;+$//; $configt=~s/;\s*/ -D/g; $prj_target_defines.="-D".$configt." "; }

1 0

Piotr Caban : gdiplus: Add EMF+ properties records tests.
by Alexandre Julliard 12 Jul '17

12 Jul '17

Module: wine Branch: master Commit: 9d40addbebd4a8d9bce2bb924562a8b8d503de94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d40addbebd4a8d9bce2bb924… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 11 11:42:14 2017 +0200 gdiplus: Add EMF+ properties records tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/metafile.c | 78 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index cbf63a6..2ed8355 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -2406,6 +2406,83 @@ static void test_drawimage(void) expect(Ok, stat); } +static const emfplus_record properties_records[] = { + {0, EMR_HEADER}, + {0, EmfPlusRecordTypeHeader}, + {0, EmfPlusRecordTypeSetTextRenderingHint}, + {0, EmfPlusRecordTypeSetPixelOffsetMode}, + {0, EmfPlusRecordTypeSetAntiAliasMode}, + {0, EmfPlusRecordTypeSetCompositingMode}, + {0, EmfPlusRecordTypeSetCompositingQuality}, + {0, EmfPlusRecordTypeSetInterpolationMode}, + {0, EmfPlusRecordTypeEndOfFile}, + {0, EMR_EOF}, + {0} +}; + +static void test_properties(void) +{ + static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; + static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; + + GpMetafile *metafile; + GpGraphics *graphics; + HENHMETAFILE hemf; + GpStatus stat; + HDC hdc; + + hdc = CreateCompatibleDC(0); + stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, &frame, MetafileFrameUnitPixel, description, &metafile); + expect(Ok, stat); + DeleteDC(hdc); + + stat = GdipGetImageGraphicsContext((GpImage*)metafile, &graphics); + expect(Ok, stat); + + stat = GdipSetTextRenderingHint(graphics, TextRenderingHintSystemDefault); + expect(Ok, stat); + stat = GdipSetTextRenderingHint(graphics, TextRenderingHintAntiAlias); + expect(Ok, stat); + + stat = GdipSetPixelOffsetMode(graphics, PixelOffsetModeHighQuality); + expect(Ok, stat); + stat = GdipSetPixelOffsetMode(graphics, PixelOffsetModeHighQuality); + expect(Ok, stat); + + stat = GdipSetSmoothingMode(graphics, SmoothingModeAntiAlias); + expect(Ok, stat); + stat = GdipSetSmoothingMode(graphics, SmoothingModeAntiAlias); + expect(Ok, stat); + + stat = GdipSetCompositingMode(graphics, CompositingModeSourceOver); + expect(Ok, stat); + stat = GdipSetCompositingMode(graphics, CompositingModeSourceCopy); + expect(Ok, stat); + + stat = GdipSetCompositingQuality(graphics, CompositingQualityHighQuality); + expect(Ok, stat); + stat = GdipSetCompositingQuality(graphics, CompositingQualityHighQuality); + expect(Ok, stat); + + stat = GdipSetInterpolationMode(graphics, InterpolationModeDefault); + expect(Ok, stat); + stat = GdipSetInterpolationMode(graphics, InterpolationModeHighQuality); + expect(Ok, stat); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + sync_metafile(&metafile, "properties.emf"); + + stat = GdipGetHemfFromMetafile(metafile, &hemf); + expect(Ok, stat); + + check_emfplus(hemf, properties_records, "properties"); + DeleteEnhMetaFile(hemf); + + stat = GdipDisposeImage((GpImage*)metafile); + expect(Ok, stat); +} + START_TEST(metafile) { struct GdiplusStartupInput gdiplusStartupInput; @@ -2444,6 +2521,7 @@ START_TEST(metafile) test_clipping(); test_gditransform(); test_drawimage(); + test_properties(); GdiplusShutdown(gdiplusToken); }

1 0

Piotr Caban : gdiplus: Support GdipSetInterpolationMode in metafiles.
by Alexandre Julliard 12 Jul '17

12 Jul '17

Module: wine Branch: master Commit: 29968cfdc8bab164fc5d4fe2b598d680f950cfe6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29968cfdc8bab164fc5d4fe2b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 11 10:59:23 2017 +0200 gdiplus: Support GdipSetInterpolationMode in metafiles. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 91c54d3..a56ac43 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5872,6 +5872,19 @@ GpStatus WINGDIPAPI GdipSetInterpolationMode(GpGraphics *graphics, if (mode == InterpolationModeHighQuality) mode = InterpolationModeHighQualityBicubic; + if (mode == graphics->interpolation) + return Ok; + + if (graphics->image && graphics->image->type == ImageTypeMetafile) + { + GpStatus stat; + + stat = METAFILE_AddSimpleProperty((GpMetafile*)graphics->image, + EmfPlusRecordTypeSetInterpolationMode, mode); + if (stat != Ok) + return stat; + } + graphics->interpolation = mode; return Ok;

1 0

Piotr Caban : gdiplus: Support GdipSetCompositingQuality in metafiles.
by Alexandre Julliard 12 Jul '17

12 Jul '17

Module: wine Branch: master Commit: f2483748eb0d9dd9eb19c88a353205d9cea92de4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2483748eb0d9dd9eb19c88a3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 11 10:59:19 2017 +0200 gdiplus: Support GdipSetCompositingQuality in metafiles. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 091b196..91c54d3 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5837,6 +5837,19 @@ GpStatus WINGDIPAPI GdipSetCompositingQuality(GpGraphics *graphics, if(graphics->busy) return ObjectBusy; + if(graphics->compqual == quality) + return Ok; + + if(graphics->image && graphics->image->type == ImageTypeMetafile) + { + GpStatus stat; + + stat = METAFILE_AddSimpleProperty((GpMetafile*)graphics->image, + EmfPlusRecordTypeSetCompositingQuality, quality); + if(stat != Ok) + return stat; + } + graphics->compqual = quality; return Ok;

1 0

Piotr Caban : gdiplus: Support GdipSetCompositingMode in metafiles.
by Alexandre Julliard 12 Jul '17

12 Jul '17

Module: wine Branch: master Commit: 1cecd479855c30a1023a281d6cabef1b1eb2fac0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cecd479855c30a1023a281d6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 11 10:59:13 2017 +0200 gdiplus: Support GdipSetCompositingMode in metafiles. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 277bbd2..091b196 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5808,6 +5808,19 @@ GpStatus WINGDIPAPI GdipSetCompositingMode(GpGraphics *graphics, if(graphics->busy) return ObjectBusy; + if(graphics->compmode == mode) + return Ok; + + if(graphics->image && graphics->image->type == ImageTypeMetafile) + { + GpStatus stat; + + stat = METAFILE_AddSimpleProperty((GpMetafile*)graphics->image, + EmfPlusRecordTypeSetCompositingMode, mode); + if(stat != Ok) + return stat; + } + graphics->compmode = mode; return Ok;

1 0

Piotr Caban : gdiplus: Support GdipSetSmoothingMode in metafiles.
by Alexandre Julliard 12 Jul '17

12 Jul '17

Module: wine Branch: master Commit: 910975a944ca90701381e4acd5eb02b1b345be13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=910975a944ca90701381e4acd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 11 17:51:03 2017 +0200 gdiplus: Support GdipSetSmoothingMode in metafiles. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index f20178a..277bbd2 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5972,6 +5972,20 @@ GpStatus WINGDIPAPI GdipSetSmoothingMode(GpGraphics *graphics, SmoothingMode mod if(graphics->busy) return ObjectBusy; + if(graphics->smoothing == mode) + return Ok; + + if(graphics->image && graphics->image->type == ImageTypeMetafile) { + GpStatus stat; + BOOL antialias = (mode != SmoothingModeDefault && + mode != SmoothingModeNone && mode != SmoothingModeHighSpeed); + + stat = METAFILE_AddSimpleProperty((GpMetafile*)graphics->image, + EmfPlusRecordTypeSetAntiAliasMode, (mode << 1) + antialias); + if(stat != Ok) + return stat; + } + graphics->smoothing = mode; return Ok;

1 0

← Newer
1
...
37
38
39
40
41
42
43
...
64
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2017