- Wine-Devel - list.winehq.org

[PATCH 1/4] prntvpt: Implement PTConvertDevModeToPrintTicket.
by Dmitry Timoshkov June 15, 2020

June 15, 2020

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/prntvpt/prntvpt.spec | 2 +- dlls/prntvpt/ticket.c | 482 ++++++++++++++++++++++++++++++++++++++ include/prntvpt.h | 1 + 3 files changed, 484 insertions(+), 1 deletion(-) diff --git a/dlls/prntvpt/prntvpt.spec b/dlls/prntvpt/prntvpt.spec index ce8a0e591c..bae26fab9d 100644 --- a/dlls/prntvpt/prntvpt.spec +++ b/dlls/prntvpt/prntvpt.spec @@ -6,7 +6,7 @@ @ stub PTGetPrintCapabilities @ stub PTMergeAndValidatePrintTicket @ stdcall PTConvertPrintTicketToDevMode(ptr ptr long long ptr ptr ptr) -@ stub PTConvertDevModeToPrintTicket +@ stdcall PTConvertDevModeToPrintTicket(ptr long ptr long ptr) @ stdcall PTReleaseMemory(ptr) @ stub ConvertDevModeToPrintTicketThunk2 @ stub ConvertDevModeToPrintTicketThunk diff --git a/dlls/prntvpt/ticket.c b/dlls/prntvpt/ticket.c index 36e343bbf2..f012a16f7a 100644 --- a/dlls/prntvpt/ticket.c +++ b/dlls/prntvpt/ticket.c @@ -102,6 +102,18 @@ static int media_to_paper(const WCHAR *name) return DMPAPER_A4; } +static const WCHAR *paper_to_media(int paper) +{ + int i; + + for (i = 0 ; i < ARRAY_SIZE(psk_media); i++) + if (psk_media[i].paper == paper) + return psk_media[i].name; + + FIXME("%d\n", paper); + return psk_media[0].name; +} + static BOOL is_valid_node_name(const WCHAR *name) { static const WCHAR * const psf_names[] = { L"psf:ParameterInit", L"psf:Feature" }; @@ -693,3 +705,473 @@ HRESULT WINAPI PTConvertPrintTicketToDevMode(HPTPROVIDER provider, IStream *stre return S_OK; } + +static void devmode_to_ticket(const DEVMODEW *dm, struct ticket *ticket) +{ + if (dm->dmFields & DM_ORIENTATION) + ticket->page.orientation = dm->u1.s1.dmOrientation; + if (dm->dmFields & DM_PAPERSIZE) + ticket->page.media.paper = dm->u1.s1.dmPaperSize; + if (dm->dmFields & DM_PAPERLENGTH) + ticket->page.media.size.width = dm->u1.s1.dmPaperWidth * 100; + if (dm->dmFields & DM_PAPERWIDTH) + ticket->page.media.size.height = dm->u1.s1.dmPaperLength * 100; + if (dm->dmFields & DM_SCALE) + ticket->page.scaling = dm->u1.s1.dmScale; + if (dm->dmFields & DM_COPIES) + ticket->job.copies = dm->u1.s1.dmCopies; + if (dm->dmFields & DM_COLOR) + ticket->page.color = dm->dmColor; + if (dm->dmFields & DM_PRINTQUALITY) + { + ticket->page.resolution.x = dm->u1.s1.dmPrintQuality; + ticket->page.resolution.y = dm->u1.s1.dmPrintQuality; + } + if (dm->dmFields & DM_YRESOLUTION) + ticket->page.resolution.y = dm->dmYResolution; + if (dm->dmFields & DM_LOGPIXELS) + { + ticket->page.resolution.x = dm->dmLogPixels; + ticket->page.resolution.y = dm->dmLogPixels; + } + if (dm->dmFields & DM_COLLATE) + ticket->document.collate = dm->dmCollate; +} + +static HRESULT add_attribute(IXMLDOMElement *element, const WCHAR *attr, const WCHAR *value) +{ + VARIANT var; + BSTR name; + HRESULT hr; + + name = SysAllocString(attr); + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(value); + + hr = IXMLDOMElement_setAttribute(element, name, var); + + SysFreeString(name); + SysFreeString(V_BSTR(&var)); + + return hr; +} + +static HRESULT create_element(IXMLDOMElement *root, const WCHAR *name, IXMLDOMElement **child) +{ + IXMLDOMDocument *doc; + HRESULT hr; + + hr = IXMLDOMElement_get_ownerDocument(root, &doc); + if (hr != S_OK) return hr; + + hr = IXMLDOMDocument_createElement(doc, (BSTR)name, child); + if (hr == S_OK) + hr = IXMLDOMElement_appendChild(root, (IXMLDOMNode *)*child, NULL); + + IXMLDOMDocument_Release(doc); + return hr; +} + +static HRESULT write_int_value(IXMLDOMElement *root, int value) +{ + HRESULT hr; + IXMLDOMElement *child; + VARIANT var; + + hr = create_element(root, L"psf:Value", &child); + if (hr != S_OK) return hr; + + hr = add_attribute(child, L"xsi:type", L"xsd:integer"); + if (hr != S_OK) return hr; + + V_VT(&var) = VT_I4; + V_I4(&var) = value; + hr = IXMLDOMElement_put_nodeTypedValue(child, var); + + IXMLDOMElement_Release(child); + return hr; +} + +static HRESULT create_Feature(IXMLDOMElement *root, const WCHAR *name, IXMLDOMElement **child) +{ + HRESULT hr; + + hr = create_element(root, L"psf:Feature", child); + if (hr != S_OK) return hr; + + return add_attribute(*child, L"name", name); +} + +static HRESULT create_Option(IXMLDOMElement *root, const WCHAR *name, IXMLDOMElement **child) +{ + HRESULT hr; + + hr = create_element(root, L"psf:Option", child); + if (hr != S_OK) return hr; + + if (name) + hr = add_attribute(*child, L"name", name); + + 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; + + hr = create_element(root, L"psf:ScoredProperty", child); + if (hr != S_OK) return hr; + + return add_attribute(*child, L"name", name); +} + +static HRESULT write_PageMediaSize(IXMLDOMElement *root, const struct ticket *ticket) +{ + IXMLDOMElement *feature, *option = NULL, *property; + HRESULT hr; + + hr = create_Feature(root, L"psk:PageMediaSize", &feature); + if (hr != S_OK) return hr; + + hr = create_Option(feature, paper_to_media(ticket->page.media.paper), &option); + if (hr != S_OK) goto fail; + + hr = create_ScoredProperty(option, L"psk:MediaSizeWidth", &property); + if (hr != S_OK) goto fail; + hr = write_int_value(property, ticket->page.media.size.width); + IXMLDOMElement_Release(property); + if (hr != S_OK) goto fail; + + hr = create_ScoredProperty(option, L"psk:MediaSizeHeight", &property); + if (hr != S_OK) goto fail; + hr = write_int_value(property, ticket->page.media.size.height); + IXMLDOMElement_Release(property); + +fail: + if (option) IXMLDOMElement_Release(option); + IXMLDOMElement_Release(feature); + return hr; +} + +static HRESULT write_PageOutputColor(IXMLDOMElement *root, const struct ticket *ticket) +{ + IXMLDOMElement *feature, *option = NULL; + HRESULT hr; + + hr = create_Feature(root, L"psk:PageOutputColor", &feature); + if (hr != S_OK) return hr; + + if (ticket->page.color == DMCOLOR_COLOR) + hr = create_Option(feature, L"psk:Color", &option); + else /* DMCOLOR_MONOCHROME */ + hr = create_Option(feature, L"psk:Monochrome", &option); + + if (option) IXMLDOMElement_Release(option); + IXMLDOMElement_Release(feature); + return hr; +} + +static HRESULT write_PageScaling(IXMLDOMElement *root, const struct ticket *ticket) +{ + IXMLDOMElement *feature, *option = NULL; + HRESULT hr; + + hr = create_Feature(root, L"psk:PageScaling", &feature); + if (hr != S_OK) return hr; + + if (ticket->page.scaling != 100) + FIXME("page.scaling: %d\n", ticket->page.scaling); + + hr = create_Option(feature, L"psk:None", &option); + + if (option) IXMLDOMElement_Release(option); + IXMLDOMElement_Release(feature); + return hr; +} + +static HRESULT write_PageResolution(IXMLDOMElement *root, const struct ticket *ticket) +{ + IXMLDOMElement *feature, *option = NULL, *property; + HRESULT hr; + + hr = create_Feature(root, L"psk:PageResolution", &feature); + if (hr != S_OK) return hr; + + hr = create_Option(feature, NULL, &option); + if (hr != S_OK) goto fail; + + hr = create_ScoredProperty(option, L"psk:ResolutionX", &property); + if (hr != S_OK) goto fail; + hr = write_int_value(property, ticket->page.resolution.x); + IXMLDOMElement_Release(property); + if (hr != S_OK) goto fail; + + hr = create_ScoredProperty(option, L"psk:ResolutionY", &property); + if (hr != S_OK) goto fail; + hr = write_int_value(property, ticket->page.resolution.y); + IXMLDOMElement_Release(property); + +fail: + if (option) IXMLDOMElement_Release(option); + IXMLDOMElement_Release(feature); + return hr; +} + +static HRESULT write_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_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_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_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; + + hr = add_attribute(element, L"xmlns:psf", L"http://schemas.microsoft.com/windows/2003/08/printing/printschemaframework"); + if (hr != S_OK) return hr; + hr = add_attribute(element, L"xmlns:psk", L"http://schemas.microsoft.com/windows/2003/08/printing/printschemakeywords"); + if (hr != S_OK) return hr; + hr = add_attribute(element, L"xmlns:xsi", L"http://www.w3.org/2001/XMLSchema-instance"); + if (hr != S_OK) return hr; + hr = add_attribute(element, L"xmlns:xsd", L"http://www.w3.org/2001/XMLSchema"); + if (hr != S_OK) return hr; + + return add_attribute(element, L"version", L"1"); +} + +static HRESULT write_ticket(IStream *stream, const struct ticket *ticket, EPrintTicketScope scope) +{ + 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:PrintTicket", &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(root, ticket); + if (hr != S_OK) goto fail; + hr = write_PageOutputColor(root, ticket); + if (hr != S_OK) goto fail; + hr = write_PageScaling(root, ticket); + if (hr != S_OK) goto fail; + hr = write_PageResolution(root, ticket); + if (hr != S_OK) goto fail; + 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; + } + + if (scope >= kPTJobScope) + { + 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); + 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; +} + +static void dump_fields(DWORD fields) +{ + int add_space = 0; + +#define CHECK_FIELD(flag) \ +do \ +{ \ + if (fields & flag) \ + { \ + if (add_space++) TRACE(" "); \ + TRACE(#flag); \ + fields &= ~flag; \ + } \ +} \ +while (0) + + CHECK_FIELD(DM_ORIENTATION); + CHECK_FIELD(DM_PAPERSIZE); + CHECK_FIELD(DM_PAPERLENGTH); + CHECK_FIELD(DM_PAPERWIDTH); + CHECK_FIELD(DM_SCALE); + CHECK_FIELD(DM_POSITION); + CHECK_FIELD(DM_NUP); + CHECK_FIELD(DM_DISPLAYORIENTATION); + CHECK_FIELD(DM_COPIES); + CHECK_FIELD(DM_DEFAULTSOURCE); + CHECK_FIELD(DM_PRINTQUALITY); + CHECK_FIELD(DM_COLOR); + CHECK_FIELD(DM_DUPLEX); + CHECK_FIELD(DM_YRESOLUTION); + CHECK_FIELD(DM_TTOPTION); + CHECK_FIELD(DM_COLLATE); + CHECK_FIELD(DM_FORMNAME); + CHECK_FIELD(DM_LOGPIXELS); + CHECK_FIELD(DM_BITSPERPEL); + CHECK_FIELD(DM_PELSWIDTH); + CHECK_FIELD(DM_PELSHEIGHT); + CHECK_FIELD(DM_DISPLAYFLAGS); + CHECK_FIELD(DM_DISPLAYFREQUENCY); + CHECK_FIELD(DM_ICMMETHOD); + CHECK_FIELD(DM_ICMINTENT); + CHECK_FIELD(DM_MEDIATYPE); + CHECK_FIELD(DM_DITHERTYPE); + CHECK_FIELD(DM_PANNINGWIDTH); + CHECK_FIELD(DM_PANNINGHEIGHT); + if (fields) TRACE(" %#x", fields); + TRACE("\n"); +#undef CHECK_FIELD +} + +/* Dump DEVMODE structure without a device specific part. + * Some applications and drivers fail to specify correct field + * flags (like DM_FORMNAME), so dump everything. + */ +static void dump_devmode(const DEVMODEW *dm) +{ + if (!TRACE_ON(prntvpt)) return; + + TRACE("dmDeviceName: %s\n", debugstr_w(dm->dmDeviceName)); + TRACE("dmSpecVersion: 0x%04x\n", dm->dmSpecVersion); + TRACE("dmDriverVersion: 0x%04x\n", dm->dmDriverVersion); + TRACE("dmSize: 0x%04x\n", dm->dmSize); + TRACE("dmDriverExtra: 0x%04x\n", dm->dmDriverExtra); + TRACE("dmFields: 0x%04x\n", dm->dmFields); + dump_fields(dm->dmFields); + TRACE("dmOrientation: %d\n", dm->u1.s1.dmOrientation); + TRACE("dmPaperSize: %d\n", dm->u1.s1.dmPaperSize); + TRACE("dmPaperLength: %d\n", dm->u1.s1.dmPaperLength); + TRACE("dmPaperWidth: %d\n", dm->u1.s1.dmPaperWidth); + TRACE("dmScale: %d\n", dm->u1.s1.dmScale); + TRACE("dmCopies: %d\n", dm->u1.s1.dmCopies); + TRACE("dmDefaultSource: %d\n", dm->u1.s1.dmDefaultSource); + TRACE("dmPrintQuality: %d\n", dm->u1.s1.dmPrintQuality); + TRACE("dmColor: %d\n", dm->dmColor); + TRACE("dmDuplex: %d\n", dm->dmDuplex); + TRACE("dmYResolution: %d\n", dm->dmYResolution); + TRACE("dmTTOption: %d\n", dm->dmTTOption); + TRACE("dmCollate: %d\n", dm->dmCollate); + TRACE("dmFormName: %s\n", debugstr_w(dm->dmFormName)); + TRACE("dmLogPixels %u\n", dm->dmLogPixels); + TRACE("dmBitsPerPel %u\n", dm->dmBitsPerPel); + TRACE("dmPelsWidth %u\n", dm->dmPelsWidth); + TRACE("dmPelsHeight %u\n", dm->dmPelsHeight); +} + +HRESULT WINAPI PTConvertDevModeToPrintTicket(HPTPROVIDER provider, ULONG size, PDEVMODEW dm, + EPrintTicketScope scope, IStream *stream) +{ + struct ticket ticket; + + TRACE("%p,%u,%p,%d,%p\n", provider, size, dm, scope, stream); + + if (!provider || !dm || !stream) + return E_INVALIDARG; + + dump_devmode(dm); + + if (!IsValidDevmodeW(dm, size)) + return E_INVALIDARG; + + initialize_ticket(&ticket); + devmode_to_ticket(dm, &ticket); + + return write_ticket(stream, &ticket, scope); +} diff --git a/include/prntvpt.h b/include/prntvpt.h index e1855badd1..f1d7edc350 100644 --- a/include/prntvpt.h +++ b/include/prntvpt.h @@ -43,6 +43,7 @@ typedef enum 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 PTConvertDevModeToPrintTicket(HPTPROVIDER, ULONG, PDEVMODEW, EPrintTicketScope, IStream *); HRESULT WINAPI PTConvertPrintTicketToDevMode(HPTPROVIDER, IStream *, EDefaultDevmodeType, EPrintTicketScope, ULONG *, PDEVMODEW *, BSTR *); HRESULT WINAPI PTReleaseMemory(PVOID); -- 2.26.2

2 1

[PATCH] d3dx10_43/tests: Add tests for D3DX10GetImageInfoFromMemory().
by Ziqing Hui June 15, 2020

June 15, 2020

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d3dx10_43/tests/d3dx10.c | 138 ++++++++++++++++++++++++++++++++++ 1 file changed, 138 insertions(+)

1 0

[PATCH 1/8] netio.sys: Implement wsk_get_address_info() function.
by Paul Gofman June 15, 2020

June 15, 2020

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/netio.sys/Makefile.in | 2 +- dlls/netio.sys/netio.c | 120 ++++++++++++++++++++++++++++++++++++- 2 files changed, 118 insertions(+), 4 deletions(-) diff --git a/dlls/netio.sys/Makefile.in b/dlls/netio.sys/Makefile.in index 76e541021a6..2db691540df 100644 --- a/dlls/netio.sys/Makefile.in +++ b/dlls/netio.sys/Makefile.in @@ -1,6 +1,6 @@ MODULE = netio.sys IMPORTLIB = netio -IMPORTS = ntoskrnl +IMPORTS = ntoskrnl ws2_32 EXTRADLLFLAGS = -mno-cygwin -Wl,--subsystem,native C_SRCS = \ diff --git a/dlls/netio.sys/netio.c b/dlls/netio.sys/netio.c index fac91736ab1..cbbf8c06118 100644 --- a/dlls/netio.sys/netio.c +++ b/dlls/netio.sys/netio.c @@ -31,6 +31,8 @@ #include "ddk/wdm.h" #include "ddk/wsk.h" #include "wine/debug.h" +#include "winsock2.h" +#include "ws2tcpip.h" #include "wine/heap.h" @@ -42,6 +44,54 @@ struct _WSK_CLIENT WSK_CLIENT_NPI *client_npi; }; +static NTSTATUS sock_error_to_ntstatus(DWORD err) +{ + switch (err) + { + case 0: return STATUS_SUCCESS; + case WSAEBADF: return STATUS_INVALID_HANDLE; + case WSAEACCES: return STATUS_ACCESS_DENIED; + case WSAEFAULT: return STATUS_NO_MEMORY; + case WSAEINVAL: return STATUS_INVALID_PARAMETER; + case WSAEMFILE: return STATUS_TOO_MANY_OPENED_FILES; + case WSAEWOULDBLOCK: return STATUS_CANT_WAIT; + case WSAEINPROGRESS: return STATUS_PENDING; + case WSAEALREADY: return STATUS_NETWORK_BUSY; + case WSAENOTSOCK: return STATUS_OBJECT_TYPE_MISMATCH; + case WSAEDESTADDRREQ: return STATUS_INVALID_PARAMETER; + case WSAEMSGSIZE: return STATUS_BUFFER_OVERFLOW; + case WSAEPROTONOSUPPORT: + case WSAESOCKTNOSUPPORT: + case WSAEPFNOSUPPORT: + case WSAEAFNOSUPPORT: + case WSAEPROTOTYPE: return STATUS_NOT_SUPPORTED; + case WSAENOPROTOOPT: return STATUS_INVALID_PARAMETER; + case WSAEOPNOTSUPP: return STATUS_NOT_SUPPORTED; + case WSAEADDRINUSE: return STATUS_ADDRESS_ALREADY_ASSOCIATED; + case WSAEADDRNOTAVAIL: return STATUS_INVALID_PARAMETER; + case WSAECONNREFUSED: return STATUS_CONNECTION_REFUSED; + case WSAESHUTDOWN: return STATUS_PIPE_DISCONNECTED; + case WSAENOTCONN: return STATUS_CONNECTION_DISCONNECTED; + case WSAETIMEDOUT: return STATUS_IO_TIMEOUT; + case WSAENETUNREACH: return STATUS_NETWORK_UNREACHABLE; + case WSAENETDOWN: return STATUS_NETWORK_BUSY; + case WSAECONNRESET: return STATUS_CONNECTION_RESET; + case WSAECONNABORTED: return STATUS_CONNECTION_ABORTED; + case WSAHOST_NOT_FOUND: return STATUS_NOT_FOUND; + default: + FIXME("Unmapped error %u.\n", err); + return STATUS_UNSUCCESSFUL; + } +} + +static void dispatch_irp(IRP *irp, NTSTATUS status) +{ + irp->IoStatus.u.Status = status; + --irp->CurrentLocation; + --irp->Tail.Overlay.s.u2.CurrentStackLocation; + IoCompleteRequest(irp, IO_NO_INCREMENT); +} + static NTSTATUS WINAPI wsk_socket(WSK_CLIENT *client, ADDRESS_FAMILY address_family, USHORT socket_type, ULONG protocol, ULONG Flags, void *socket_context, const void *dispatch, PEPROCESS owning_process, PETHREAD owning_thread, SECURITY_DESCRIPTOR *security_descriptor, IRP *irp) @@ -81,16 +131,74 @@ static NTSTATUS WINAPI wsk_control_client(WSK_CLIENT *client, ULONG control_code return STATUS_NOT_IMPLEMENTED; } +struct wsk_get_address_info_context +{ + UNICODE_STRING *node_name; + UNICODE_STRING *service_name; + ULONG namespace; + GUID *provider; + ADDRINFOEXW *hints; + ADDRINFOEXW **result; + IRP *irp; +}; + +static void WINAPI get_address_info_callback(TP_CALLBACK_INSTANCE *instance, void *context_) +{ + struct wsk_get_address_info_context *context = context_; + INT ret; + + TRACE("instance %p, context %p.\n", instance, context); + + ret = GetAddrInfoExW( context->node_name ? context->node_name->Buffer : NULL, + context->service_name ? context->service_name->Buffer : NULL, context->namespace, + context->provider, context->hints, context->result, NULL, NULL, NULL, NULL); + + context->irp->IoStatus.Information = 0; + dispatch_irp(context->irp, sock_error_to_ntstatus(ret)); + heap_free(context); +} + static NTSTATUS WINAPI wsk_get_address_info(WSK_CLIENT *client, UNICODE_STRING *node_name, UNICODE_STRING *service_name, ULONG name_space, GUID *provider, ADDRINFOEXW *hints, ADDRINFOEXW **result, PEPROCESS owning_process, PETHREAD owning_thread, IRP *irp) { - FIXME("client %p, node_name %p, service_name %p, name_space %#x, provider %p, hints %p, " - "result %p, owning_process %p, owning_thread %p, irp %p stub.\n", + struct wsk_get_address_info_context *context; + NTSTATUS status; + + TRACE("client %p, node_name %p, service_name %p, name_space %#x, provider %p, hints %p, " + "result %p, owning_process %p, owning_thread %p, irp %p.\n", client, node_name, service_name, name_space, provider, hints, result, owning_process, owning_thread, irp); - return STATUS_NOT_IMPLEMENTED; + if (!irp) + return STATUS_INVALID_PARAMETER; + + if (!(context = heap_alloc(sizeof(*context)))) + { + ERR("No memory.\n"); + status = STATUS_NO_MEMORY; + dispatch_irp(irp, status); + return status; + } + + context->node_name = node_name; + context->service_name = service_name; + context->namespace = name_space; + context->provider = provider; + context->hints = hints; + context->result = result; + context->irp = irp; + + if (!TrySubmitThreadpoolCallback(get_address_info_callback, context, NULL)) + { + ERR("Could not submit thread pool callback.\n"); + status = STATUS_UNSUCCESSFUL; + dispatch_irp(irp, status); + heap_free(context); + return status; + } + TRACE("Submitted threadpool callback, context %p.\n", context); + return STATUS_PENDING; } static void WINAPI wsk_free_address_info(WSK_CLIENT *client, ADDRINFOEXW *addr_info) @@ -142,6 +250,9 @@ void WINAPI WskReleaseProviderNPI(WSK_REGISTRATION *wsk_registration) NTSTATUS WINAPI WskRegister(WSK_CLIENT_NPI *wsk_client_npi, WSK_REGISTRATION *wsk_registration) { + static const WORD version = MAKEWORD( 2, 2 ); + WSADATA data; + WSK_CLIENT *client; TRACE("wsk_client_npi %p, wsk_registration %p.\n", wsk_client_npi, wsk_registration); @@ -156,6 +267,9 @@ NTSTATUS WINAPI WskRegister(WSK_CLIENT_NPI *wsk_client_npi, WSK_REGISTRATION *ws client->client_npi = wsk_client_npi; wsk_registration->ReservedRegistrationContext = client; + if (WSAStartup(version, &data)) + return STATUS_INTERNAL_ERROR; + return STATUS_SUCCESS; } -- 2.26.2

4 18

[PATCH] ntdll: Include <signal.h> where needed in the Unix library.
by Gerald Pfeifer June 14, 2020

June 14, 2020

After Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 12 09:26:50 2020 +0200 ntdll: Move fork and exec support to the Unix library. the build fails when declarations/definitions for signal(), SIGPIPE, and SIG_DFL are not pulled in implicitly. Make sure we always declare/define those by including <signal.h>. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- dlls/ntdll/unix/process.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 9f38f042de..58ba031421 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -28,6 +28,7 @@ #include <errno.h> #include <fcntl.h> +#include <signal.h> #include <stdarg.h> #include <stdio.h> #include <stdlib.h> -- 2.27.0

2 1

[PATCH V5] include: Add xact3.h
by Vijay Kiran Kamuju June 14, 2020

June 14, 2020

Based on work by Ethan Lee and Alistair Leslie-Hughes Use the header file directly instead of idl file just like other directx headers like dsound.h Implementing idl file involves a lot of hacks. V2: Fix overflow warnings and typos V3: Correct IXACT3SoundBank interface V4: Correct IXACT3WaveBank, IXACT3Engine interface V5: use INT_MAX, INT_MIN instead of LONG_MAX, LONG_MIN constants Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH V4] include: Add xact3.h
by Vijay Kiran Kamuju June 14, 2020

June 14, 2020

Based on work by Ethan Lee and Alistair Leslie-Hughes Use the header file directly instead of idl file just like other directx headers like dsound.h Implementing idl file involves a lot of hacks. V2: Fix overflow warnings and typos V3: Correct IXACT3SoundBank interface V4: Correct IXACT3WaveBank, IXACT3Engine interface Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH] d3dx9: Implement ID3DXSkinInfo_Clone.
by Gijs Vermeulen June 14, 2020

June 14, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48779 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/d3dx9_36/skin.c | 26 ++++++++++++++++-- dlls/d3dx9_36/tests/mesh.c | 55 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/skin.c b/dlls/d3dx9_36/skin.c index 2c10260e2a..5b97973a1f 100644 --- a/dlls/d3dx9_36/skin.c +++ b/dlls/d3dx9_36/skin.c @@ -298,9 +298,31 @@ static D3DXMATRIX * WINAPI d3dx9_skin_info_GetBoneOffsetMatrix(ID3DXSkinInfo *if static HRESULT WINAPI d3dx9_skin_info_Clone(ID3DXSkinInfo *iface, ID3DXSkinInfo **skin_info) { - FIXME("iface %p, skin_info %p stub!\n", iface, skin_info); + struct d3dx9_skin_info *skin = impl_from_ID3DXSkinInfo(iface); + HRESULT hr; + DWORD i; - return E_NOTIMPL; + TRACE("iface %p, skin_info %p.\n", iface, skin_info); + + if (FAILED(hr = D3DXCreateSkinInfo(skin->num_vertices, skin->vertex_declaration, skin->num_bones, skin_info))) + return hr; + + for (i = 0; i < skin->num_bones; ++i) + { + struct bone *current_bone = &skin->bones[i]; + + if (current_bone->name && FAILED(hr = (*skin_info)->lpVtbl->SetBoneName(*skin_info, i, current_bone->name))) + return hr; + if (&current_bone->transform + && FAILED(hr = (*skin_info)->lpVtbl->SetBoneOffsetMatrix(*skin_info, i, &current_bone->transform))) + return hr; + if (current_bone->vertices && current_bone->weights + && FAILED(hr = (*skin_info)->lpVtbl->SetBoneInfluence(*skin_info, i, current_bone->num_influences, + current_bone->vertices, current_bone->weights))) + return hr; + } + + return hr; } static HRESULT WINAPI d3dx9_skin_info_Remap(ID3DXSkinInfo *iface, DWORD num_vertices, DWORD *vertex_remap) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 81f902291d..cc2f158888 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -4990,6 +4990,7 @@ static void test_create_skin_info(void) ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); if (skininfo) { + ID3DXSkinInfo *clone = NULL; DWORD dword_result; float flt_result; const char *string_result; @@ -5023,6 +5024,10 @@ static void test_create_skin_info(void) transform = skininfo->lpVtbl->GetBoneOffsetMatrix(skininfo, -1); ok(transform == NULL, "Expected NULL, got %p\n", transform); + hr = skininfo->lpVtbl->Clone(skininfo, &clone); + ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); + IUnknown_Release(clone); + { /* test [GS]etBoneOffsetMatrix */ hr = skininfo->lpVtbl->SetBoneOffsetMatrix(skininfo, 1, &identity_matrix); @@ -5139,6 +5144,9 @@ static void test_create_skin_info(void) ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); ok(vertices[0] == 0xdeadbeef, "expected vertex 0xdeadbeef, got %u\n", vertices[0]); ok(weights[0] == FLT_MAX, "expected weight %g, got %g\n", FLT_MAX, weights[0]); + + hr = skininfo->lpVtbl->SetBoneInfluence(skininfo, 0, num_influences, exp_vertices, exp_weights); + ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); } { @@ -5182,6 +5190,53 @@ static void test_create_skin_info(void) ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); compare_elements(declaration_out, declaration_in, __LINE__, 0); } + + { + /* test Clone */ + D3DVERTEXELEMENT9 got_declaration[MAX_FVF_DECL_SIZE]; + DWORD exp_vertices[2], got_vertices[2]; + FLOAT exp_weights[2], got_weights[2]; + const char *exp_string, *got_string; + DWORD exp_fvf, got_fvf; + int i; + + hr = skininfo->lpVtbl->Clone(skininfo, NULL); + ok(hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, got %#x\n", hr); + + clone = NULL; + hr = skininfo->lpVtbl->Clone(skininfo, &clone); + ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); + + hr = clone->lpVtbl->GetDeclaration(clone, got_declaration); + ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); + compare_elements(got_declaration, declaration_out, __LINE__, 0); + + hr = D3DXFVFFromDeclarator(declaration_out, &exp_fvf); + ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); + got_fvf = clone->lpVtbl->GetFVF(clone); + ok(got_fvf == exp_fvf, "Expected %#x, got %#x\n", exp_fvf, got_fvf); + + exp_string = skininfo->lpVtbl->GetBoneName(skininfo, 0); + got_string = clone->lpVtbl->GetBoneName(clone, 0); + ok(!strcmp(got_string, exp_string), "Expected '%s', got '%s'\n", exp_string, got_string); + + transform = clone->lpVtbl->GetBoneOffsetMatrix(clone, 0); + check_matrix(transform, &identity_matrix); + + hr = skininfo->lpVtbl->GetBoneInfluence(skininfo, 0, exp_vertices, exp_weights); + ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); + hr = clone->lpVtbl->GetBoneInfluence(clone, 0, got_vertices, got_weights); + ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); + + for (i = 0; i < 2; i++) { + ok(got_vertices[i] == exp_vertices[i], + "influence[%d]: expected vertex %u, got %u\n", i, exp_vertices[i], got_vertices[i]); + ok((isnan(got_weights[i]) && isnan(exp_weights[i])) || got_weights[i] == exp_weights[i], + "influence[%d]: expected weights %g, got %g\n", i, exp_weights[i], got_weights[i]); + } + + IUnknown_Release(clone); + } } if (skininfo) IUnknown_Release(skininfo); skininfo = NULL; -- 2.27.0

2 1

[PATCH V3] include: Add xact3.h
by Vijay Kiran Kamuju June 14, 2020

June 14, 2020

Based on work by Ethan Lee and Alistair Leslie-Hughes Use the header file directly instead of idl file just like other directx headers like dsound.h Implementing idl file involves a lot of hacks. V2: Fix overflow warnings and typos V3: Correct IXACT3SoundBank interface Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH] winmm: Fix 1 MSVC warning C4090.
by Serge Gautherie June 14, 2020

June 14, 2020

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- "...\mci.c(...): warning C4090: 'function': different 'const' qualifiers" --- dlls/winmm/mci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 870f5d1..b15da71 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -1710,7 +1710,7 @@ BOOL WINAPI mciFreeCommandResource(UINT uTable) FreeResource(S_MciCmdTable[uTable].hMem); S_MciCmdTable[uTable].hMem = NULL; S_MciCmdTable[uTable].lpTable = NULL; - HeapFree(GetProcessHeap(), 0, S_MciCmdTable[uTable].aVerbs); + HeapFree(GetProcessHeap(), 0, (LPVOID)S_MciCmdTable[uTable].aVerbs); S_MciCmdTable[uTable].aVerbs = 0; S_MciCmdTable[uTable].nVerbs = 0; return TRUE; -- 2.10.0.windows.1

2 1

[PATCH V2] include: Add xact3.h
by Vijay Kiran Kamuju June 13, 2020

June 13, 2020

Based on work by Ethan Lee and Alistair Leslie-Hughes Use the header file directly instead of idl file just like other directx headers like dsound.h Implementing idl file involves a lot of hacks. V2: Fix overflow warnings and typos

1 0