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

[PATCH] winhttp: Treat a partial certificate chain as having an unknown/invalid CA.
by Brendan Shanks June 17, 2020

June 17, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46726 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- This is needed to connect to https://prod.egonet.codemasters.com, there's a test app and more info in the bug. dlls/winhttp/net.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 2905d5c535a..0cc2bb2bef7 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -84,8 +84,10 @@ static DWORD netconn_verify_cert( PCCERT_CONTEXT cert, WCHAR *server, DWORD secu if (!(security_flags & SECURITY_FLAG_IGNORE_CERT_DATE_INVALID)) err = ERROR_WINHTTP_SECURE_CERT_DATE_INVALID; } - else if (chain->TrustStatus.dwErrorStatus & - CERT_TRUST_IS_UNTRUSTED_ROOT) + else if ((chain->TrustStatus.dwErrorStatus & + CERT_TRUST_IS_UNTRUSTED_ROOT) || + (chain->TrustStatus.dwErrorStatus & + CERT_TRUST_IS_PARTIAL_CHAIN)) { if (!(security_flags & SECURITY_FLAG_IGNORE_UNKNOWN_CA)) err = ERROR_WINHTTP_SECURE_INVALID_CA; -- 2.26.2

2 1

[PATCH 1/2] kernel32: Adjust toolhelp thread return order.
by Yu Changping June 17, 2020

June 17, 2020

2 1

[PATCH 2/2] kernel32/test: Add tests for getting main thread id by toolhelp.
by Yu Changping June 17, 2020

June 17, 2020

1 0

[PATCH 1/2] kernel32/test: Add tests for get main thread id by toolhelp
by Yu Changping June 17, 2020

June 17, 2020

2 1

[PATCH 2/2] kernel32: Adjust toolhelp thread return order
by Yu Changping June 17, 2020

June 17, 2020

2 1

[PATCH 1/2] winhttp: Status HTTP_STATUS_SWITCH_PROTOCOLS doesn't have any content
by Alistair Leslie-Hughes June 17, 2020

June 17, 2020

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- 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, -- 2.27.0

1 0

[PATCH v2 12/12] prntvpt: Add initial implementation of PTGetPrintCapabilities.
by Dmitry Timoshkov June 17, 2020

June 17, 2020

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- 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 --git a/dlls/prntvpt/main.c b/dlls/prntvpt/main.c index 2c27dc6689..197fb54022 100644 --- a/dlls/prntvpt/main.c +++ b/dlls/prntvpt/main.c @@ -33,6 +33,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(prntvpt); +static WCHAR *heap_strdupW(const WCHAR *src) +{ + WCHAR *dst; + size_t len; + if (!src) return NULL; + len = (wcslen(src) + 1) * sizeof(WCHAR); + if ((dst = heap_alloc(len))) memcpy(dst, src, len); + return dst; +} + BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) { TRACE("(%p, %d, %p)\n", hinst, reason, reserved); @@ -70,6 +80,7 @@ HRESULT WINAPI PTCloseProvider(HPTPROVIDER provider) return E_HANDLE; prov->owner = 0; + heap_free(prov->name); ClosePrinter(prov->hprn); heap_free(prov); @@ -105,6 +116,7 @@ HRESULT WINAPI PTOpenProviderEx(const WCHAR *printer, DWORD max_version, DWORD p return HRESULT_FROM_WIN32(GetLastError()); } + prov->name = heap_strdupW(printer); prov->owner = GetCurrentThreadId(); *provider = (HPTPROVIDER)prov; *used_version = 1; diff --git a/dlls/prntvpt/prntvpt.spec b/dlls/prntvpt/prntvpt.spec index 9563d9ae37..9547014374 100644 --- a/dlls/prntvpt/prntvpt.spec +++ b/dlls/prntvpt/prntvpt.spec @@ -3,7 +3,7 @@ @ stdcall PTOpenProviderEx(wstr long long ptr ptr) @ stdcall PTCloseProvider(ptr) @ stub BindPTProviderThunk -@ stub PTGetPrintCapabilities +@ stdcall PTGetPrintCapabilities(ptr ptr ptr ptr) @ stdcall PTMergeAndValidatePrintTicket(ptr ptr ptr long ptr ptr) @ stdcall PTConvertPrintTicketToDevMode(ptr ptr long long ptr ptr ptr) @ stdcall PTConvertDevModeToPrintTicket(ptr long ptr long ptr) diff --git a/dlls/prntvpt/prntvpt_private.h b/dlls/prntvpt/prntvpt_private.h index c8d1c5ef34..857b92f202 100644 --- a/dlls/prntvpt/prntvpt_private.h +++ b/dlls/prntvpt/prntvpt_private.h @@ -19,6 +19,7 @@ struct prn_provider { DWORD owner; + WCHAR *name; HANDLE hprn; }; diff --git a/dlls/prntvpt/ticket.c b/dlls/prntvpt/ticket.c index 42cdec6ec0..132a117a24 100644 --- a/dlls/prntvpt/ticket.c +++ b/dlls/prntvpt/ticket.c @@ -845,6 +845,16 @@ static HRESULT create_ParameterRef(IXMLDOMElement *root, const WCHAR *name, IXML return add_attribute(*child, L"name", name); } +static HRESULT create_ParameterDef(IXMLDOMElement *root, const WCHAR *name, IXMLDOMElement **child) +{ + HRESULT hr; + + hr = create_element(root, L"psf:ParameterDef", 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; @@ -1255,3 +1265,274 @@ HRESULT WINAPI PTMergeAndValidatePrintTicket(HPTPROVIDER provider, IStream *base hr = write_ticket(result, &ticket, scope); return hr ? hr : S_PT_NO_CONFLICT; } + +static HRESULT write_PageMediaSize_caps(const WCHAR *device, IXMLDOMElement *root) +{ + HRESULT hr = S_OK; + int count, i; + POINT *pt; + IXMLDOMElement *feature = NULL; + + FIXME("stub\n"); + + count = DeviceCapabilitiesW(device, NULL, DC_PAPERSIZE, NULL, NULL); + if (count <= 0) + return HRESULT_FROM_WIN32(GetLastError()); + + pt = heap_alloc(count * sizeof(*pt)); + if (!pt) return E_OUTOFMEMORY; + + count = DeviceCapabilitiesW(device, NULL, DC_PAPERSIZE, (LPWSTR)pt, NULL); + if (count <= 0) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto fail; + } + + hr = create_Feature(root, L"psk:PageMediaSize", &feature); + if (hr != S_OK) goto fail; + + for (i = 0; i < count; i++) + { + } + +fail: + if (feature) IXMLDOMElement_Release(feature); + heap_free(pt); + return hr; +} + +static HRESULT write_PageOutputColor_caps(const WCHAR *device, IXMLDOMElement *root) +{ + HRESULT hr = S_OK; + int color; + IXMLDOMElement *feature = NULL; + + FIXME("stub\n"); + + color = DeviceCapabilitiesW(device, NULL, DC_COLORDEVICE, NULL, NULL); + TRACE("DC_COLORDEVICE: %d\n", color); + + hr = create_Feature(root, L"psk:PageOutputColor", &feature); + if (hr != S_OK) goto fail; + +fail: + if (feature) IXMLDOMElement_Release(feature); + return hr; +} + +static HRESULT write_PageScaling_caps(const WCHAR *device, IXMLDOMElement *root) +{ + HRESULT hr = S_OK; + IXMLDOMElement *feature = NULL; + + FIXME("stub\n"); + + hr = create_Feature(root, L"psk:PageScaling", &feature); + if (hr != S_OK) goto fail; + +fail: + if (feature) IXMLDOMElement_Release(feature); + return hr; +} + +static HRESULT write_PageResolution_caps(const WCHAR *device, IXMLDOMElement *root) +{ + HRESULT hr = S_OK; + int count, i; + struct + { + LONG x; + LONG y; + } *res; + IXMLDOMElement *feature = NULL; + + FIXME("stub\n"); + + count = DeviceCapabilitiesW(device, NULL, DC_ENUMRESOLUTIONS, NULL, NULL); + if (count <= 0) + return HRESULT_FROM_WIN32(GetLastError()); + + res = heap_alloc(count * sizeof(*res)); + if (!res) return E_OUTOFMEMORY; + + count = DeviceCapabilitiesW(device, NULL, DC_ENUMRESOLUTIONS, (LPWSTR)res, NULL); + if (count <= 0) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto fail; + } + + hr = create_Feature(root, L"psk:PageResolution", &feature); + if (hr != S_OK) goto fail; + + for (i = 0; i < count; i++) + { + } + +fail: + if (feature) IXMLDOMElement_Release(feature); + heap_free(res); + return hr; +} + +static HRESULT write_PageOrientation_caps(const WCHAR *device, IXMLDOMElement *root) +{ + HRESULT hr = S_OK; + int landscape; + IXMLDOMElement *feature = NULL; + + FIXME("stub\n"); + + landscape = DeviceCapabilitiesW(device, NULL, DC_ORIENTATION, NULL, NULL); + TRACE("DC_ORIENTATION: %d\n", landscape); + + hr = create_Feature(root, L"psk:PageOrientation", &feature); + if (hr != S_OK) goto fail; + +fail: + if (feature) IXMLDOMElement_Release(feature); + return hr; +} + +static HRESULT write_DocumentCollate_caps(const WCHAR *device, IXMLDOMElement *root) +{ + HRESULT hr = S_OK; + int collate; + IXMLDOMElement *feature = NULL; + + FIXME("stub\n"); + + collate = DeviceCapabilitiesW(device, NULL, DC_COLLATE, NULL, NULL); + TRACE("DC_COLLATE: %d\n", collate); + + hr = create_Feature(root, L"psk:DocumentCollate", &feature); + if (hr != S_OK) goto fail; + +fail: + if (feature) IXMLDOMElement_Release(feature); + return hr; +} + +static HRESULT write_JobInputBin_caps(const WCHAR *device, IXMLDOMElement *root) +{ + HRESULT hr = S_OK; + int count, i; + WORD *bin; + IXMLDOMElement *feature = NULL; + + FIXME("stub\n"); + + count = DeviceCapabilitiesW(device, NULL, DC_BINS, NULL, NULL); + if (count <= 0) + return HRESULT_FROM_WIN32(GetLastError()); + + bin = heap_alloc(count * sizeof(*bin)); + if (!bin) return E_OUTOFMEMORY; + + count = DeviceCapabilitiesW(device, NULL, DC_BINS, (LPWSTR)bin, NULL); + if (count <= 0) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto fail; + } + + hr = create_Feature(root, L"psk:JobInputBin", &feature); + if (hr != S_OK) goto fail; + + for (i = 0; i < count; i++) + { + } + +fail: + if (feature) IXMLDOMElement_Release(feature); + heap_free(bin); + return hr; +} + +static HRESULT write_JobCopies_caps(const WCHAR *device, IXMLDOMElement *root) +{ + HRESULT hr = S_OK; + int copies; + IXMLDOMElement *feature = NULL; + + FIXME("stub\n"); + + copies = DeviceCapabilitiesW(device, NULL, DC_COPIES, NULL, NULL); + TRACE("DC_COPIES: %d\n", copies); + + hr = create_ParameterDef(root, L"psk:JobCopiesAllDocuments", &feature); + if (hr != S_OK) goto fail; + +fail: + if (feature) IXMLDOMElement_Release(feature); + return hr; +} + +static HRESULT write_print_capabilities(const WCHAR *device, IStream *stream) +{ + static const char xmldecl[] = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n"; + HRESULT hr; + IXMLDOMDocument *doc; + IXMLDOMElement *root = NULL; + VARIANT var; + + hr = CoCreateInstance(&CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, + &IID_IXMLDOMDocument, (void **)&doc); + if (hr != S_OK) return hr; + + hr = IXMLDOMDocument_createElement(doc, (BSTR)L"psf:PrintCapabilities", &root); + if (hr != S_OK) goto fail; + + hr = IXMLDOMDocument_appendChild(doc, (IXMLDOMNode *)root, NULL); + if (hr != S_OK) goto fail; + + hr = write_attributes(root); + if (hr != S_OK) goto fail; + + hr = write_PageMediaSize_caps(device, root); + if (hr != S_OK) goto fail; + hr = write_PageOutputColor_caps(device, root); + if (hr != S_OK) goto fail; + hr = write_PageScaling_caps(device, root); + if (hr != S_OK) goto fail; + hr = write_PageResolution_caps(device, root); + if (hr != S_OK) goto fail; + hr = write_PageOrientation_caps(device, root); + if (hr != S_OK) goto fail; + hr = write_DocumentCollate_caps(device, root); + if (hr != S_OK) goto fail; + hr = write_JobInputBin_caps(device, root); + if (hr != S_OK) goto fail; + hr = write_JobCopies_caps(device, root); + if (hr != S_OK) goto fail; + + hr = IStream_Write(stream, xmldecl, strlen(xmldecl), NULL); + if (hr != S_OK) goto fail; + + V_VT(&var) = VT_UNKNOWN; + V_UNKNOWN(&var) = (IUnknown *)stream; + hr = IXMLDOMDocument_save(doc, var); + +fail: + if (root) IXMLDOMElement_Release(root); + IXMLDOMDocument_Release(doc); + return hr; +} + +HRESULT WINAPI PTGetPrintCapabilities(HPTPROVIDER provider, IStream *stream, IStream *caps, BSTR *error) +{ + struct prn_provider *prov = (struct prn_provider *)provider; + struct ticket ticket; + HRESULT hr; + + TRACE("%p,%p,%p,%p\n", provider, stream, caps, error); + + if (!is_valid_provider(provider) || !stream || !caps) + return E_INVALIDARG; + + hr = parse_ticket(stream, kPTJobScope, &ticket); + if (hr != S_OK) return hr; + + return write_print_capabilities(prov->name, caps); +} diff --git a/include/prntvpt.h b/include/prntvpt.h index 94b047d8c7..e060a26190 100644 --- a/include/prntvpt.h +++ b/include/prntvpt.h @@ -47,6 +47,7 @@ HRESULT WINAPI PTOpenProviderEx(const WCHAR *printer, DWORD max_version, DWORD p HRESULT WINAPI PTCloseProvider(HPTPROVIDER); HRESULT WINAPI PTConvertDevModeToPrintTicket(HPTPROVIDER, ULONG, PDEVMODEW, EPrintTicketScope, IStream *); HRESULT WINAPI PTConvertPrintTicketToDevMode(HPTPROVIDER, IStream *, EDefaultDevmodeType, EPrintTicketScope, ULONG *, PDEVMODEW *, BSTR *); +HRESULT WINAPI PTGetPrintCapabilities(HPTPROVIDER, IStream *, IStream *, BSTR *); HRESULT WINAPI PTMergeAndValidatePrintTicket(HPTPROVIDER, IStream *, IStream *, EPrintTicketScope, IStream *, BSTR *); HRESULT WINAPI PTReleaseMemory(PVOID); -- 2.26.2

1 0

[PATCH v2 11/12] prntvpt: Implement PTMergeAndValidatePrintTicket.
by Dmitry Timoshkov June 17, 2020

June 17, 2020

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/prntvpt/prntvpt.spec | 2 +- dlls/prntvpt/ticket.c | 28 ++++++++++++++++++++++++++++ include/prntvpt.h | 5 ++++- 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/prntvpt/prntvpt.spec b/dlls/prntvpt/prntvpt.spec index bae26fab9d..9563d9ae37 100644 --- a/dlls/prntvpt/prntvpt.spec +++ b/dlls/prntvpt/prntvpt.spec @@ -4,7 +4,7 @@ @ stdcall PTCloseProvider(ptr) @ stub BindPTProviderThunk @ stub PTGetPrintCapabilities -@ stub PTMergeAndValidatePrintTicket +@ stdcall PTMergeAndValidatePrintTicket(ptr ptr ptr long ptr ptr) @ stdcall PTConvertPrintTicketToDevMode(ptr ptr long long ptr ptr ptr) @ stdcall PTConvertDevModeToPrintTicket(ptr long ptr long ptr) @ stdcall PTReleaseMemory(ptr) diff --git a/dlls/prntvpt/ticket.c b/dlls/prntvpt/ticket.c index e9745233c9..42cdec6ec0 100644 --- a/dlls/prntvpt/ticket.c +++ b/dlls/prntvpt/ticket.c @@ -1227,3 +1227,31 @@ HRESULT WINAPI PTConvertDevModeToPrintTicket(HPTPROVIDER provider, ULONG size, P return write_ticket(stream, &ticket, scope); } + +HRESULT WINAPI PTMergeAndValidatePrintTicket(HPTPROVIDER provider, IStream *base, IStream *delta, + EPrintTicketScope scope, IStream *result, BSTR *error) +{ + struct prn_provider *prov = (struct prn_provider *)provider; + struct ticket ticket; + HRESULT hr; + + TRACE("%p,%p,%p,%d,%p,%p\n", provider, base, delta, scope, result, error); + + if (!is_valid_provider(provider) || !base || !result) + return E_INVALIDARG; + + hr = initialize_ticket(prov, &ticket); + if (hr != S_OK) return hr; + + hr = parse_ticket(base, scope, &ticket); + if (hr != S_OK) return hr; + + if (delta) + { + hr = parse_ticket(delta, scope, &ticket); + if (hr != S_OK) return hr; + } + + hr = write_ticket(result, &ticket, scope); + return hr ? hr : S_PT_NO_CONFLICT; +} diff --git a/include/prntvpt.h b/include/prntvpt.h index f1d7edc350..94b047d8c7 100644 --- a/include/prntvpt.h +++ b/include/prntvpt.h @@ -25,7 +25,9 @@ extern "C" { DECLARE_HANDLE(HPTPROVIDER); -#define E_PRINTTICKET_FORMAT 0x80040003 +#define S_PT_NO_CONFLICT 0x00040001 +#define S_PT_CONFLICT_RESOLVED 0x00040002 +#define E_PRINTTICKET_FORMAT 0x80040003 typedef enum { @@ -45,6 +47,7 @@ HRESULT WINAPI PTOpenProviderEx(const WCHAR *printer, DWORD max_version, DWORD p HRESULT WINAPI PTCloseProvider(HPTPROVIDER); HRESULT WINAPI PTConvertDevModeToPrintTicket(HPTPROVIDER, ULONG, PDEVMODEW, EPrintTicketScope, IStream *); HRESULT WINAPI PTConvertPrintTicketToDevMode(HPTPROVIDER, IStream *, EDefaultDevmodeType, EPrintTicketScope, ULONG *, PDEVMODEW *, BSTR *); +HRESULT WINAPI PTMergeAndValidatePrintTicket(HPTPROVIDER, IStream *, IStream *, EPrintTicketScope, IStream *, BSTR *); HRESULT WINAPI PTReleaseMemory(PVOID); #ifdef __cplusplus -- 2.26.2

1 0

[PATCH v2 10/12] prntvpt: Initialize ticket from printer defaults.
by Dmitry Timoshkov June 17, 2020

June 17, 2020

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/prntvpt/main.c | 15 ++---- dlls/prntvpt/prntvpt_private.h | 29 ++++++++++ dlls/prntvpt/ticket.c | 99 +++++++++++++++++++--------------- 3 files changed, 88 insertions(+), 55 deletions(-) create mode 100644 dlls/prntvpt/prntvpt_private.h diff --git a/dlls/prntvpt/main.c b/dlls/prntvpt/main.c index ac44cdc1ee..2c27dc6689 100644 --- a/dlls/prntvpt/main.c +++ b/dlls/prntvpt/main.c @@ -29,13 +29,9 @@ #include "wine/heap.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(prntvpt); +#include "prntvpt_private.h" -struct prn_provider -{ - DWORD owner; - HANDLE hprn; -}; +WINE_DEFAULT_DEBUG_CHANNEL(prntvpt); BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) { @@ -64,18 +60,13 @@ HRESULT WINAPI PTQuerySchemaVersionSupport(PCWSTR printer, DWORD *version) return E_NOTIMPL; } -static BOOL is_valid_provider(struct prn_provider *prov) -{ - return prov && prov->owner == GetCurrentThreadId(); -} - HRESULT WINAPI PTCloseProvider(HPTPROVIDER provider) { struct prn_provider *prov = (struct prn_provider *)provider; TRACE("%p\n", provider); - if (!is_valid_provider(prov)) + if (!is_valid_provider(provider)) return E_HANDLE; prov->owner = 0; diff --git a/dlls/prntvpt/prntvpt_private.h b/dlls/prntvpt/prntvpt_private.h new file mode 100644 index 0000000000..c8d1c5ef34 --- /dev/null +++ b/dlls/prntvpt/prntvpt_private.h @@ -0,0 +1,29 @@ +/* + * Copyright 2019 Dmitry Timoshkov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +struct prn_provider +{ + DWORD owner; + HANDLE hprn; +}; + +static inline BOOL is_valid_provider(HPTPROVIDER provider) +{ + struct prn_provider *prov = (struct prn_provider *)provider; + return prov && prov->owner == GetCurrentThreadId(); +} diff --git a/dlls/prntvpt/ticket.c b/dlls/prntvpt/ticket.c index 8f1da24af8..e9745233c9 100644 --- a/dlls/prntvpt/ticket.c +++ b/dlls/prntvpt/ticket.c @@ -33,6 +33,8 @@ #include "wine/heap.h" #include "wine/debug.h" +#include "prntvpt_private.h" + WINE_DEFAULT_DEBUG_CHANNEL(prntvpt); struct size @@ -665,47 +667,6 @@ static void ticket_to_devmode(const struct ticket *ticket, DEVMODEW *dm) dm->dmCollate = ticket->document.collate; } -static void initialize_ticket(struct ticket *ticket) -{ - ticket->job.nup = 0; - ticket->job.copies = 1; - ticket->job.input_bin = DMBIN_AUTO; - ticket->document.collate = DMCOLLATE_FALSE; - ticket->page.media.paper = DMPAPER_A4; - ticket->page.media.size.width = 210000; - ticket->page.media.size.height = 297000; - ticket->page.resolution.x = 600; - ticket->page.resolution.y = 600; - ticket->page.orientation = DMORIENT_PORTRAIT; - ticket->page.scaling = 100; - ticket->page.color = DMCOLOR_MONOCHROME; -} - -HRESULT WINAPI PTConvertPrintTicketToDevMode(HPTPROVIDER provider, IStream *stream, EDefaultDevmodeType type, - EPrintTicketScope scope, ULONG *size, PDEVMODEW *dm, BSTR *error) -{ - HRESULT hr; - struct ticket ticket; - - TRACE("%p,%p,%d,%d,%p,%p,%p\n", provider, stream, type, scope, size, dm, error); - - if (!provider || !stream || !size || !dm) - return E_INVALIDARG; - - initialize_ticket(&ticket); - - hr = parse_ticket(stream, scope, &ticket); - if (hr != S_OK) return hr; - - *dm = heap_alloc(sizeof(**dm)); - if (!dm) return E_OUTOFMEMORY; - - ticket_to_devmode(&ticket, *dm); - *size = sizeof(**dm); - - return S_OK; -} - static void devmode_to_ticket(const DEVMODEW *dm, struct ticket *ticket) { if (dm->dmFields & DM_ORIENTATION) @@ -738,6 +699,55 @@ static void devmode_to_ticket(const DEVMODEW *dm, struct ticket *ticket) ticket->document.collate = dm->dmCollate; } +static HRESULT initialize_ticket(struct prn_provider *prov, struct ticket *ticket) +{ + PRINTER_INFO_2W *pi2; + DWORD size; + HRESULT hr = S_OK; + + GetPrinterW(prov->hprn, 2, NULL, 0, &size); + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) + return HRESULT_FROM_WIN32(GetLastError()); + + pi2 = heap_alloc(size); + if (!pi2) return E_OUTOFMEMORY; + + if (!GetPrinterW(prov->hprn, 2, (LPBYTE)pi2, size, NULL)) + hr = HRESULT_FROM_WIN32(GetLastError()); + else + devmode_to_ticket(pi2->pDevMode, ticket); + + heap_free(pi2); + return hr; +} + +HRESULT WINAPI PTConvertPrintTicketToDevMode(HPTPROVIDER provider, IStream *stream, EDefaultDevmodeType type, + EPrintTicketScope scope, ULONG *size, PDEVMODEW *dm, BSTR *error) +{ + struct prn_provider *prov = (struct prn_provider *)provider; + HRESULT hr; + struct ticket ticket; + + TRACE("%p,%p,%d,%d,%p,%p,%p\n", provider, stream, type, scope, size, dm, error); + + if (!is_valid_provider(provider) || !stream || !size || !dm) + return E_INVALIDARG; + + hr = initialize_ticket(prov, &ticket); + if (hr != S_OK) return hr; + + hr = parse_ticket(stream, scope, &ticket); + if (hr != S_OK) return hr; + + *dm = heap_alloc(sizeof(**dm)); + if (!dm) return E_OUTOFMEMORY; + + ticket_to_devmode(&ticket, *dm); + *size = sizeof(**dm); + + return S_OK; +} + static HRESULT add_attribute(IXMLDOMElement *element, const WCHAR *attr, const WCHAR *value) { VARIANT var; @@ -1197,11 +1207,13 @@ static void dump_devmode(const DEVMODEW *dm) HRESULT WINAPI PTConvertDevModeToPrintTicket(HPTPROVIDER provider, ULONG size, PDEVMODEW dm, EPrintTicketScope scope, IStream *stream) { + struct prn_provider *prov = (struct prn_provider *)provider; struct ticket ticket; + HRESULT hr; TRACE("%p,%u,%p,%d,%p\n", provider, size, dm, scope, stream); - if (!provider || !dm || !stream) + if (!is_valid_provider(provider) || !dm || !stream) return E_INVALIDARG; dump_devmode(dm); @@ -1209,7 +1221,8 @@ HRESULT WINAPI PTConvertDevModeToPrintTicket(HPTPROVIDER provider, ULONG size, P if (!IsValidDevmodeW(dm, size)) return E_INVALIDARG; - initialize_ticket(&ticket); + hr = initialize_ticket(prov, &ticket); + if (hr != S_OK) return hr; devmode_to_ticket(dm, &ticket); return write_ticket(stream, &ticket, scope); -- 2.26.2

1 0

[PATCH v2 09/12] prntvpt: Add support for custom scaling to ticket XML writer.
by Dmitry Timoshkov June 17, 2020

June 17, 2020

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/prntvpt/ticket.c | 47 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 43 insertions(+), 4 deletions(-) diff --git a/dlls/prntvpt/ticket.c b/dlls/prntvpt/ticket.c index f012a16f7a..8f1da24af8 100644 --- a/dlls/prntvpt/ticket.c +++ b/dlls/prntvpt/ticket.c @@ -825,6 +825,16 @@ static HRESULT create_ParameterInit(IXMLDOMElement *root, const WCHAR *name, IXM return add_attribute(*child, L"name", name); } +static HRESULT create_ParameterRef(IXMLDOMElement *root, const WCHAR *name, IXMLDOMElement **child) +{ + HRESULT hr; + + hr = create_element(root, L"psf:ParameterRef", 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; @@ -889,12 +899,41 @@ static HRESULT write_PageScaling(IXMLDOMElement *root, const struct ticket *tick 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); + if (ticket->page.scaling == 100) + { + hr = create_Option(feature, L"psk:None", &option); + if (hr == S_OK) IXMLDOMElement_Release(option); + } + else + { + hr = create_Option(feature, L"psk:CustomSquare", &option); + if (hr == S_OK) + { + IXMLDOMElement *property, *parameter; + + hr = create_ScoredProperty(option, L"psk:Scale", &property); + if (hr == S_OK) + { + hr = create_ParameterRef(property, L"psk:PageScalingScale", &parameter); + if (hr == S_OK) + { + IXMLDOMElement_Release(parameter); + + hr = create_ParameterInit(root, L"psk:PageScalingScale", &parameter); + if (hr == S_OK) + { + hr = write_int_value(parameter, ticket->page.scaling); + IXMLDOMElement_Release(parameter); + } + } + + IXMLDOMElement_Release(property); + } - hr = create_Option(feature, L"psk:None", &option); + IXMLDOMElement_Release(option); + } + } - if (option) IXMLDOMElement_Release(option); IXMLDOMElement_Release(feature); return hr; } -- 2.26.2

1 0