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

Alexandre Julliard : ntdll: Dynamically load callback functions from the Unix library.
by Alexandre Julliard 17 Jun '20

17 Jun '20

Module: wine Branch: master Commit: c1dc5021ac2534ea7bf52246f13c19941b791efa URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1dc5021ac2534ea7bf52246… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 17 11:57:32 2020 +0200 ntdll: Dynamically load callback functions from the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 100 ++++++++++++++++++++++++---------------- dlls/ntdll/unix/server.c | 2 +- dlls/ntdll/unix/signal_arm.c | 2 +- dlls/ntdll/unix/signal_arm64.c | 4 +- dlls/ntdll/unix/signal_i386.c | 4 +- dlls/ntdll/unix/signal_x86_64.c | 4 +- dlls/ntdll/unix/thread.c | 4 +- dlls/ntdll/unix/unix_private.h | 7 ++- 8 files changed, 74 insertions(+), 53 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c1dc5021ac2534ea7bf5…

1 0

Alexandre Julliard : ntdll: Move the current directory initialization to the Unix library.
by Alexandre Julliard 17 Jun '20

17 Jun '20

Module: wine Branch: master Commit: df5e4764870e8ad1d8b206cb3475a073bc034e48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df5e4764870e8ad1d8b206cb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 17 16:19:38 2020 +0200 ntdll: Move the current directory initialization to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/directory.c | 55 --------------------------------- dlls/ntdll/env.c | 59 +----------------------------------- dlls/ntdll/ntdll_misc.h | 1 - dlls/ntdll/unix/env.c | 69 ++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/loader.c | 1 + dlls/ntdll/unix/process.c | 46 ++++++++++++++++++---------- dlls/ntdll/unix/unix_private.h | 1 + dlls/ntdll/unixlib.h | 3 +- 8 files changed, 104 insertions(+), 131 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=df5e4764870e8ad1d8b2…

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 17 Jun '20

17 Jun '20

Module: wine Branch: master Commit: 36bdf3dbb197f608f925dfc86ebb8c5298307409 URL: https://source.winehq.org/git/wine.git/?a=commit;h=36bdf3dbb197f608f925dfc8… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Wed Jun 17 12:10:50 2020 +0300 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/po/fi.po b/po/fi.po index 5dded3a08b..1c0563a46a 100644 --- a/po/fi.po +++ b/po/fi.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-12-30 02:40+0200\n" +"PO-Revision-Date: 2020-06-17 12:10+0300\n" "Last-Translator: Lauri Kenttä <lauri.kentta(a)gmail.com>\n" "Language-Team: Finnish\n" "Language: fi\n" @@ -3608,7 +3608,7 @@ msgstr "Peliohjaimet" #: joy.rc:32 msgid "Test and configure game controllers." -msgstr "" +msgstr "Testaa ja säädä peliohjaimia." #: jscript.rc:28 msgid "Error converting object to primitive type" @@ -3623,10 +3623,8 @@ msgid "Subscript out of range" msgstr "Indeksi alueen ulkopuolella" #: jscript.rc:31 -#, fuzzy -#| msgid "Out of paper; " msgid "Out of stack space" -msgstr "Paperi loppu; " +msgstr "Pinosta loppui tila" #: jscript.rc:32 msgid "Object required" @@ -3765,16 +3763,12 @@ msgid "JScript object expected" msgstr "Odotettiin JScript-objektia" #: jscript.rc:63 -#, fuzzy -#| msgid "Array object expected" msgid "Enumerator object expected" -msgstr "Odotettiin taulukkoa" +msgstr "Odotettiin Enumerator-objektia" #: jscript.rc:64 -#, fuzzy -#| msgid "Boolean object expected" msgid "Regular Expression object expected" -msgstr "Odotettiin totuusarvoa" +msgstr "Odotettiin säännöllistä lauseketta" #: jscript.rc:65 msgid "Syntax error in regular expression"

1 0

Nikolay Sivov : dwrite: Simplify single substitution handler.
by Alexandre Julliard 17 Jun '20

17 Jun '20

Module: wine Branch: master Commit: a13469374fa80ae583bdc52f858e8f1ce5d5b6ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=a13469374fa80ae583bdc52f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 17 14:47:51 2020 +0300 dwrite: Simplify single substitution handler. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 05ef7d76cd..c0a29d08df 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4793,38 +4793,33 @@ static void opentype_layout_replace_glyph(struct scriptshaping_context *context, static BOOL opentype_layout_apply_gsub_single_substitution(struct scriptshaping_context *context, const struct lookup *lookup, unsigned int subtable_offset) { - const struct dwrite_fonttable *gsub = &context->table->table; + const struct dwrite_fonttable *table = &context->table->table; UINT16 format, coverage, orig_glyph, glyph; - unsigned int idx, coverage_index; + unsigned int coverage_index; - idx = context->cur; - orig_glyph = glyph = context->u.subst.glyphs[idx]; + orig_glyph = glyph = context->u.subst.glyphs[context->cur]; - format = table_read_be_word(gsub, subtable_offset); + format = table_read_be_word(table, subtable_offset); - coverage = table_read_be_word(gsub, subtable_offset + FIELD_OFFSET(struct ot_gsub_singlesubst_format1, coverage)); + coverage = table_read_be_word(table, subtable_offset + FIELD_OFFSET(struct ot_gsub_singlesubst_format1, coverage)); if (format == 1) { - const struct ot_gsub_singlesubst_format1 *format1 = table_read_ensure(gsub, subtable_offset, sizeof(*format1)); - - coverage_index = opentype_layout_is_glyph_covered(gsub, subtable_offset + coverage, glyph); - if (coverage_index == GLYPH_NOT_COVERED) - return FALSE; + coverage_index = opentype_layout_is_glyph_covered(table, subtable_offset + coverage, glyph); + if (coverage_index == GLYPH_NOT_COVERED) return FALSE; - glyph = orig_glyph + GET_BE_WORD(format1->delta); + glyph = orig_glyph + table_read_be_word(table, subtable_offset + FIELD_OFFSET(struct ot_gsub_singlesubst_format1, delta)); } else if (format == 2) { - UINT16 count = table_read_be_word(gsub, subtable_offset + FIELD_OFFSET(struct ot_gsub_singlesubst_format2, count)); - const struct ot_gsub_singlesubst_format2 *format2 = table_read_ensure(gsub, subtable_offset, - FIELD_OFFSET(struct ot_gsub_singlesubst_format2, count) + count * sizeof(UINT16)); + coverage_index = opentype_layout_is_glyph_covered(table, subtable_offset + coverage, glyph); + if (coverage_index == GLYPH_NOT_COVERED) return FALSE; - coverage_index = opentype_layout_is_glyph_covered(gsub, subtable_offset + coverage, glyph); - if (coverage_index == GLYPH_NOT_COVERED || coverage_index >= count) + if (!table_read_array_be_word(table, subtable_offset + FIELD_OFFSET(struct ot_gsub_singlesubst_format2, count), + coverage_index, &glyph)) + { return FALSE; - - glyph = GET_BE_WORD(format2->substitutes[coverage_index]); + } } else {

1 0

Nikolay Sivov : dwrite: Simplify multiple substitution handler.
by Alexandre Julliard 17 Jun '20

17 Jun '20

Module: wine Branch: master Commit: 78ea46f6a908656e4958aabfd5951f4332722c8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=78ea46f6a908656e4958aabf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 17 14:47:52 2020 +0300 dwrite: Simplify multiple substitution handler. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index c0a29d08df..e729be9b20 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4862,37 +4862,34 @@ static BOOL opentype_layout_gsub_ensure_buffer(struct scriptshaping_context *con static BOOL opentype_layout_apply_gsub_mult_substitution(struct scriptshaping_context *context, const struct lookup *lookup, unsigned int subtable_offset) { - const struct dwrite_fonttable *gsub = &context->table->table; - UINT16 format, coverage, glyph, seq_count, glyph_count; - const struct ot_gsub_multsubst_format1 *format1; + const struct dwrite_fonttable *table = &context->table->table; + UINT16 format, coverage, glyph, glyph_count; unsigned int i, idx, coverage_index; const UINT16 *glyphs; idx = context->cur; glyph = context->u.subst.glyphs[idx]; - format = table_read_be_word(gsub, subtable_offset); + format = table_read_be_word(table, subtable_offset); - coverage = table_read_be_word(gsub, subtable_offset + FIELD_OFFSET(struct ot_gsub_multsubst_format1, coverage)); + coverage = table_read_be_word(table, subtable_offset + FIELD_OFFSET(struct ot_gsub_multsubst_format1, coverage)); if (format == 1) { - coverage_index = opentype_layout_is_glyph_covered(gsub, subtable_offset + coverage, glyph); - if (coverage_index == GLYPH_NOT_COVERED) - return FALSE; - - seq_count = table_read_be_word(gsub, subtable_offset + FIELD_OFFSET(struct ot_gsub_multsubst_format1, seq_count)); + UINT16 seq_offset; - format1 = table_read_ensure(gsub, subtable_offset, FIELD_OFFSET(struct ot_gsub_multsubst_format1, seq[seq_count])); + coverage_index = opentype_layout_is_glyph_covered(table, subtable_offset + coverage, glyph); + if (coverage_index == GLYPH_NOT_COVERED) return FALSE; - if (!seq_count || seq_count <= coverage_index || !format1) + if (!table_read_array_be_word(table, subtable_offset + FIELD_OFFSET(struct ot_gsub_multsubst_format1, seq_count), + coverage_index, &seq_offset)) + { return FALSE; + } - glyph_count = table_read_be_word(gsub, subtable_offset + GET_BE_WORD(format1->seq[coverage_index])); + glyph_count = table_read_be_word(table, subtable_offset + seq_offset); - glyphs = table_read_ensure(gsub, subtable_offset + GET_BE_WORD(format1->seq[coverage_index]) + 2, - glyph_count * sizeof(*glyphs)); - if (!glyphs) + if (!(glyphs = table_read_ensure(table, subtable_offset + seq_offset + 2, glyph_count * sizeof(*glyphs)))) return FALSE; if (glyph_count == 1)

1 0

Nikolay Sivov : dwrite: Simplify alternate substitution handler.
by Alexandre Julliard 17 Jun '20

17 Jun '20

Module: wine Branch: master Commit: 5909ab53032aa4e9fdbe6a83e15e970e154b8d49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5909ab53032aa4e9fdbe6a83… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 17 14:47:53 2020 +0300 dwrite: Simplify alternate substitution handler. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 48 +++++++++++++++++++----------------------------- 1 file changed, 19 insertions(+), 29 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index e729be9b20..e8d2068397 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4221,16 +4221,16 @@ static BOOL opentype_layout_apply_gpos_mark_to_base_attachment(struct scriptshap return TRUE; } -static BOOL table_read_array_be_word(const struct dwrite_fonttable *table, unsigned int offset, +static const UINT16 * table_read_array_be_word(const struct dwrite_fonttable *table, unsigned int offset, unsigned int index, UINT16 *data) { unsigned int count = table_read_be_word(table, offset); const UINT16 *array; - if (index >= count) return FALSE; + if (index != ~0u && index >= count) return NULL; if (!(array = table_read_ensure(table, offset + 2, count * sizeof(*array)))) return FALSE; - *data = GET_BE_WORD(array[index]); - return TRUE; + *data = index == ~0u ? count : GET_BE_WORD(array[index]); + return array; } static BOOL opentype_layout_apply_gpos_mark_to_lig_attachment(struct scriptshaping_context *context, @@ -4887,10 +4887,7 @@ static BOOL opentype_layout_apply_gsub_mult_substitution(struct scriptshaping_co return FALSE; } - glyph_count = table_read_be_word(table, subtable_offset + seq_offset); - - if (!(glyphs = table_read_ensure(table, subtable_offset + seq_offset + 2, glyph_count * sizeof(*glyphs)))) - return FALSE; + if (!(glyphs = table_read_array_be_word(table, subtable_offset + seq_offset, ~0u, &glyph_count))) return FALSE; if (glyph_count == 1) { @@ -4959,43 +4956,36 @@ static BOOL opentype_layout_apply_gsub_mult_substitution(struct scriptshaping_co static BOOL opentype_layout_apply_gsub_alt_substitution(struct scriptshaping_context *context, const struct lookup *lookup, unsigned int subtable_offset) { - const struct dwrite_fonttable *gsub = &context->table->table; - unsigned int idx, coverage_index, offset; + const struct dwrite_fonttable *table = &context->table->table; + unsigned int idx, coverage_index; UINT16 format, coverage, glyph; idx = context->cur; glyph = context->u.subst.glyphs[idx]; - format = table_read_be_word(gsub, subtable_offset); + format = table_read_be_word(table, subtable_offset); if (format == 1) { - const struct ot_gsub_altsubst_format1 *format1 = table_read_ensure(gsub, subtable_offset, sizeof(*format1)); - unsigned int count, shift, alt_index; + const struct ot_gsub_altsubst_format1 *format1 = table_read_ensure(table, subtable_offset, sizeof(*format1)); + unsigned int shift, alt_index; + UINT16 set_offset; - coverage = table_read_be_word(gsub, subtable_offset + FIELD_OFFSET(struct ot_gsub_altsubst_format1, coverage)); + coverage = table_read_be_word(table, subtable_offset + FIELD_OFFSET(struct ot_gsub_altsubst_format1, coverage)); - coverage_index = opentype_layout_is_glyph_covered(gsub, subtable_offset + coverage, glyph); - if (coverage_index == GLYPH_NOT_COVERED) - return FALSE; - - if (coverage_index >= GET_BE_WORD(format1->count)) - return FALSE; - - offset = table_read_be_word(gsub, subtable_offset + - FIELD_OFFSET(struct ot_gsub_altsubst_format1, sets[coverage_index])); + coverage_index = opentype_layout_is_glyph_covered(table, subtable_offset + coverage, glyph); + if (coverage_index == GLYPH_NOT_COVERED) return FALSE; - count = table_read_be_word(gsub, subtable_offset + offset); - if (!count) + if (!table_read_array_be_word(table, subtable_offset + FIELD_OFFSET(struct ot_gsub_altsubst_format1, count), + coverage_index, &set_offset)) return FALSE; + /* Argument is 1-based. */ BitScanForward(&shift, context->lookup_mask); alt_index = (context->lookup_mask & context->glyph_infos[idx].mask) >> shift; + if (!alt_index) return FALSE; - if (alt_index > count || !alt_index) - return FALSE; - - glyph = table_read_be_word(gsub, subtable_offset + offset + 2 + (alt_index - 1) * sizeof(glyph)); + if (!table_read_array_be_word(table, subtable_offset + set_offset, alt_index - 1, &glyph)) return FALSE; } else {

1 0

Dmitry Timoshkov : prntvpt: Implement PTConvertDevModeToPrintTicket.
by Alexandre Julliard 17 Jun '20

17 Jun '20

Module: wine Branch: master Commit: b44223e100f238978b66762d14ae6c1f1752bfd8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b44223e100f238978b66762d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jun 17 13:21:55 2020 +0800 prntvpt: Implement PTConvertDevModeToPrintTicket. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/prntvpt/prntvpt.spec | 2 +- dlls/prntvpt/ticket.c | 318 ++++++++++++++++++++++++++++++++++++++++++++++ include/prntvpt.h | 1 + 3 files changed, 320 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b44223e100f238978b66…

1 0

Dmitry Timoshkov : prntvpt: Add support for PageOutputColor to ticket XML writer.
by Alexandre Julliard 17 Jun '20

17 Jun '20

Module: wine Branch: master Commit: f1be23f9133143b35d5e6733e571bc12748e3220 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1be23f9133143b35d5e6733… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jun 17 13:22:02 2020 +0800 prntvpt: Add support for PageOutputColor to ticket XML writer. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/prntvpt/ticket.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/prntvpt/ticket.c b/dlls/prntvpt/ticket.c index 548da5977c..f31236675f 100644 --- a/dlls/prntvpt/ticket.c +++ b/dlls/prntvpt/ticket.c @@ -853,6 +853,24 @@ fail: return hr; } +static HRESULT write_PageOutputColor(IXMLDOMElement *root, const struct ticket *ticket) +{ + IXMLDOMElement *feature, *option = NULL; + HRESULT hr; + + hr = create_Feature(root, L"psk:PageOutputColor", &feature); + if (hr != S_OK) return hr; + + if (ticket->page.color == DMCOLOR_COLOR) + hr = create_Option(feature, L"psk:Color", &option); + else /* DMCOLOR_MONOCHROME */ + hr = create_Option(feature, L"psk:Monochrome", &option); + + if (option) IXMLDOMElement_Release(option); + IXMLDOMElement_Release(feature); + return hr; +} + static HRESULT write_attributes(IXMLDOMElement *element) { HRESULT hr; @@ -892,6 +910,8 @@ static HRESULT write_ticket(IStream *stream, const struct ticket *ticket, EPrint hr = write_PageMediaSize(root, ticket); if (hr != S_OK) goto fail; + hr = write_PageOutputColor(root, ticket); + if (hr != S_OK) goto fail; hr = IStream_Write(stream, xmldecl, strlen(xmldecl), NULL); if (hr != S_OK) goto fail;

1 0

Dmitry Timoshkov : prntvpt: Add support for PageScaling to ticket XML writer.
by Alexandre Julliard 17 Jun '20

17 Jun '20

Module: wine Branch: master Commit: 3d87d050f26075f8358155259bf16adaf625d9ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d87d050f26075f835815525… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jun 17 13:22:06 2020 +0800 prntvpt: Add support for PageScaling to ticket XML writer. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/prntvpt/ticket.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/prntvpt/ticket.c b/dlls/prntvpt/ticket.c index f31236675f..e90dc5100b 100644 --- a/dlls/prntvpt/ticket.c +++ b/dlls/prntvpt/ticket.c @@ -871,6 +871,24 @@ static HRESULT write_PageOutputColor(IXMLDOMElement *root, const struct ticket * return hr; } +static HRESULT write_PageScaling(IXMLDOMElement *root, const struct ticket *ticket) +{ + IXMLDOMElement *feature, *option = NULL; + HRESULT hr; + + hr = create_Feature(root, L"psk:PageScaling", &feature); + if (hr != S_OK) return hr; + + if (ticket->page.scaling != 100) + FIXME("page.scaling: %d\n", ticket->page.scaling); + + hr = create_Option(feature, L"psk:None", &option); + + if (option) IXMLDOMElement_Release(option); + IXMLDOMElement_Release(feature); + return hr; +} + static HRESULT write_attributes(IXMLDOMElement *element) { HRESULT hr; @@ -912,6 +930,8 @@ static HRESULT write_ticket(IStream *stream, const struct ticket *ticket, EPrint if (hr != S_OK) goto fail; hr = write_PageOutputColor(root, ticket); if (hr != S_OK) goto fail; + hr = write_PageScaling(root, ticket); + if (hr != S_OK) goto fail; hr = IStream_Write(stream, xmldecl, strlen(xmldecl), NULL); if (hr != S_OK) goto fail;

1 0

Dmitry Timoshkov : prntvpt: Add support for PageResolution to ticket XML writer.
by Alexandre Julliard 17 Jun '20

17 Jun '20

Module: wine Branch: master Commit: 0b53ba31f9ff7696013bf45113cafb5f60ce026b URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b53ba31f9ff7696013bf451… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jun 17 13:22:09 2020 +0800 prntvpt: Add support for PageResolution to ticket XML writer. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/prntvpt/ticket.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/prntvpt/ticket.c b/dlls/prntvpt/ticket.c index e90dc5100b..b9dfdb10ae 100644 --- a/dlls/prntvpt/ticket.c +++ b/dlls/prntvpt/ticket.c @@ -889,6 +889,34 @@ static HRESULT write_PageScaling(IXMLDOMElement *root, const struct ticket *tick return hr; } +static HRESULT write_PageResolution(IXMLDOMElement *root, const struct ticket *ticket) +{ + IXMLDOMElement *feature, *option = NULL, *property; + HRESULT hr; + + hr = create_Feature(root, L"psk:PageResolution", &feature); + if (hr != S_OK) return hr; + + hr = create_Option(feature, NULL, &option); + if (hr != S_OK) goto fail; + + hr = create_ScoredProperty(option, L"psk:ResolutionX", &property); + if (hr != S_OK) goto fail; + hr = write_int_value(property, ticket->page.resolution.x); + IXMLDOMElement_Release(property); + if (hr != S_OK) goto fail; + + hr = create_ScoredProperty(option, L"psk:ResolutionY", &property); + if (hr != S_OK) goto fail; + hr = write_int_value(property, ticket->page.resolution.y); + IXMLDOMElement_Release(property); + +fail: + if (option) IXMLDOMElement_Release(option); + IXMLDOMElement_Release(feature); + return hr; +} + static HRESULT write_attributes(IXMLDOMElement *element) { HRESULT hr; @@ -932,6 +960,8 @@ static HRESULT write_ticket(IStream *stream, const struct ticket *ticket, EPrint if (hr != S_OK) goto fail; hr = write_PageScaling(root, ticket); if (hr != S_OK) goto fail; + hr = write_PageResolution(root, ticket); + if (hr != S_OK) goto fail; hr = IStream_Write(stream, xmldecl, strlen(xmldecl), NULL); if (hr != S_OK) goto fail;

1 0