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

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

17 Jun '20

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 support for DocumentCollate to ticket XML writer.
by Alexandre Julliard 17 Jun '20

17 Jun '20

Module: wine Branch: master Commit: 10e37819aa31b3eb70cbea31ad75007452f0e81e URL: https://source.winehq.org/git/wine.git/?a=commit;h=10e37819aa31b3eb70cbea31… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jun 17 13:22:17 2020 +0800 prntvpt: Add support for DocumentCollate 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 | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/prntvpt/ticket.c b/dlls/prntvpt/ticket.c index 13b5ad4ed4..a3b3f6a0ed 100644 --- a/dlls/prntvpt/ticket.c +++ b/dlls/prntvpt/ticket.c @@ -935,6 +935,24 @@ static HRESULT write_PageOrientation(IXMLDOMElement *root, const struct ticket * return hr; } +static HRESULT write_DocumentCollate(IXMLDOMElement *root, const struct ticket *ticket) +{ + IXMLDOMElement *feature, *option = NULL; + HRESULT hr; + + hr = create_Feature(root, L"psk:DocumentCollate", &feature); + if (hr != S_OK) return hr; + + if (ticket->document.collate == DMCOLLATE_TRUE) + hr = create_Option(feature, L"psk:Collated", &option); + else /* DMCOLLATE_FALSE */ + hr = create_Option(feature, L"psk:Uncollated", &option); + + if (option) IXMLDOMElement_Release(option); + IXMLDOMElement_Release(feature); + return hr; +} + static HRESULT write_attributes(IXMLDOMElement *element) { HRESULT hr; @@ -983,6 +1001,12 @@ static HRESULT write_ticket(IStream *stream, const struct ticket *ticket, EPrint hr = write_PageOrientation(root, ticket); if (hr != S_OK) goto fail; + if (scope >= kPTDocumentScope) + { + hr = write_DocumentCollate(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 JobInputBin to ticket XML writer.
by Alexandre Julliard 17 Jun '20

17 Jun '20

Module: wine Branch: master Commit: bd5a86e5645fcd622c91590f1757d2d123da38f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd5a86e5645fcd622c91590f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jun 17 13:22:19 2020 +0800 prntvpt: Add support for JobInputBin 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 | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/prntvpt/ticket.c b/dlls/prntvpt/ticket.c index a3b3f6a0ed..591d61cb6e 100644 --- a/dlls/prntvpt/ticket.c +++ b/dlls/prntvpt/ticket.c @@ -953,6 +953,24 @@ static HRESULT write_DocumentCollate(IXMLDOMElement *root, const struct ticket * return hr; } +static HRESULT write_JobInputBin(IXMLDOMElement *root, const struct ticket *ticket) +{ + IXMLDOMElement *feature, *option = NULL; + HRESULT hr; + + hr = create_Feature(root, L"psk:JobInputBin", &feature); + if (hr != S_OK) return hr; + + if (ticket->job.input_bin != DMBIN_AUTO) + FIXME("job.input_bin: %d\n", ticket->job.input_bin); + + hr = create_Option(feature, L"psk:AutoSelect", &option); + + if (option) IXMLDOMElement_Release(option); + IXMLDOMElement_Release(feature); + return hr; +} + static HRESULT write_attributes(IXMLDOMElement *element) { HRESULT hr; @@ -1007,6 +1025,12 @@ static HRESULT write_ticket(IStream *stream, const struct ticket *ticket, EPrint if (hr != S_OK) goto fail; } + if (scope >= kPTJobScope) + { + hr = write_JobInputBin(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 JobCopies to ticket XML writer.
by Alexandre Julliard 17 Jun '20

17 Jun '20

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

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

17 Jun '20

Module: wine Branch: master Commit: 642e82eddf451c43d786ef1e4dbe26ea8af33445 URL: https://source.winehq.org/git/wine.git/?a=commit;h=642e82eddf451c43d786ef1e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jun 17 13:22:30 2020 +0800 prntvpt: Add support for custom scaling 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 | 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; }

1 0

Dmitry Timoshkov : prntvpt: Initialize ticket from printer defaults.
by Alexandre Julliard 17 Jun '20

17 Jun '20

Module: wine Branch: master Commit: e934f14ba58fbb28aaaa37c6a330147d035e432d URL: https://source.winehq.org/git/wine.git/?a=commit;h=e934f14ba58fbb28aaaa37c6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jun 17 13:22:34 2020 +0800 prntvpt: Initialize ticket from printer defaults. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/prntvpt/main.c | 15 ++----- dlls/prntvpt/prntvpt_private.h | 29 +++++++++++++ dlls/prntvpt/ticket.c | 99 ++++++++++++++++++++++++------------------ 3 files changed, 88 insertions(+), 55 deletions(-) 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);

1 0

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

17 Jun '20

Module: wine Branch: master Commit: 534d2b98640d141ed61aca49195d8b8974a0d671 URL: https://source.winehq.org/git/wine.git/?a=commit;h=534d2b98640d141ed61aca49… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jun 17 13:22:38 2020 +0800 prntvpt: Implement PTMergeAndValidatePrintTicket. 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 | 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

1 0

Dmitry Timoshkov : prntvpt: Add initial implementation of PTGetPrintCapabilities.
by Alexandre Julliard 17 Jun '20

17 Jun '20

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

Zhiyi Zhang : user32: Change slave to a more neutral word.
by Alexandre Julliard 17 Jun '20

17 Jun '20

Module: wine Branch: master Commit: 2affb854e524dde962f983a36628f22fe9e165c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2affb854e524dde962f983a3… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jun 16 22:17:36 2020 +0800 user32: Change slave to a more neutral word. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 82ed851364..768aeb5d4f 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3910,7 +3910,7 @@ static BOOL update_monitor_cache(void) HANDLE mutex = NULL; DWORD state_flags; BOOL ret = FALSE; - BOOL mirrored_slave; + BOOL is_replica; DWORD i = 0, j; DWORD type; @@ -3956,17 +3956,17 @@ static BOOL update_monitor_cache(void) (BYTE *)&monitors[monitor_count].rcMonitor, sizeof(RECT), NULL, 0 )) goto fail; - /* Mirrored slave monitors also don't get enumerated */ - mirrored_slave = FALSE; + /* Replicas in mirroring monitor sets don't get enumerated */ + is_replica = FALSE; for (j = 0; j < monitor_count; j++) { if (EqualRect(&monitors[j].rcMonitor, &monitors[monitor_count].rcMonitor)) { - mirrored_slave = TRUE; + is_replica = TRUE; break; } } - if (mirrored_slave) + if (is_replica) continue; if (!SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCWORK, &type,

1 0

Ziqing Hui : windowscodecs/tests: Add tests for DdsFrameDecode_GetPixelFormat().
by Alexandre Julliard 17 Jun '20

17 Jun '20

Module: wine Branch: master Commit: 67a50f125298a4888d7f9df27d35559b06d4c8fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=67a50f125298a4888d7f9df2… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Jun 16 13:52:01 2020 +0800 windowscodecs/tests: Add tests for DdsFrameDecode_GetPixelFormat(). 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/ddsformat.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index a69ff35dcb..5e0340bdef 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -168,17 +168,18 @@ static struct test_data { BYTE *data; UINT size; UINT expected_frame_count; + const GUID *expected_pixel_format; WICDdsParameters expected_parameters; } test_data[] = { - { test_dds_image, sizeof(test_dds_image), 1, + { test_dds_image, sizeof(test_dds_image), 1, &GUID_WICPixelFormat32bppPBGRA, { 4, 4, 1, 1, 1, DXGI_FORMAT_BC1_UNORM, WICDdsTexture2D, WICDdsAlphaModePremultiplied } }, - { test_dds_mipmaps, sizeof(test_dds_mipmaps), 3, + { test_dds_mipmaps, sizeof(test_dds_mipmaps), 3, &GUID_WICPixelFormat32bppPBGRA, { 4, 4, 1, 3, 1, DXGI_FORMAT_BC1_UNORM, WICDdsTexture2D, WICDdsAlphaModePremultiplied } }, - { test_dds_volume, sizeof(test_dds_volume), 7, + { test_dds_volume, sizeof(test_dds_volume), 7, &GUID_WICPixelFormat32bppPBGRA, { 4, 4, 4, 3, 1, DXGI_FORMAT_BC1_UNORM, WICDdsTexture3D, WICDdsAlphaModePremultiplied } }, - { test_dds_array, sizeof(test_dds_array), 9, + { test_dds_array, sizeof(test_dds_array), 9, &GUID_WICPixelFormat32bppBGRA, { 4, 4, 1, 3, 3, DXGI_FORMAT_BC1_UNORM, WICDdsTexture2D, WICDdsAlphaModeUnknown } }, - { test_dds_dxt3, sizeof(test_dds_dxt3), 8, + { test_dds_dxt3, sizeof(test_dds_dxt3), 8, &GUID_WICPixelFormat32bppBGRA, { 12, 12, 1, 4, 2, DXGI_FORMAT_BC2_UNORM, WICDdsTexture2D, WICDdsAlphaModeUnknown } }, }; @@ -446,6 +447,7 @@ static void test_dds_decoder_frame_properties(IWICBitmapFrameDecode *frame_decod UINT width, height ,expected_width, expected_height, slice_index, depth; UINT width_in_blocks, height_in_blocks, expected_width_in_blocks, expected_height_in_blocks; WICDdsFormatInfo format_info; + GUID pixel_format; /* frame size tests */ @@ -511,6 +513,15 @@ static void test_dds_decoder_frame_properties(IWICBitmapFrameDecode *frame_decod ok (height_in_blocks == expected_height_in_blocks, "%d: [frame %d] Expected height in blocks %d, got %d\n", i, frame_index, expected_height_in_blocks, height_in_blocks); + /* pixel format tests */ + + hr = IWICBitmapFrameDecode_GetPixelFormat(frame_decode, NULL); + todo_wine ok (hr == E_INVALIDARG, "[%d, frame %d] GetPixelFormat got unexpected hr %x\n", i, frame_index, hr); + hr = IWICBitmapFrameDecode_GetPixelFormat(frame_decode, &pixel_format); + todo_wine ok (hr == S_OK, "[%d, frame %d] GetPixelFormat failed\n", i, frame_index); + if (hr != S_OK) return; + todo_wine ok (IsEqualGUID(&pixel_format, test_data[i].expected_pixel_format), + "[%d, frame %d] Got unexpected pixel format %s\n", i, frame_index, debugstr_guid(&pixel_format)); } static void test_dds_decoder_frame_data(IWICDdsFrameDecode *dds_frame, UINT frame_count, WICDdsParameters *params,

1 0