- Wine-Devel - list.winehq.org

[PATCH v2 04/12] prntvpt: Add support for PageResolution 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 | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/prntvpt/ticket.c b/dlls/prntvpt/ticket.c index e90dc5100b..b9dfdb10ae 100644 --- a/dlls/prntvpt/ticket.c +++ b/dlls/prntvpt/ticket.c @@ -889,6 +889,34 @@ static HRESULT write_PageScaling(IXMLDOMElement *root, const struct ticket *tick 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_attributes(IXMLDOMElement *element) { HRESULT hr; @@ -932,6 +960,8 @@ static HRESULT write_ticket(IStream *stream, const struct ticket *ticket, EPrint 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 = IStream_Write(stream, xmldecl, strlen(xmldecl), NULL); if (hr != S_OK) goto fail; -- 2.26.2

1 0

[PATCH v2 03/12] prntvpt: Add support for PageScaling 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 | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/prntvpt/ticket.c b/dlls/prntvpt/ticket.c index f31236675f..e90dc5100b 100644 --- a/dlls/prntvpt/ticket.c +++ b/dlls/prntvpt/ticket.c @@ -871,6 +871,24 @@ static HRESULT write_PageOutputColor(IXMLDOMElement *root, const struct ticket * 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_attributes(IXMLDOMElement *element) { HRESULT hr; @@ -912,6 +930,8 @@ static HRESULT write_ticket(IStream *stream, const struct ticket *ticket, EPrint 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 = IStream_Write(stream, xmldecl, strlen(xmldecl), NULL); if (hr != S_OK) goto fail; -- 2.26.2

1 0

[PATCH v2 02/12] prntvpt: Add support for PageOutputColor 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 | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/prntvpt/ticket.c b/dlls/prntvpt/ticket.c index 548da5977c..f31236675f 100644 --- a/dlls/prntvpt/ticket.c +++ b/dlls/prntvpt/ticket.c @@ -853,6 +853,24 @@ fail: 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_attributes(IXMLDOMElement *element) { HRESULT hr; @@ -892,6 +910,8 @@ static HRESULT write_ticket(IStream *stream, const struct ticket *ticket, EPrint hr = write_PageMediaSize(root, ticket); if (hr != S_OK) goto fail; + hr = write_PageOutputColor(root, ticket); + if (hr != S_OK) goto fail; hr = IStream_Write(stream, xmldecl, strlen(xmldecl), NULL); if (hr != S_OK) goto fail; -- 2.26.2

1 0

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

June 17, 2020

v2: Split into smaller parts. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/prntvpt/prntvpt.spec | 2 +- dlls/prntvpt/ticket.c | 318 ++++++++++++++++++++++++++++++++++++++ include/prntvpt.h | 1 + 3 files changed, 320 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..548da5977c 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,309 @@ 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_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_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 = 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

1 0

[PATCH 3/7] winevulkan: Change blacklist to a more neutral word
by André Hentschel June 17, 2020

June 17, 2020

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/winevulkan/make_vulkan | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 1dee769836f..6f92fcf22fa 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -84,7 +84,7 @@ WINE_VULKAN_THUNKS_H = "vulkan_thunks.h" EXT_BASE = 1000000000 EXT_BLOCK_SIZE = 1000 -BLACKLISTED_EXTENSIONS = [ +BLOCKLISTED_EXTENSIONS = [ # Instance extensions "VK_EXT_debug_report", # Handling of VK_EXT_debug_report requires some consideration. The win32 @@ -2607,7 +2607,7 @@ class VkRegistry(object): def _is_extension_supported(self, extension): # We disable some extensions as either we haven't implemented # support yet or because they are for platforms other than win32. - return extension not in BLACKLISTED_EXTENSIONS + return extension not in BLOCKLISTED_EXTENSIONS def _mark_command_required(self, command): """ Helper function to mark a certain command and the datatypes it needs as required.""" @@ -2847,13 +2847,13 @@ class VkRegistry(object): return if not self._is_extension_supported(ext_name): - LOGGER.debug("Skipping blacklisted extension: {0}".format(ext_name)) + LOGGER.debug("Skipping blocklisted extension: {0}".format(ext_name)) return elif "requires" in ext.attrib: - # Check if this extension builds on top of another blacklisted + # Check if this extension builds on top of another blocklisted # extension. requires = ext.attrib["requires"].split(",") - if len(set(requires).intersection(BLACKLISTED_EXTENSIONS)) > 0: + if len(set(requires).intersection(BLOCKLISTED_EXTENSIONS)) > 0: return LOGGER.debug("Loading extension: {0}".format(ext_name)) -- 2.17.1

2 1

[PATCH v2 3/3] windowscodecs: Fix MIME types of DDS decoder.
by Ziqing Hui June 17, 2020

June 17, 2020

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/regsvr.c | 2 +- dlls/windowscodecs/tests/info.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-)

3 3

[PATCH v2 2/3] windowscodecs/tests: Add decoder info tests for DDS decoder.
by Ziqing Hui June 17, 2020

June 17, 2020

v2: Skip tests on system where DDS decoder is not supported. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/info.c | 11 +++++++++++ 1 file changed, 11 insertions(+)

2 1

[PATCH v2 1/3] windowscodecs/tests: Add tests for DdsFrameDecode_GetPixelFormat().
by Ziqing Hui June 17, 2020

June 17, 2020

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-)

2 1

[PATCH v2 2/3] winevulkan: Thunk vkGetPhysicalDeviceProperties2 and vkGetPhysicalDeviceProperties2KHR.
by Zhiyi Zhang June 17, 2020

June 17, 2020

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winevulkan/make_vulkan | 2 ++ dlls/winevulkan/vulkan.c | 16 ++++++++++++++++ dlls/winevulkan/vulkan_thunks.c | 10 ++-------- dlls/winevulkan/vulkan_thunks.h | 4 ++++ 4 files changed, 24 insertions(+), 8 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 1dee769836f..e0a9267bf75 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -165,6 +165,8 @@ FUNCTION_OVERRIDES = { "vkGetPhysicalDeviceExternalFenceProperties" : {"dispatch" : False, "driver" : False, "thunk" : False}, "vkGetPhysicalDeviceExternalSemaphoreProperties" : {"dispatch" : False, "driver" : False, "thunk" : False}, "vkGetPhysicalDeviceImageFormatProperties2" : {"dispatch" : True, "driver" : False, "thunk" : True, "private_thunk" : True}, + "vkGetPhysicalDeviceProperties2" : {"dispatch" : True, "driver" : False, "thunk" : True, "private_thunk" : True}, + "vkGetPhysicalDeviceProperties2KHR" : {"dispatch" : True, "driver" : False, "thunk" : True, "private_thunk" : True}, # Device functions "vkAllocateCommandBuffers" : {"dispatch" : True, "driver" : False, "thunk" : False}, diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 2779f626a17..e67c398f604 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1245,6 +1245,22 @@ VkResult WINAPI wine_vkGetPhysicalDeviceImageFormatProperties2KHR(VkPhysicalDevi return res; } +void WINAPI wine_vkGetPhysicalDeviceProperties2(VkPhysicalDevice phys_dev, + VkPhysicalDeviceProperties2 *properties2) +{ + TRACE("%p, %p\n", phys_dev, properties2); + + thunk_vkGetPhysicalDeviceProperties2(phys_dev, properties2); +} + +void WINAPI wine_vkGetPhysicalDeviceProperties2KHR(VkPhysicalDevice phys_dev, + VkPhysicalDeviceProperties2 *properties2) +{ + TRACE("%p, %p\n", phys_dev, properties2); + + thunk_vkGetPhysicalDeviceProperties2KHR(phys_dev, properties2); +} + void WINAPI wine_vkGetPhysicalDeviceExternalSemaphoreProperties(VkPhysicalDevice phys_dev, const VkPhysicalDeviceExternalSemaphoreInfo *semaphore_info, VkExternalSemaphoreProperties *properties) { diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 8811fbbb8a5..f1d24086cec 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -4787,34 +4787,28 @@ void WINAPI wine_vkGetPhysicalDeviceProperties(VkPhysicalDevice physicalDevice, #endif } -void WINAPI wine_vkGetPhysicalDeviceProperties2(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2 *pProperties) +void thunk_vkGetPhysicalDeviceProperties2(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2 *pProperties) { #if defined(USE_STRUCT_CONVERSION) VkPhysicalDeviceProperties2_host pProperties_host; - TRACE("%p, %p\n", physicalDevice, pProperties); - convert_VkPhysicalDeviceProperties2_win_to_host(pProperties, &pProperties_host); physicalDevice->instance->funcs.p_vkGetPhysicalDeviceProperties2(physicalDevice->phys_dev, &pProperties_host); convert_VkPhysicalDeviceProperties2_host_to_win(&pProperties_host, pProperties); #else - TRACE("%p, %p\n", physicalDevice, pProperties); physicalDevice->instance->funcs.p_vkGetPhysicalDeviceProperties2(physicalDevice->phys_dev, pProperties); #endif } -static void WINAPI wine_vkGetPhysicalDeviceProperties2KHR(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2 *pProperties) +void thunk_vkGetPhysicalDeviceProperties2KHR(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2 *pProperties) { #if defined(USE_STRUCT_CONVERSION) VkPhysicalDeviceProperties2_host pProperties_host; - TRACE("%p, %p\n", physicalDevice, pProperties); - convert_VkPhysicalDeviceProperties2_win_to_host(pProperties, &pProperties_host); physicalDevice->instance->funcs.p_vkGetPhysicalDeviceProperties2KHR(physicalDevice->phys_dev, &pProperties_host); convert_VkPhysicalDeviceProperties2_host_to_win(&pProperties_host, pProperties); #else - TRACE("%p, %p\n", physicalDevice, pProperties); physicalDevice->instance->funcs.p_vkGetPhysicalDeviceProperties2KHR(physicalDevice->phys_dev, pProperties); #endif } diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index b977cca3e34..60d3676f32b 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -64,11 +64,15 @@ void WINAPI wine_vkGetPhysicalDeviceExternalSemaphoreProperties(VkPhysicalDevice void WINAPI wine_vkGetPhysicalDeviceExternalSemaphorePropertiesKHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceExternalSemaphoreInfo *pExternalSemaphoreInfo, VkExternalSemaphoreProperties *pExternalSemaphoreProperties) DECLSPEC_HIDDEN; VkResult WINAPI wine_vkGetPhysicalDeviceImageFormatProperties2(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceImageFormatInfo2 *pImageFormatInfo, VkImageFormatProperties2 *pImageFormatProperties); VkResult WINAPI wine_vkGetPhysicalDeviceImageFormatProperties2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceImageFormatInfo2 *pImageFormatInfo, VkImageFormatProperties2 *pImageFormatProperties) DECLSPEC_HIDDEN; +void WINAPI wine_vkGetPhysicalDeviceProperties2(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2 *pProperties); +void WINAPI wine_vkGetPhysicalDeviceProperties2KHR(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2 *pProperties) DECLSPEC_HIDDEN; VkResult WINAPI wine_vkQueueSubmit(VkQueue queue, uint32_t submitCount, const VkSubmitInfo *pSubmits, VkFence fence); /* Private thunks */ VkResult thunk_vkGetPhysicalDeviceImageFormatProperties2(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceImageFormatInfo2 *pImageFormatInfo, VkImageFormatProperties2 *pImageFormatProperties) DECLSPEC_HIDDEN; VkResult thunk_vkGetPhysicalDeviceImageFormatProperties2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceImageFormatInfo2 *pImageFormatInfo, VkImageFormatProperties2 *pImageFormatProperties) DECLSPEC_HIDDEN; +void thunk_vkGetPhysicalDeviceProperties2(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2 *pProperties) DECLSPEC_HIDDEN; +void thunk_vkGetPhysicalDeviceProperties2KHR(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2 *pProperties) DECLSPEC_HIDDEN; typedef struct VkAcquireNextImageInfoKHR_host { -- 2.25.1

2 1

[PATCH v2 1/3] winex11.drv: Add a Vulkan UUID property for GPUs.
by Zhiyi Zhang June 17, 2020

June 17, 2020

A Vulkan UUID property is used to find the corresponding GPU in SetupAPI. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Supersede 186882~186885. Fill LUID in winevulkan instead of in user graphics drivers. Thanks to Brendan. dlls/winex11.drv/display.c | 15 ++++-- dlls/winex11.drv/x11drv.h | 2 + dlls/winex11.drv/xrandr.c | 99 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 113 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 1dedf32a52f..a6fe23ea68a 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -43,7 +43,8 @@ DEFINE_DEVPROPKEY(DEVPROPKEY_GPU_LUID, 0x60b193cb, 0x5276, 0x4d0f, 0x96, 0xfc, 0 DEFINE_DEVPROPKEY(DEVPROPKEY_MONITOR_GPU_LUID, 0xca085853, 0x16ce, 0x48aa, 0xb1, 0x14, 0xde, 0x9c, 0x72, 0x33, 0x42, 0x23, 1); DEFINE_DEVPROPKEY(DEVPROPKEY_MONITOR_OUTPUT_ID, 0xca085853, 0x16ce, 0x48aa, 0xb1, 0x14, 0xde, 0x9c, 0x72, 0x33, 0x42, 0x23, 2); -/* Wine specific monitor properties */ +/* Wine specific properties */ +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_GPU_VULKAN_UUID, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5c, 2); DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCMONITOR, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 3); DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCWORK, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 4); @@ -337,6 +338,8 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g BOOL ret = FALSE; FILETIME filetime; + TRACE("GPU id:0x%s name:%s.\n", wine_dbgstr_longlong(gpu->id), wine_dbgstr_w(gpu->name)); + sprintfW(instanceW, gpu_instance_fmtW, gpu->vendor_id, gpu->device_id, gpu->subsys_id, gpu->revision_id, gpu_index); if (!SetupDiOpenDeviceInfoW(devinfo, instanceW, NULL, 0, &device_data)) { @@ -369,8 +372,14 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g goto done; } *gpu_luid = luid; - TRACE("GPU id:0x%s name:%s LUID:%08x:%08x.\n", wine_dbgstr_longlong(gpu->id), - wine_dbgstr_w(gpu->name), luid.HighPart, luid.LowPart); + TRACE("LUID:%08x:%08x.\n", luid.HighPart, luid.LowPart); + + /* Write WINE_DEVPROPKEY_GPU_VULKAN_UUID property */ + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_GPU_VULKAN_UUID, + DEVPROP_TYPE_GUID, (const BYTE *)&gpu->vulkan_uuid, + sizeof(gpu->vulkan_uuid), 0)) + goto done; + TRACE("Vulkan UUID:%s.\n", wine_dbgstr_guid(&gpu->vulkan_uuid)); /* Open driver key. * This is where HKLM\System\CurrentControlSet\Control\Video\{GPU GUID}\{Adapter Index} links to */ diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index a9eaed20cab..cfce09bf11d 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -690,6 +690,8 @@ struct x11drv_gpu UINT device_id; UINT subsys_id; UINT revision_id; + /* Vulkan device UUID */ + GUID vulkan_uuid; }; /* Represent an adapter in EnumDisplayDevices context */ diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 76e76806c55..f61a5b190e9 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -35,8 +35,13 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); #include <X11/extensions/Xrandr.h> #include "x11drv.h" +#define VK_NO_PROTOTYPES +#define WINE_VK_HOST + #include "wine/heap.h" #include "wine/unicode.h" +#include "wine/vulkan.h" +#include "wine/vulkan_driver.h" static void *xrandr_handle; @@ -680,6 +685,99 @@ static BOOL is_crtc_primary( RECT primary, const XRRCrtcInfo *crtc ) crtc->y + crtc->height == primary.bottom; } +VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkDisplayKHR) + +static void get_vulkan_device_uuid( GUID *uuid, const XRRProviderInfo *provider_info ) +{ + static const char *extensions[] = + { + VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME, + "VK_EXT_acquire_xlib_display", + "VK_EXT_direct_mode_display", + }; + const struct vulkan_funcs *vulkan_funcs = get_vulkan_driver( WINE_VULKAN_DRIVER_VERSION ); + VkResult (*pvkGetRandROutputDisplayEXT)( VkPhysicalDevice, Display *, RROutput, VkDisplayKHR * ); + PFN_vkGetPhysicalDeviceProperties2 pvkGetPhysicalDeviceProperties2; + PFN_vkEnumeratePhysicalDevices pvkEnumeratePhysicalDevices; + uint32_t device_count, device_idx, output_idx; + VkPhysicalDevice *vk_physical_devices = NULL; + VkPhysicalDeviceProperties2 properties2; + VkInstanceCreateInfo create_info; + VkPhysicalDeviceIDProperties id; + VkInstance vk_instance = NULL; + VkDisplayKHR vk_display; + VkResult vr; + + if (!vulkan_funcs) + goto done; + + memset( &create_info, 0, sizeof(create_info) ); + create_info.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; + create_info.enabledExtensionCount = ARRAY_SIZE(extensions); + create_info.ppEnabledExtensionNames = extensions; + + vr = vulkan_funcs->p_vkCreateInstance( &create_info, NULL, &vk_instance ); + if (vr != VK_SUCCESS) + { + WARN("Failed to create a Vulkan instance, vr %d.\n", vr); + goto done; + } + +#define LOAD_VK_FUNC(f) \ + if (!(p##f = (void *)vulkan_funcs->p_vkGetInstanceProcAddr( vk_instance, #f ))) \ + { \ + WARN("Failed to load " #f ".\n"); \ + goto done; \ + } + + LOAD_VK_FUNC(vkEnumeratePhysicalDevices) + LOAD_VK_FUNC(vkGetPhysicalDeviceProperties2) + LOAD_VK_FUNC(vkGetRandROutputDisplayEXT) +#undef LOAD_VK_FUNC + + vr = pvkEnumeratePhysicalDevices( vk_instance, &device_count, NULL ); + if (vr != VK_SUCCESS || !device_count) + { + WARN("No Vulkan device found, vr %d, device_count %d.\n", vr, device_count); + goto done; + } + + if (!(vk_physical_devices = heap_calloc( device_count, sizeof(*vk_physical_devices) ))) + goto done; + + vr = pvkEnumeratePhysicalDevices( vk_instance, &device_count, vk_physical_devices ); + if (vr != VK_SUCCESS) + { + WARN("vkEnumeratePhysicalDevices failed, vr %d.\n", vr); + goto done; + } + + for (device_idx = 0; device_idx < device_count; ++device_idx) + { + for (output_idx = 0; output_idx < provider_info->noutputs; ++output_idx) + { + vr = pvkGetRandROutputDisplayEXT( vk_physical_devices[device_idx], gdi_display, + provider_info->outputs[output_idx], &vk_display ); + if (vr != VK_SUCCESS || vk_display == VK_NULL_HANDLE) + continue; + + memset( &id, 0, sizeof(id) ); + id.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES; + properties2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2; + properties2.pNext = &id; + + pvkGetPhysicalDeviceProperties2( vk_physical_devices[device_idx], &properties2 ); + memcpy( uuid, id.deviceUUID, sizeof(id.deviceUUID) ); + goto done; + } + } + +done: + heap_free( vk_physical_devices ); + if (vk_instance) + vulkan_funcs->p_vkDestroyInstance( vk_instance, NULL ); +} + static BOOL xrandr14_get_gpus( struct x11drv_gpu **new_gpus, int *count ) { static const WCHAR wine_adapterW[] = {'W','i','n','e',' ','A','d','a','p','t','e','r',0}; @@ -742,6 +840,7 @@ static BOOL xrandr14_get_gpus( struct x11drv_gpu **new_gpus, int *count ) } gpus[i].id = provider_resources->providers[i]; + get_vulkan_device_uuid( &gpus[i].vulkan_uuid, provider_info ); MultiByteToWideChar( CP_UTF8, 0, provider_info->name, -1, gpus[i].name, ARRAY_SIZE(gpus[i].name) ); /* PCI IDs are all zero because there is currently no portable way to get it via XRandR. Some AMD drivers report * their PCI address in the name but many others don't */ -- 2.25.1

2 1