- Wine-Devel - list.winehq.org

[PATCH 04/10] prntvpt: Add support for PageScaling to ticket XML reader.
by Dmitry Timoshkov June 11, 2020

June 11, 2020

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/prntvpt/ticket.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/prntvpt/ticket.c b/dlls/prntvpt/ticket.c index 3ddb43b75f..74e9041670 100644 --- a/dlls/prntvpt/ticket.c +++ b/dlls/prntvpt/ticket.c @@ -294,6 +294,46 @@ static void read_PageOutputColor(IXMLDOMDocument2 *doc, struct ticket *ticket) IXMLDOMNode_Release(node); } +static void read_PageScaling(IXMLDOMDocument2 *doc, struct ticket *ticket) +{ + IXMLDOMNode *node, *option; + HRESULT hr; + + hr = IXMLDOMDocument2_selectSingleNode(doc, (BSTR)L"psf:PrintTicket/psf:Feature[@name='psk:PageScaling']", &node); + if (hr != S_OK) return; + + hr = IXMLDOMNode_selectSingleNode(node, (BSTR)L"./psf:Option", &option); + if (hr == S_OK) + { + IXMLDOMElement *element; + + hr = IXMLDOMNode_QueryInterface(option, &IID_IXMLDOMElement, (void **)&element); + if (hr == S_OK) + { + VARIANT var; + + VariantInit(&var); + hr = IXMLDOMElement_getAttribute(element, (BSTR)L"name", &var); + if (hr == S_OK && V_VT(&var) == VT_BSTR) + { + if (!wcscmp(V_BSTR(&var), L"psk:None")) + ticket->page.scaling = 100; + else + { + FIXME("%s\n", wine_dbgstr_w(V_BSTR(&var))); + ticket->page.scaling = 100; + } + TRACE("scaling: %s => %d\n", wine_dbgstr_w(V_BSTR(&var)), ticket->page.scaling); + } + VariantClear(&var); + + IXMLDOMElement_Release(element); + } + } + + IXMLDOMNode_Release(node); +} + static void set_SelectionNamespaces(IXMLDOMDocument2 *doc) { IStream *stream; @@ -389,6 +429,7 @@ static HRESULT parse_ticket(IStream *stream, EPrintTicketScope scope, struct tic /* PageScope is always added */ read_PageMediaSize(doc, ticket); read_PageOutputColor(doc, ticket); + read_PageScaling(doc, ticket); fail: IXMLDOMDocument2_Release(doc); -- 2.26.2

1 0

[PATCH 03/10] prntvpt: Add support for PageOutputColor to ticket XML reader.
by Dmitry Timoshkov June 11, 2020

June 11, 2020

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/prntvpt/ticket.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/dlls/prntvpt/ticket.c b/dlls/prntvpt/ticket.c index 8c0f87699a..3ddb43b75f 100644 --- a/dlls/prntvpt/ticket.c +++ b/dlls/prntvpt/ticket.c @@ -252,6 +252,48 @@ static void read_PageMediaSize(IXMLDOMDocument2 *doc, struct ticket *ticket) IXMLDOMNode_Release(node); } +static void read_PageOutputColor(IXMLDOMDocument2 *doc, struct ticket *ticket) +{ + IXMLDOMNode *node, *option; + HRESULT hr; + + hr = IXMLDOMDocument2_selectSingleNode(doc, (BSTR)L"psf:PrintTicket/psf:Feature[@name='psk:PageOutputColor']", &node); + if (hr != S_OK) return; + + hr = IXMLDOMNode_selectSingleNode(node, (BSTR)L"./psf:Option", &option); + if (hr == S_OK) + { + IXMLDOMElement *element; + + hr = IXMLDOMNode_QueryInterface(option, &IID_IXMLDOMElement, (void **)&element); + if (hr == S_OK) + { + VARIANT var; + + VariantInit(&var); + hr = IXMLDOMElement_getAttribute(element, (BSTR)L"name", &var); + if (hr == S_OK && V_VT(&var) == VT_BSTR) + { + if (!wcscmp(V_BSTR(&var), L"psk:Color")) + ticket->page.color = DMCOLOR_COLOR; + else if (!wcscmp(V_BSTR(&var), L"psk:Monochrome")) + ticket->page.color = DMCOLOR_MONOCHROME; + else + { + FIXME("%s\n", wine_dbgstr_w(V_BSTR(&var))); + ticket->page.color = DMCOLOR_MONOCHROME; + } + TRACE("color: %s => %d\n", wine_dbgstr_w(V_BSTR(&var)), ticket->page.color); + } + VariantClear(&var); + + IXMLDOMElement_Release(element); + } + } + + IXMLDOMNode_Release(node); +} + static void set_SelectionNamespaces(IXMLDOMDocument2 *doc) { IStream *stream; @@ -346,6 +388,7 @@ static HRESULT parse_ticket(IStream *stream, EPrintTicketScope scope, struct tic /* PageScope is always added */ read_PageMediaSize(doc, ticket); + read_PageOutputColor(doc, ticket); fail: IXMLDOMDocument2_Release(doc); -- 2.26.2

1 0

[PATCH 02/10] prntvpt: Implement PTConvertPrintTicketToDevMode.
by Dmitry Timoshkov June 11, 2020

June 11, 2020

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/prntvpt/Makefile.in | 5 +- dlls/prntvpt/main.c | 1 + dlls/prntvpt/prntvpt.spec | 2 +- dlls/prntvpt/ticket.c | 413 ++++++++++++++++++++++++++++++++++++++ include/prntvpt.h | 16 ++ 5 files changed, 434 insertions(+), 3 deletions(-) create mode 100644 dlls/prntvpt/ticket.c diff --git a/dlls/prntvpt/Makefile.in b/dlls/prntvpt/Makefile.in index a3db8760c2..452faa4fbf 100644 --- a/dlls/prntvpt/Makefile.in +++ b/dlls/prntvpt/Makefile.in @@ -1,8 +1,9 @@ MODULE = prntvpt.dll IMPORTLIB = prntvpt -IMPORTS = winspool +IMPORTS = winspool ole32 oleaut32 EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ - main.c + main.c \ + ticket.c diff --git a/dlls/prntvpt/main.c b/dlls/prntvpt/main.c index e150308720..ac44cdc1ee 100644 --- a/dlls/prntvpt/main.c +++ b/dlls/prntvpt/main.c @@ -24,6 +24,7 @@ #include "winbase.h" #include "wingdi.h" #include "winspool.h" +#include "objbase.h" #include "prntvpt.h" #include "wine/heap.h" #include "wine/debug.h" diff --git a/dlls/prntvpt/prntvpt.spec b/dlls/prntvpt/prntvpt.spec index d785bae9c6..ce8a0e591c 100644 --- a/dlls/prntvpt/prntvpt.spec +++ b/dlls/prntvpt/prntvpt.spec @@ -5,7 +5,7 @@ @ stub BindPTProviderThunk @ stub PTGetPrintCapabilities @ stub PTMergeAndValidatePrintTicket -@ stub PTConvertPrintTicketToDevMode +@ stdcall PTConvertPrintTicketToDevMode(ptr ptr long long ptr ptr ptr) @ stub PTConvertDevModeToPrintTicket @ stdcall PTReleaseMemory(ptr) @ stub ConvertDevModeToPrintTicketThunk2 diff --git a/dlls/prntvpt/ticket.c b/dlls/prntvpt/ticket.c new file mode 100644 index 0000000000..8c0f87699a --- /dev/null +++ b/dlls/prntvpt/ticket.c @@ -0,0 +1,413 @@ +/* + * 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 + */ + +#include <stdarg.h> + +#define COBJMACROS +#define NONAMELESSSTRUCT +#define NONAMELESSUNION + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winspool.h" +#include "objbase.h" +#include "prntvpt.h" +#include "initguid.h" +#include "msxml2.h" +#include "wine/heap.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(prntvpt); + +struct size +{ + int width; + int height; +}; + +struct media +{ + int paper; + struct size size; +}; + +struct resolution +{ + int x; + int y; +}; + +struct page +{ + struct media media; + struct resolution resolution; + int orientation; + int scaling; + int color; +}; + +struct document +{ + int collate; +}; + +struct job +{ + int nup; + int copies; + int input_bin; +}; + +struct ticket +{ + struct job job; + struct document document; + struct page page; +}; + +static const struct +{ + const WCHAR *name; + int paper; +} psk_media[] = +{ + { L"psk:ISOA4", DMPAPER_A4 }, +}; + +static int media_to_paper(const WCHAR *name) +{ + int i; + + for (i = 0 ; i < ARRAY_SIZE(psk_media); i++) + if (!wcscmp(name, psk_media[i].name)) + return psk_media[i].paper; + + FIXME("%s\n", wine_dbgstr_w(name)); + return DMPAPER_A4; +} + +static BOOL is_valid_node_name(const WCHAR *name) +{ + static const WCHAR * const psf_names[] = { L"psf:ParameterInit", L"psf:Feature" }; + int i; + + for (i = 0 ; i < ARRAY_SIZE(psf_names); i++) + if (!wcscmp(name, psf_names[i])) return TRUE; + + return FALSE; +} + +static HRESULT verify_ticket(IXMLDOMDocument2 *doc) +{ + IXMLDOMElement *element; + IXMLDOMNode *node = NULL; + BSTR str; + HRESULT hr; + + hr = IXMLDOMDocument2_get_documentElement(doc, &element); + if (hr != S_OK) return E_PRINTTICKET_FORMAT; + + hr = IXMLDOMElement_get_tagName(element, &str); + if (hr != S_OK) goto fail; + if (wcscmp(str, L"psf:PrintTicket") != 0) + hr = E_FAIL; + SysFreeString(str); + if (hr != S_OK) goto fail; + + hr = IXMLDOMElement_get_firstChild(element, &node); + IXMLDOMElement_Release(element); + if (hr != S_OK) return S_OK; + + for (;;) + { + VARIANT var; + IXMLDOMNode *next_node; + + hr = IXMLDOMNode_get_nodeName(node, &str); + if (hr != S_OK) break; + if (!is_valid_node_name(str)) + hr = E_FAIL; + SysFreeString(str); + if (hr != S_OK) break; + + hr = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMElement, (void **)&element); + if (hr != S_OK) break; + + VariantInit(&var); + hr = IXMLDOMElement_getAttribute(element, (BSTR)L"name", &var); + IXMLDOMElement_Release(element); + if (hr != S_OK) break; + if (V_VT(&var) != VT_BSTR) + hr = E_FAIL; + VariantClear(&var); + if (hr != S_OK) break; + + hr = IXMLDOMNode_get_nextSibling(node, &next_node); + if (hr != S_OK) + { + hr = S_OK; + break; + } + + IXMLDOMNode_Release(node); + node = next_node; + } + +fail: + if (node) IXMLDOMNode_Release(node); + + return hr != S_OK ? E_PRINTTICKET_FORMAT : S_OK; +} + +static HRESULT read_int_value(IXMLDOMNode *node, int *value) +{ + IXMLDOMNode *val; + HRESULT hr; + VARIANT var1, var2; + + hr = IXMLDOMNode_selectSingleNode(node, (BSTR)L"./psf:Value[@xsi:type='xsd:integer']", &val); + if (hr != S_OK) return hr; + + VariantInit(&var1); + hr = IXMLDOMNode_get_nodeTypedValue(val, &var1); + if (hr == S_OK) + { + VariantInit(&var2); + hr = VariantChangeTypeEx(&var2, &var1, 0, 0, VT_I4); + if (hr == S_OK) + *value = V_I4(&var2); + + VariantClear(&var1); + } + + IXMLDOMNode_Release(val); + return hr; +} + +static void read_PageMediaSize(IXMLDOMDocument2 *doc, struct ticket *ticket) +{ + IXMLDOMNode *node, *option, *child; + HRESULT hr; + + hr = IXMLDOMDocument2_selectSingleNode(doc, (BSTR)L"psf:PrintTicket/psf:Feature[@name='psk:PageMediaSize']", &node); + if (hr != S_OK) return; + + hr = IXMLDOMNode_selectSingleNode(node, (BSTR)L"./psf:Option", &option); + if (hr == S_OK) + { + IXMLDOMElement *element; + + hr = IXMLDOMNode_QueryInterface(option, &IID_IXMLDOMElement, (void **)&element); + if (hr == S_OK) + { + VARIANT var; + + VariantInit(&var); + hr = IXMLDOMElement_getAttribute(element, (BSTR)L"name", &var); + if (hr == S_OK && V_VT(&var) == VT_BSTR) + { + ticket->page.media.paper = media_to_paper(V_BSTR(&var)); + TRACE("paper: %s => %d\n", wine_dbgstr_w(V_BSTR(&var)), ticket->page.media.paper); + } + VariantClear(&var); + + IXMLDOMElement_Release(element); + } + + hr = IXMLDOMNode_selectSingleNode(option, (BSTR)L"./psf:ScoredProperty[@name='psk:MediaSizeWidth']", &child); + if (hr == S_OK) + { + if (read_int_value(child, &ticket->page.media.size.width) == S_OK) + TRACE("width: %d\n", ticket->page.media.size.width); + IXMLDOMNode_Release(child); + } + + hr = IXMLDOMNode_selectSingleNode(option, (BSTR)L"./psf:ScoredProperty[@name='psk:MediaSizeHeight']", &child); + if (hr == S_OK) + { + if (read_int_value(child, &ticket->page.media.size.height) == S_OK) + TRACE("height: %d\n", ticket->page.media.size.height); + IXMLDOMNode_Release(child); + } + + IXMLDOMNode_Release(option); + } + + IXMLDOMNode_Release(node); +} + +static void set_SelectionNamespaces(IXMLDOMDocument2 *doc) +{ + IStream *stream; + IXMLDOMElement *element = NULL; + IXMLDOMNamedNodeMap *map = NULL; + HRESULT hr; + LONG count, i; + HGLOBAL hmem; + BSTR str; + VARIANT var; + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + if (hr != S_OK) return; + + hr = IXMLDOMDocument2_get_documentElement(doc, &element); + if (hr != S_OK) goto fail; + + hr = IXMLDOMElement_get_attributes(element, &map); + if (hr != S_OK) goto fail; + + hr = IXMLDOMNamedNodeMap_get_length(map, &count); + if (hr != S_OK) goto fail; + + for (i = 0; i < count; i++) + { + IXMLDOMNode *node; + + hr = IXMLDOMNamedNodeMap_get_item(map, i, &node); + if (hr == S_OK) + { + hr = IXMLDOMNode_get_nodeName(node, &str); + if (hr == S_OK) + { + VariantInit(&var); + hr = IXMLDOMNode_get_nodeValue(node, &var); + if (hr == S_OK) + { + if (!wcscmp(str, L"xmlns") || !wcsncmp(str, L"xmlns:", 6)) + { + TRACE("ns[%d]: %s=%s\n", i, wine_dbgstr_w(str), wine_dbgstr_w(V_BSTR(&var))); + IStream_Write(stream, str, wcslen(str) * sizeof(WCHAR), NULL); + IStream_Write(stream, L"=\"", 2 * sizeof(WCHAR), NULL); + IStream_Write(stream, V_BSTR(&var), wcslen(V_BSTR(&var)) * sizeof(WCHAR), NULL); + IStream_Write(stream, L"\" ", 2 * sizeof(WCHAR), NULL); + } + VariantClear(&var); + } + SysFreeString(str); + } + IXMLDOMNode_Release(node); + } + } + + IStream_Write(stream, L"", sizeof(WCHAR), NULL); + + hr = GetHGlobalFromStream(stream, &hmem); + if (hr != S_OK) goto fail; + + str = GlobalLock(hmem); + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(str); + IXMLDOMDocument2_setProperty(doc, (BSTR)L"SelectionNamespaces", var); + SysFreeString(V_BSTR(&var)); + GlobalUnlock(hmem); + +fail: + if (map) IXMLDOMNamedNodeMap_Release(map); + if (element) IXMLDOMElement_Release(element); + IStream_Release(stream); +} + +static HRESULT parse_ticket(IStream *stream, EPrintTicketScope scope, struct ticket *ticket) +{ + IXMLDOMDocument2 *doc; + VARIANT src; + VARIANT_BOOL ret; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DOMDocument30, NULL, CLSCTX_INPROC_SERVER, + &IID_IXMLDOMDocument2, (void **)&doc); + if (hr != S_OK) return hr; + + V_VT(&src) = VT_UNKNOWN; + V_UNKNOWN(&src) = (IUnknown *)stream; + hr = IXMLDOMDocument2_load(doc, src, &ret); + if (hr != S_OK) goto fail; + + hr = verify_ticket(doc); + if (hr != S_OK) goto fail; + + set_SelectionNamespaces(doc); + + /* PageScope is always added */ + read_PageMediaSize(doc, ticket); + +fail: + IXMLDOMDocument2_Release(doc); + return hr; +} + +static void ticket_to_devmode(const struct ticket *ticket, DEVMODEW *dm) +{ + memset(dm, 0, sizeof(*dm)); + + dm->dmSize = sizeof(*dm); + dm->dmFields = DM_ORIENTATION | DM_PAPERSIZE | DM_PAPERLENGTH | DM_PAPERWIDTH | DM_SCALE | + DM_COPIES | DM_COLOR | DM_PRINTQUALITY | DM_YRESOLUTION | DM_COLLATE; + dm->u1.s1.dmOrientation = ticket->page.orientation; + dm->u1.s1.dmPaperSize = ticket->page.media.paper; + dm->u1.s1.dmPaperWidth = ticket->page.media.size.width / 100; + dm->u1.s1.dmPaperLength = ticket->page.media.size.height / 100; + dm->u1.s1.dmScale = ticket->page.scaling; + dm->u1.s1.dmCopies = ticket->job.copies; + dm->dmColor = ticket->page.color; + dm->u1.s1.dmPrintQuality = ticket->page.resolution.x; + dm->dmYResolution = ticket->page.resolution.y; + 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; +} diff --git a/include/prntvpt.h b/include/prntvpt.h index a3c28ef6d4..e1855badd1 100644 --- a/include/prntvpt.h +++ b/include/prntvpt.h @@ -25,9 +25,25 @@ extern "C" { DECLARE_HANDLE(HPTPROVIDER); +#define E_PRINTTICKET_FORMAT 0x80040003 + +typedef enum +{ + kPTPageScope, + kPTDocumentScope, + kPTJobScope +} EPrintTicketScope; + +typedef enum +{ + kUserDefaultDevmode, + kPrinterDefaultDevmode +} EDefaultDevmodeType; + HRESULT WINAPI PTOpenProvider(const WCHAR *printer, DWORD version, HPTPROVIDER *provider); HRESULT WINAPI PTOpenProviderEx(const WCHAR *printer, DWORD max_version, DWORD pref_version, HPTPROVIDER *provider, DWORD *used_version); HRESULT WINAPI PTCloseProvider(HPTPROVIDER); +HRESULT WINAPI PTConvertPrintTicketToDevMode(HPTPROVIDER, IStream *, EDefaultDevmodeType, EPrintTicketScope, ULONG *, PDEVMODEW *, BSTR *); HRESULT WINAPI PTReleaseMemory(PVOID); #ifdef __cplusplus -- 2.26.2

1 0

[PATCH 01/10] prntvpt: Implement PTReleaseMemory.
by Dmitry Timoshkov June 11, 2020

June 11, 2020

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/prntvpt/main.c | 6 ++++++ dlls/prntvpt/prntvpt.spec | 2 +- include/prntvpt.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/prntvpt/main.c b/dlls/prntvpt/main.c index 1bbe280d0e..e150308720 100644 --- a/dlls/prntvpt/main.c +++ b/dlls/prntvpt/main.c @@ -51,6 +51,12 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) return TRUE; } +HRESULT WINAPI PTReleaseMemory(PVOID mem) +{ + heap_free(mem); + return S_OK; +} + HRESULT WINAPI PTQuerySchemaVersionSupport(PCWSTR printer, DWORD *version) { FIXME("stub:%s %p\n", debugstr_w(printer), version); diff --git a/dlls/prntvpt/prntvpt.spec b/dlls/prntvpt/prntvpt.spec index 99c6708242..d785bae9c6 100644 --- a/dlls/prntvpt/prntvpt.spec +++ b/dlls/prntvpt/prntvpt.spec @@ -7,7 +7,7 @@ @ stub PTMergeAndValidatePrintTicket @ stub PTConvertPrintTicketToDevMode @ stub PTConvertDevModeToPrintTicket -@ stub PTReleaseMemory +@ stdcall PTReleaseMemory(ptr) @ stub ConvertDevModeToPrintTicketThunk2 @ stub ConvertDevModeToPrintTicketThunk @ stub ConvertPrintTicketToDevModeThunk2 diff --git a/include/prntvpt.h b/include/prntvpt.h index a453f8cb37..a3c28ef6d4 100644 --- a/include/prntvpt.h +++ b/include/prntvpt.h @@ -28,6 +28,7 @@ DECLARE_HANDLE(HPTPROVIDER); HRESULT WINAPI PTOpenProvider(const WCHAR *printer, DWORD version, HPTPROVIDER *provider); HRESULT WINAPI PTOpenProviderEx(const WCHAR *printer, DWORD max_version, DWORD pref_version, HPTPROVIDER *provider, DWORD *used_version); HRESULT WINAPI PTCloseProvider(HPTPROVIDER); +HRESULT WINAPI PTReleaseMemory(PVOID); #ifdef __cplusplus } -- 2.26.2

1 0

[PATCH 2/2] winhttp: Add WinHttpWebSocket* function stubs
by Alistair Leslie-Hughes June 11, 2020

June 11, 2020

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/winhttp/url.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/winhttp/winhttp.spec | 5 +++++ include/winhttp.h | 5 +++++ 3 files changed, 48 insertions(+) diff --git a/dlls/winhttp/url.c b/dlls/winhttp/url.c index 3e248bca9f..3ccaaedb54 100644 --- a/dlls/winhttp/url.c +++ b/dlls/winhttp/url.c @@ -554,3 +554,41 @@ BOOL WINAPI WinHttpCreateUrl( LPURL_COMPONENTS uc, DWORD flags, LPWSTR url, LPDW SetLastError( ERROR_SUCCESS ); return TRUE; } + +HINTERNET WINAPI WinHttpWebSocketCompleteUpgrade(HINTERNET handle, DWORD_PTR context) +{ + FIXME("%p, %p\n", handle, context); + + return NULL; +} + +DWORD WINAPI WinHttpWebSocketSend(HINTERNET handle, WINHTTP_WEB_SOCKET_BUFFER_TYPE type, + void *buffer, DWORD length) +{ + FIXME("%p, %d, %p, %d\n", handle, type, buffer, length); + + return ERROR_INVALID_PARAMETER; +} + +DWORD WINAPI WinHttpWebSocketReceive(HINTERNET handle, void *buffer, DWORD length, DWORD *read, + WINHTTP_WEB_SOCKET_BUFFER_TYPE *type) +{ + FIXME("%p, %p, %d, %p, %d\n", handle, buffer, length, read, type); + + return ERROR_INVALID_PARAMETER; +} + +DWORD WINAPI WinHttpWebSocketClose(HINTERNET handle, USHORT status, void *reason, DWORD length) +{ + FIXME("%p, %d, %p, %d\n", handle, status, reason, length); + + return ERROR_INVALID_PARAMETER; +} + +DWORD WINAPI WinHttpWebSocketQueryCloseStatus(HINTERNET handle, USHORT *status, void *reason, + DWORD length, DWORD *consumed) +{ + FIXME("%p, %p, %p, %d, %p\n", handle, status, reason, length, consumed); + + return ERROR_INVALID_PARAMETER; +} diff --git a/dlls/winhttp/winhttp.spec b/dlls/winhttp/winhttp.spec index 28dcb1598b..2d4dd8231d 100644 --- a/dlls/winhttp/winhttp.spec +++ b/dlls/winhttp/winhttp.spec @@ -28,4 +28,9 @@ @ stdcall WinHttpSetTimeouts(ptr long long long long) @ stdcall WinHttpTimeFromSystemTime(ptr ptr) @ stdcall WinHttpTimeToSystemTime(wstr ptr) +@ stdcall WinHttpWebSocketClose(ptr long ptr long) +@ stdcall WinHttpWebSocketCompleteUpgrade(ptr ptr) +@ stdcall WinHttpWebSocketQueryCloseStatus(ptr ptr ptr long ptr) +@ stdcall WinHttpWebSocketReceive(ptr ptr long ptr ptr) +@ stdcall WinHttpWebSocketSend(ptr long ptr long) @ stdcall WinHttpWriteData(ptr ptr long ptr) diff --git a/include/winhttp.h b/include/winhttp.h index ddfda48088..90ef804c75 100644 --- a/include/winhttp.h +++ b/include/winhttp.h @@ -853,6 +853,11 @@ WINHTTP_STATUS_CALLBACK WINAPI WinHttpSetStatusCallback(HINTERNET,WINHTTP_STATUS BOOL WINAPI WinHttpSetTimeouts(HINTERNET,int,int,int,int); BOOL WINAPI WinHttpTimeFromSystemTime(const SYSTEMTIME *,LPWSTR); BOOL WINAPI WinHttpTimeToSystemTime(LPCWSTR,SYSTEMTIME*); +DWORD WINAPI WinHttpWebSocketClose(HINTERNET,USHORT,void *,DWORD); +HINTERNET WINAPI WinHttpWebSocketCompleteUpgrade(HINTERNET,DWORD_PTR); +DWORD WINAPI WinHttpWebSocketQueryCloseStatus(HINTERNET, USHORT*, void*,DWORD, DWORD*); +DWORD WINAPI WinHttpWebSocketReceive(HINTERNET,void*,DWORD,DWORD*,WINHTTP_WEB_SOCKET_BUFFER_TYPE*); +DWORD WINAPI WinHttpWebSocketSend(HINTERNET,WINHTTP_WEB_SOCKET_BUFFER_TYPE,void *,DWORD); BOOL WINAPI WinHttpWriteData(HINTERNET,LPCVOID,DWORD,LPDWORD); DWORD WINAPI WinHttpWriteProxySettings(HINTERNET,BOOL,WINHTTP_PROXY_SETTINGS*); -- 2.26.2

1 0

[PATCH 1/2] include: Add winhttp web socket defines
by Alistair Leslie-Hughes June 11, 2020

June 11, 2020

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/winhttp.h | 48 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/include/winhttp.h b/include/winhttp.h index 33fc1f915d..ddfda48088 100644 --- a/include/winhttp.h +++ b/include/winhttp.h @@ -762,6 +762,54 @@ typedef struct _WINHTTP_REQUEST_STATS ULONGLONG rgullStats[WinHttpRequestStatMax]; } WINHTTP_REQUEST_STATS, *PWINHTTP_REQUEST_STATS; +typedef enum _WINHTTP_WEB_SOCKET_OPERATION +{ + WINHTTP_WEB_SOCKET_SEND_OPERATION = 0, + WINHTTP_WEB_SOCKET_RECEIVE_OPERATION = 1, + WINHTTP_WEB_SOCKET_CLOSE_OPERATION = 2, + WINHTTP_WEB_SOCKET_SHUTDOWN_OPERATION = 3 +} WINHTTP_WEB_SOCKET_OPERATION; + +typedef enum _WINHTTP_WEB_SOCKET_BUFFER_TYPE +{ + WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE = 0, + WINHTTP_WEB_SOCKET_BINARY_FRAGMENT_BUFFER_TYPE = 1, + WINHTTP_WEB_SOCKET_UTF8_MESSAGE_BUFFER_TYPE = 2, + WINHTTP_WEB_SOCKET_UTF8_FRAGMENT_BUFFER_TYPE = 3, + WINHTTP_WEB_SOCKET_CLOSE_BUFFER_TYPE = 4 +} WINHTTP_WEB_SOCKET_BUFFER_TYPE; + +typedef enum _WINHTTP_WEB_SOCKET_CLOSE_STATUS +{ + WINHTTP_WEB_SOCKET_SUCCESS_CLOSE_STATUS = 1000, + WINHTTP_WEB_SOCKET_ENDPOINT_TERMINATED_CLOSE_STATUS = 1001, + WINHTTP_WEB_SOCKET_PROTOCOL_ERROR_CLOSE_STATUS = 1002, + WINHTTP_WEB_SOCKET_INVALID_DATA_TYPE_CLOSE_STATUS = 1003, + WINHTTP_WEB_SOCKET_EMPTY_CLOSE_STATUS = 1005, + WINHTTP_WEB_SOCKET_ABORTED_CLOSE_STATUS = 1006, + WINHTTP_WEB_SOCKET_INVALID_PAYLOAD_CLOSE_STATUS = 1007, + WINHTTP_WEB_SOCKET_POLICY_VIOLATION_CLOSE_STATUS = 1008, + WINHTTP_WEB_SOCKET_MESSAGE_TOO_BIG_CLOSE_STATUS = 1009, + WINHTTP_WEB_SOCKET_UNSUPPORTED_EXTENSIONS_CLOSE_STATUS = 1010, + WINHTTP_WEB_SOCKET_SERVER_ERROR_CLOSE_STATUS = 1011, + WINHTTP_WEB_SOCKET_SECURE_HANDSHAKE_ERROR_CLOSE_STATUS = 1015 +} WINHTTP_WEB_SOCKET_CLOSE_STATUS; + +typedef struct _WINHTTP_WEB_SOCKET_ASYNC_RESULT +{ + WINHTTP_ASYNC_RESULT AsyncResult; + WINHTTP_WEB_SOCKET_OPERATION Operation; +} WINHTTP_WEB_SOCKET_ASYNC_RESULT; + +typedef struct _WINHTTP_WEB_SOCKET_STATUS +{ + DWORD dwBytesTransferred; + WINHTTP_WEB_SOCKET_BUFFER_TYPE eBufferType; +} WINHTTP_WEB_SOCKET_STATUS; + +#define WINHTTP_WEB_SOCKET_MAX_CLOSE_REASON_LENGTH 123 +#define WINHTTP_WEB_SOCKET_MIN_KEEPALIVE_VALUE 15000 + #ifdef __cplusplus extern "C" { #endif -- 2.26.2

1 0

[PATCH v4 1/2] user32/tests:Add test function Used to verify the child window Z order problem
by Jiajin Cui June 11, 2020

June 11, 2020

Signed-off-by: cuijiajin <cuijiajin(a)uniontech.com> --- dlls/user32/tests/win.c | 58 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+)

2 1

[PATCH v4 2/2] user32:Fix z order error when child window want to be topmost windows
by Jiajin Cui June 11, 2020

June 11, 2020

I have submit job to wine testbot, the job id is 73197,73198 for verify this patch. and I think this path wasn`t for specific application. window with WS_CHILD does not need to change Z order when SetWindowPos param hwndInsertAfter is HWND_TOPMOST or HWND_NOTOPMOST Signed-off-by: cuijiajin <cuijiajin(a)uniontech.com> --- dlls/user32/winpos.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)

2 1

[PATCH v4 1/2] user32/tests:Add test function Used to verify the child window Z order problem
by Jiajin Cui June 11, 2020

June 11, 2020

Signed-off-by: cuijiajin <cuijiajin(a)uniontech.com> --- dlls/user32/tests/win.c | 58 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+)

1 0

[PATCH] ws2_32: Implement GetHostNameW() function using GetComputerNameW
by Vijay Kiran Kamuju June 10, 2020

June 10, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49286 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0