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

Alexandre Julliard : ntdll: Move the current directory initialization to the Unix library.
by Alexandre Julliard June 17, 2020

June 17, 2020

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 June 17, 2020

June 17, 2020

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

Alistair Leslie-Hughes : winhttp: Status HTTP_STATUS_SWITCH_PROTOCOLS doesn't have any content.
by Alexandre Julliard June 17, 2020

June 17, 2020

Module: wine Branch: master Commit: a6de059eef5e0aa4aa688885c1d91497c588576f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6de059eef5e0aa4aa688885… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 17 11:53:40 2020 +0200 winhttp: Status HTTP_STATUS_SWITCH_PROTOCOLS doesn't have any content. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 79d66fd5e8..9173bdb56d 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2353,8 +2353,11 @@ static void set_content_length( struct request *request, DWORD status ) WCHAR encoding[20]; DWORD buflen = sizeof(request->content_length); - if (status == HTTP_STATUS_NO_CONTENT || status == HTTP_STATUS_NOT_MODIFIED || !wcscmp( request->verb, L"HEAD" )) + if (status == HTTP_STATUS_NO_CONTENT || status == HTTP_STATUS_NOT_MODIFIED || + status == HTTP_STATUS_SWITCH_PROTOCOLS || !wcscmp( request->verb, L"HEAD" )) + { request->content_length = 0; + } else { if (query_headers( request, WINHTTP_QUERY_CONTENT_LENGTH|WINHTTP_QUERY_FLAG_NUMBER,

1 0

Zhiyi Zhang : winemac.drv: Support multiple adapter display settings in registry.
by Alexandre Julliard June 17, 2020

June 17, 2020

Module: wine Branch: master Commit: 6b6a7124a67c6eadbe4408163f93dbf0379b6565 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b6a7124a67c6eadbe440816… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jun 11 17:22:48 2020 +0800 winemac.drv: Support multiple adapter display settings in registry. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/display.c | 82 ++++++++++++++++++++++++++++++---------------- 1 file changed, 53 insertions(+), 29 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index c024885e2d..522ff57d7a 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -71,6 +71,7 @@ static const WCHAR video_idW[] = {'V','i','d','e','o','I','D',0}; static const WCHAR symbolic_link_valueW[]= {'S','y','m','b','o','l','i','c','L','i','n','k','V','a','l','u','e',0}; static const WCHAR gpu_idW[] = {'G','P','U','I','D',0}; static const WCHAR mointor_id_fmtW[] = {'M','o','n','i','t','o','r','I','D','%','d',0}; +static const WCHAR adapter_prefixW[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y'}; static const WCHAR adapter_name_fmtW[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','%','d',0}; static const WCHAR state_flagsW[] = {'S','t','a','t','e','F','l','a','g','s',0}; static const WCHAR guid_fmtW[] = { @@ -151,44 +152,58 @@ static void release_display_device_init_mutex(HANDLE mutex) CloseHandle(mutex); } -static BOOL get_display_device_reg_key(char *key, unsigned len) +static BOOL get_display_device_reg_key(const WCHAR *device_name, WCHAR *key, unsigned len) { - static const char display_device_guid_prop[] = "__wine_display_device_guid"; - static const char video_path[] = "System\\CurrentControlSet\\Control\\Video\\{"; - static const char display0[] = "}\\0000"; - ATOM guid_atom; + WCHAR value_name[MAX_PATH], buffer[MAX_PATH], *end_ptr; + DWORD adapter_index, size; - assert(len >= sizeof(video_path) + sizeof(display0) + 40); - - guid_atom = HandleToULong(GetPropA(GetDesktopWindow(), display_device_guid_prop)); - if (!guid_atom) return FALSE; + /* Device name has to be \\.\DISPLAY%d */ + if (strncmpiW(device_name, adapter_prefixW, ARRAY_SIZE(adapter_prefixW))) + return FALSE; - memcpy(key, video_path, sizeof(video_path)); + /* Parse \\.\DISPLAY* */ + adapter_index = strtolW(device_name + ARRAY_SIZE(adapter_prefixW), &end_ptr, 10) - 1; + if (*end_ptr) + return FALSE; - if (!GlobalGetAtomNameA(guid_atom, key + strlen(key), 40)) + /* Open \Device\Video* in HKLM\HARDWARE\DEVICEMAP\VIDEO\ */ + sprintfW(value_name, device_video_fmtW, adapter_index); + size = sizeof(buffer); + if (RegGetValueW(HKEY_LOCAL_MACHINE, video_keyW, value_name, RRF_RT_REG_SZ, NULL, buffer, &size)) return FALSE; - strcat(key, display0); + if (len < lstrlenW(buffer + 18) + 1) + return FALSE; - TRACE("display device key %s\n", wine_dbgstr_a(key)); + /* Skip \Registry\Machine\ prefix */ + lstrcpyW(key, buffer + 18); + TRACE("display device %s registry settings key %s.\n", wine_dbgstr_w(device_name), wine_dbgstr_w(key)); return TRUE; } -static BOOL read_registry_settings(DEVMODEW *dm) +static BOOL read_registry_settings(const WCHAR *device_name, DEVMODEW *dm) { - char wine_mac_reg_key[128]; + WCHAR wine_mac_reg_key[MAX_PATH]; + HANDLE mutex; HKEY hkey; DWORD type, size; BOOL ret = TRUE; dm->dmFields = 0; - if (!get_display_device_reg_key(wine_mac_reg_key, sizeof(wine_mac_reg_key))) + mutex = get_display_device_init_mutex(); + if (!get_display_device_reg_key(device_name, wine_mac_reg_key, ARRAY_SIZE(wine_mac_reg_key))) + { + release_display_device_init_mutex(mutex); return FALSE; + } - if (RegOpenKeyExA(HKEY_CURRENT_CONFIG, wine_mac_reg_key, 0, KEY_READ, &hkey)) + if (RegOpenKeyExW(HKEY_CURRENT_CONFIG, wine_mac_reg_key, 0, KEY_READ, &hkey)) + { + release_display_device_init_mutex(mutex); return FALSE; + } #define query_value(name, data) \ size = sizeof(DWORD); \ @@ -216,22 +231,31 @@ static BOOL read_registry_settings(DEVMODEW *dm) #undef query_value RegCloseKey(hkey); + release_display_device_init_mutex(mutex); return ret; } -static BOOL write_registry_settings(const DEVMODEW *dm) +static BOOL write_registry_settings(const WCHAR *device_name, const DEVMODEW *dm) { - char wine_mac_reg_key[128]; + WCHAR wine_mac_reg_key[MAX_PATH]; + HANDLE mutex; HKEY hkey; BOOL ret = TRUE; - if (!get_display_device_reg_key(wine_mac_reg_key, sizeof(wine_mac_reg_key))) + mutex = get_display_device_init_mutex(); + if (!get_display_device_reg_key(device_name, wine_mac_reg_key, ARRAY_SIZE(wine_mac_reg_key))) + { + release_display_device_init_mutex(mutex); return FALSE; + } - if (RegCreateKeyExA(HKEY_CURRENT_CONFIG, wine_mac_reg_key, 0, NULL, + if (RegCreateKeyExW(HKEY_CURRENT_CONFIG, wine_mac_reg_key, 0, NULL, REG_OPTION_VOLATILE, KEY_WRITE, NULL, &hkey, NULL)) + { + release_display_device_init_mutex(mutex); return FALSE; + } #define set_value(name, data) \ if (RegSetValueExA(hkey, name, 0, REG_DWORD, (const BYTE*)(data), sizeof(DWORD))) \ @@ -250,6 +274,7 @@ static BOOL write_registry_settings(const DEVMODEW *dm) #undef set_value RegCloseKey(hkey); + release_display_device_init_mutex(mutex); return ret; } @@ -833,12 +858,6 @@ LONG CDECL macdrv_ChangeDisplaySettingsEx(LPCWSTR devname, LPDEVMODEW devmode, devmode = &default_mode; } - if (lstrcmpiW(primary_adapter, devname)) - { - FIXME("Changing non-primary adapter settings is currently unsupported.\n"); - return DISP_CHANGE_SUCCESSFUL; - } - if (is_detached_mode(devmode)) { FIXME("Detaching adapters is currently unsupported.\n"); @@ -958,13 +977,18 @@ better: /* we have a valid mode */ TRACE("Requested display settings match mode %ld\n", best); - if ((flags & CDS_UPDATEREGISTRY) && !write_registry_settings(devmode)) + if ((flags & CDS_UPDATEREGISTRY) && !write_registry_settings(devname, devmode)) { WARN("Failed to update registry\n"); ret = DISP_CHANGE_NOTUPDATED; } else if (flags & (CDS_TEST | CDS_NORESET)) ret = DISP_CHANGE_SUCCESSFUL; + else if (lstrcmpiW(primary_adapter, devname)) + { + FIXME("Changing non-primary adapter settings is currently unsupported.\n"); + ret = DISP_CHANGE_SUCCESSFUL; + } else if (macdrv_set_display_mode(&displays[0], best_display_mode)) { int mode_bpp = display_mode_bits_per_pixel(best_display_mode); @@ -1034,7 +1058,7 @@ BOOL CDECL macdrv_EnumDisplaySettingsEx(LPCWSTR devname, DWORD mode, if (mode == ENUM_REGISTRY_SETTINGS) { TRACE("mode %d (registry) -- getting default mode\n", mode); - return read_registry_settings(devmode); + return read_registry_settings(devname, devmode); } if (macdrv_get_displays(&displays, &num_displays))

1 0

Nikolay Sivov : dwrite: Simplify single substitution handler.
by Alexandre Julliard June 17, 2020

June 17, 2020

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

Alexandre Julliard : ntdll: Dynamically load callback functions from the Unix library.
by Alexandre Julliard June 17, 2020

June 17, 2020

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

Ziqing Hui : windowscodecs/tests: Add decoder info tests for DDS decoder.
by Alexandre Julliard June 17, 2020

June 17, 2020

Module: wine Branch: master Commit: f69619791d38ba2737a91256a0ba6ed42c0a8f66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f69619791d38ba2737a91256… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Jun 16 13:54:07 2020 +0800 windowscodecs/tests: Add decoder info tests for DDS decoder. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/info.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/windowscodecs/tests/info.c b/dlls/windowscodecs/tests/info.c index af2532efb4..707b0715b7 100644 --- a/dlls/windowscodecs/tests/info.c +++ b/dlls/windowscodecs/tests/info.c @@ -105,6 +105,11 @@ static void test_decoder_info(void) ".tiff,.tif", 1 }, + { + &CLSID_WICDdsDecoder, + "image/vnd.ms-dds", + ".dds", + } }; IWICBitmapDecoderInfo *decoder_info, *decoder_info2; IWICComponentInfo *info; @@ -124,6 +129,10 @@ static void test_decoder_info(void) WCHAR mimetypeW[64]; hr = CoCreateInstance(test->clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IWICBitmapDecoder, (void **)&decoder); + if (test->clsid == &CLSID_WICDdsDecoder && hr != S_OK) { + win_skip("DDS decoder is not supported\n"); + continue; + } ok(SUCCEEDED(hr), "Failed to create decoder, hr %#x.\n", hr); decoder_info = NULL; @@ -184,6 +193,7 @@ static void test_decoder_info(void) hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, len, value, &len); ok(hr == S_OK, "GetMimeType failed, hr=%x\n", hr); todo_wine_if(test->todo) { + todo_wine_if(i == 6) ok(lstrcmpW(value, mimetypeW) == 0, "GetMimeType returned wrong value %s\n", wine_dbgstr_w(value)); ok(len == lstrlenW(mimetypeW) + 1, "GetMimeType returned wrong len %i\n", len); } @@ -195,6 +205,7 @@ static void test_decoder_info(void) hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, 256, value, &len); ok(hr == S_OK, "GetMimeType failed, hr=%x\n", hr); todo_wine_if(test->todo) { + todo_wine_if(i == 6) ok(lstrcmpW(value, mimetypeW) == 0, "GetMimeType returned wrong value %s\n", wine_dbgstr_w(value)); ok(len == lstrlenW(mimetypeW) + 1, "GetMimeType returned wrong len %i\n", len); }

1 0

Dmitry Timoshkov : prntvpt: Add support for PageOrientation to ticket XML writer.
by Alexandre Julliard June 17, 2020

June 17, 2020

Module: wine Branch: master Commit: f81aef724370ed8c53e4d8f519598a16f7408aef URL: https://source.winehq.org/git/wine.git/?a=commit;h=f81aef724370ed8c53e4d8f5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jun 17 13:22:12 2020 +0800 prntvpt: Add support for PageOrientation 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 b9dfdb10ae..13b5ad4ed4 100644 --- a/dlls/prntvpt/ticket.c +++ b/dlls/prntvpt/ticket.c @@ -917,6 +917,24 @@ fail: return hr; } +static HRESULT write_PageOrientation(IXMLDOMElement *root, const struct ticket *ticket) +{ + IXMLDOMElement *feature, *option = NULL; + HRESULT hr; + + hr = create_Feature(root, L"psk:PageOrientation", &feature); + if (hr != S_OK) return hr; + + if (ticket->page.orientation == DMORIENT_PORTRAIT) + hr = create_Option(feature, L"psk:Portrait", &option); + else /* DMORIENT_LANDSCAPE */ + hr = create_Option(feature, L"psk:Landscape", &option); + + if (option) IXMLDOMElement_Release(option); + IXMLDOMElement_Release(feature); + return hr; +} + static HRESULT write_attributes(IXMLDOMElement *element) { HRESULT hr; @@ -962,6 +980,8 @@ static HRESULT write_ticket(IStream *stream, const struct ticket *ticket, EPrint if (hr != S_OK) goto fail; hr = write_PageResolution(root, ticket); if (hr != S_OK) goto fail; + hr = write_PageOrientation(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 initial implementation of PTGetPrintCapabilities.
by Alexandre Julliard June 17, 2020

June 17, 2020

Module: wine Branch: master Commit: 9f2512d836cc62204c7ef61b661a02682ecb34c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f2512d836cc62204c7ef61b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jun 17 13:22:43 2020 +0800 prntvpt: Add initial implementation of PTGetPrintCapabilities. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/prntvpt/main.c | 12 ++ dlls/prntvpt/prntvpt.spec | 2 +- dlls/prntvpt/prntvpt_private.h | 1 + dlls/prntvpt/ticket.c | 281 +++++++++++++++++++++++++++++++++++++++++ include/prntvpt.h | 1 + 5 files changed, 296 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9f2512d836cc62204c7e…

1 0

Dmitry Timoshkov : prntvpt: Add support for JobCopies to ticket XML writer.
by Alexandre Julliard June 17, 2020

June 17, 2020

Module: wine Branch: master Commit: 99daef624f59947537e5222c5ff47806c43f02be URL: https://source.winehq.org/git/wine.git/?a=commit;h=99daef624f59947537e5222c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jun 17 13:22:27 2020 +0800 prntvpt: Add support for JobCopies 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 | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/prntvpt/ticket.c b/dlls/prntvpt/ticket.c index 591d61cb6e..f012a16f7a 100644 --- a/dlls/prntvpt/ticket.c +++ b/dlls/prntvpt/ticket.c @@ -815,6 +815,16 @@ static HRESULT create_Option(IXMLDOMElement *root, const WCHAR *name, IXMLDOMEle return hr; } +static HRESULT create_ParameterInit(IXMLDOMElement *root, const WCHAR *name, IXMLDOMElement **child) +{ + HRESULT hr; + + hr = create_element(root, L"psf:ParameterInit", child); + if (hr != S_OK) return hr; + + return add_attribute(*child, L"name", name); +} + static HRESULT create_ScoredProperty(IXMLDOMElement *root, const WCHAR *name, IXMLDOMElement **child) { HRESULT hr; @@ -971,6 +981,20 @@ static HRESULT write_JobInputBin(IXMLDOMElement *root, const struct ticket *tick return hr; } +static HRESULT write_JobCopies(IXMLDOMElement *root, const struct ticket *ticket) +{ + IXMLDOMElement *parameter; + HRESULT hr; + + hr = create_ParameterInit(root, L"psk:JobCopiesAllDocuments", &parameter); + if (hr != S_OK) return hr; + + hr = write_int_value(parameter, ticket->job.copies); + + IXMLDOMElement_Release(parameter); + return hr; +} + static HRESULT write_attributes(IXMLDOMElement *element) { HRESULT hr; @@ -1029,6 +1053,8 @@ static HRESULT write_ticket(IStream *stream, const struct ticket *ticket, EPrint { hr = write_JobInputBin(root, ticket); if (hr != S_OK) goto fail; + hr = write_JobCopies(root, ticket); + if (hr != S_OK) goto fail; } hr = IStream_Write(stream, xmldecl, strlen(xmldecl), NULL);

1 0