Re: [Mingw-w64-public] [PATCH] crt: add prntvpt export library
On 9/7/20 1:12 PM, Biswapriyo Nath wrote: > > > Patch looks good to me. signature.asc Description: OpenPGP digital signature ___ Mingw-w64-public mailing list Mingw-w64-public@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
[Mingw-w64-public] [PATCH] crt: add prntvpt export library
From bd9beab92c6bb9bb94533f1a8b82b807c6862617 Mon Sep 17 00:00:00 2001 From: Biswapriyo Nath Date: Mon, 7 Sep 2020 17:19:00 +0530 Subject: [PATCH] crt: add prntvpt export library Signed-off-by: Biswapriyo Nath --- .../{libarm32 => lib-common}/prntvpt.def | 16 ++--- mingw-w64-crt/lib32/Makefile.am | 1 + mingw-w64-crt/lib32/prntvpt.def | 35 +++ mingw-w64-crt/lib64/Makefile.am | 1 + mingw-w64-crt/libarm64/Makefile.am| 1 + 5 files changed, 49 insertions(+), 5 deletions(-) rename mingw-w64-crt/{libarm32 => lib-common}/prntvpt.def (70%) create mode 100644 mingw-w64-crt/lib32/prntvpt.def diff --git a/mingw-w64-crt/libarm32/prntvpt.def b/mingw-w64-crt/lib-common/prntvpt.def similarity index 70% rename from mingw-w64-crt/libarm32/prntvpt.def rename to mingw-w64-crt/lib-common/prntvpt.def index fc3b5bc..5a2d512 100644 --- a/mingw-w64-crt/libarm32/prntvpt.def +++ b/mingw-w64-crt/lib-common/prntvpt.def @@ -1,8 +1,3 @@ -; -; Definition file of prntvpt.dll -; Automatic generated by gendef -; written by Kai Tietz 2008-2014 -; LIBRARY "prntvpt.dll" EXPORTS PTQuerySchemaVersionSupport @@ -15,14 +10,25 @@ PTMergeAndValidatePrintTicket PTConvertPrintTicketToDevMode PTConvertDevModeToPrintTicket PTReleaseMemory +PTGetPrintDeviceCapabilities +PTGetPrintDeviceResources ConvertDevModeToPrintTicketThunk ConvertDevModeToPrintTicketThunk2 ConvertPrintTicketToDevModeThunk ConvertPrintTicketToDevModeThunk2 +DllCanUnloadNow +DllGetClassObject +DllMain +DllRegisterServer +DllUnregisterServer GetDeviceDefaultPrintTicketThunk GetDeviceNamespacesThunk GetPrintCapabilitiesThunk GetPrintCapabilitiesThunk2 +GetPrintDeviceCapabilitiesThunk +GetPrintDeviceCapabilitiesThunk2 +GetPrintDeviceResourcesThunk +GetPrintDeviceResourcesThunk2 GetSchemaVersionThunk MergeAndValidatePrintTicketThunk MergeAndValidatePrintTicketThunk2 diff --git a/mingw-w64-crt/lib32/Makefile.am b/mingw-w64-crt/lib32/Makefile.am index 564178f..5dc1630 100644 --- a/mingw-w64-crt/lib32/Makefile.am +++ b/mingw-w64-crt/lib32/Makefile.am @@ -225,6 +225,7 @@ lib32_DATA += %reldir%/libpdhui.a lib32_DATA += %reldir%/libpenwin32.a lib32_DATA += %reldir%/libpkpd32.a lib32_DATA += %reldir%/libpowrprof.a +lib32_DATA += %reldir%/libprntvpt.a lib32_DATA += %reldir%/libpropsys.a lib32_DATA += %reldir%/libpsapi.a lib32_DATA += %reldir%/libquartz.a diff --git a/mingw-w64-crt/lib32/prntvpt.def b/mingw-w64-crt/lib32/prntvpt.def new file mode 100644 index 000..c93f48e --- /dev/null +++ b/mingw-w64-crt/lib32/prntvpt.def @@ -0,0 +1,35 @@ +LIBRARY "prntvpt.dll" +EXPORTS +PTQuerySchemaVersionSupport@8 +PTOpenProvider@12 +PTOpenProviderEx@20 +PTCloseProvider@4 +BindPTProviderThunk@20 +PTGetPrintCapabilities@16 +PTMergeAndValidatePrintTicket@24 +PTConvertPrintTicketToDevMode@28 +PTConvertDevModeToPrintTicket@20 +PTReleaseMemory@4 +PTGetPrintDeviceCapabilities@16 +PTGetPrintDeviceResources@20 +ConvertDevModeToPrintTicketThunk2@24 +ConvertDevModeToPrintTicketThunk@20 +ConvertPrintTicketToDevModeThunk2@32 +ConvertPrintTicketToDevModeThunk@28 +DllCanUnloadNow@0 +DllGetClassObject@12 +DllMain@12 +DllRegisterServer@0 +DllUnregisterServer@0 +GetDeviceDefaultPrintTicketThunk@12 +GetDeviceNamespacesThunk@12 +GetPrintCapabilitiesThunk2@24 +GetPrintCapabilitiesThunk@20 +GetPrintDeviceCapabilitiesThunk2@24 +GetPrintDeviceCapabilitiesThunk@20 +GetPrintDeviceResourcesThunk2@28 +GetPrintDeviceResourcesThunk@24 +GetSchemaVersionThunk@4 +MergeAndValidatePrintTicketThunk2@36 +MergeAndValidatePrintTicketThunk@28 +UnbindPTProviderThunk@4 diff --git a/mingw-w64-crt/lib64/Makefile.am b/mingw-w64-crt/lib64/Makefile.am index 842e4a2..1d881f4 100644 --- a/mingw-w64-crt/lib64/Makefile.am +++ b/mingw-w64-crt/lib64/Makefile.am @@ -463,6 +463,7 @@ lib64_DATA += %reldir%/libpolicman.a lib64_DATA += %reldir%/libpolstore.a lib64_DATA += %reldir%/libpowrprof.a lib64_DATA += %reldir%/libprintui.a +lib64_DATA += %reldir%/libprntvpt.a lib64_DATA += %reldir%/libprofmap.a lib64_DATA += %reldir%/libpropsys.a lib64_DATA += %reldir%/libPS5UI.a diff --git a/mingw-w64-crt/libarm64/Makefile.am b/mingw-w64-crt/libarm64/Makefile.am index 69253a1..10bd770 100644 --- a/mingw-w64-crt/libarm64/Makefile.am +++ b/mingw-w64-crt/libarm64/Makefile.am @@ -213,6 +213,7 @@ libarm64_DATA += %reldir%/libperfproc.a libarm64_DATA += %reldir%/libperfts.a libarm64_DATA += %reldir%/libphotowiz.a libarm64_DATA += %reldir%/libpowrprof.a +libarm64_DATA += %reldir%/libprntvpt.a libarm64_DATA += %reldir%/libpropsys.a libarm64_DATA += %reldir%/libpsapi.a libarm64_DATA += %reldir%/libpstorec.a -- 2.27.0 ___ Mingw-w64-public mailing list Mingw-w64-public@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
[Mingw-w64-public] [PATCH] headers: Import d3d12.idl from Wine.
From 8f4319aca9c0cc8c3712b36568470df9bf28ee6a Mon Sep 17 00:00:00 2001 From: Biswapriyo Nath Date: Mon, 7 Sep 2020 17:41:51 +0530 Subject: [PATCH] headers: Import d3d12.idl from Wine. Signed-off-by: Biswapriyo Nath --- mingw-w64-headers/Makefile.am| 1 + mingw-w64-headers/wine-import.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/mingw-w64-headers/Makefile.am b/mingw-w64-headers/Makefile.am index 554d5b9..d9ef965 100644 --- a/mingw-w64-headers/Makefile.am +++ b/mingw-w64-headers/Makefile.am @@ -93,6 +93,7 @@ IDL_SRCS = \ include/d3d11_3.idl \ include/d3d11_4.idl \ include/d3d11sdklayers.idl \ + include/d3d12.idl \ include/d3d12shader.idl \ include/d3dcommon.idl \ include/dbgprop.idl \ diff --git a/mingw-w64-headers/wine-import.sh b/mingw-w64-headers/wine-import.sh index 3b8ff60..49a21b8 100755 --- a/mingw-w64-headers/wine-import.sh +++ b/mingw-w64-headers/wine-import.sh @@ -140,6 +140,7 @@ for f in \ d3d11_3 \ d3d11_4 \ d3d11sdklayers \ + d3d12 \ d3d12shader \ d3dcommon \ dcommon \ -- 2.27.0 ___ Mingw-w64-public mailing list Mingw-w64-public@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
Re: [Mingw-w64-public] Patch: dwrite update
On 07.09.2020 04:10, Liu Hao wrote: [Please include the list when replying, for example, by clicking 'reply to all' or 'reply to list' instead of 'reply'.] 在 2020/9/6 上午7:25, Jean Pierre Cimalando 写道: Le Sat, 5 Sep 2020 22:47:19 +0800, Liu Hao a écrit : +DWRITE_FONT_PROPERTY_ID_TOTAL, +DWRITE_FONT_PROPERTY_ID_TOTAL_RS3, +DWRITE_FONT_PROPERTY_ID_PREFERRED_FAMILY_NAME, +DWRITE_FONT_PROPERTY_ID_FAMILY_NAME, +DWRITE_FONT_PROPERTY_ID_FACE_NAME These enumerators seem to have wrong values due to lack of initializers. Good remark. I remade the patch, after rechecking the enums. I take notice of Biswapriyo's remark on generating from IDL; unless I'm mistaken, there is not yet a tool which generates these definitions? (using the STDMETHOD format) This would simplify the work considerably. It looks like that neither of DWrite headers were imported for Wine. There must be a reason. Jacek might have some comments on it. They were not imported mostly because Biswapriyo's patch was incomplete. I fixed it, tested and pushed. Please give it a try. Thanks, Jacek ___ Mingw-w64-public mailing list Mingw-w64-public@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
[Mingw-w64-public] [PATCH] include: add prntvpt.h
From f0fed50e8bc5172e979d052c53e1900dfd18e76b Mon Sep 17 00:00:00 2001 From: Biswapriyo Nath Date: Mon, 7 Sep 2020 14:22:14 +0530 Subject: [PATCH] include: add prntvpt.h Signed-off-by: Biswapriyo Nath --- mingw-w64-headers/include/prntvpt.h | 59 + 1 file changed, 59 insertions(+) create mode 100644 mingw-w64-headers/include/prntvpt.h diff --git a/mingw-w64-headers/include/prntvpt.h b/mingw-w64-headers/include/prntvpt.h new file mode 100644 index 000..9337c48 --- /dev/null +++ b/mingw-w64-headers/include/prntvpt.h @@ -0,0 +1,59 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the mingw-w64 runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ + +#ifndef _PRNPTNTV_H_ +#define _PRNPTNTV_H_ + +#include + +#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) + +#ifdef __cplusplus +extern "C" { +#endif + +DECLARE_HANDLE(HPTPROVIDER); + +#define PRINTTICKET_ISTREAM_APIS 1 + +#define S_PT_NO_CONFLICT 0x00040001 +#define S_PT_CONFLICT_RESOLVED 0x00040002 + +#define E_PRINTTICKET_FORMAT 0x80040003 +#define E_PRINTCAPABILITIES_FORMAT 0x80040004 +#define E_DELTA_PRINTTICKET_FORMAT 0x80040005 +#define E_PRINTDEVICECAPABILITIES_FORMAT 0x80040006 + +typedef enum tagEDefaultDevmodeType { + kUserDefaultDevmode, + kPrinterDefaultDevmode +} EDefaultDevmodeType; + +typedef enum { + kPTPageScope, + kPTDocumentScope, + kPTJobScope +} EPrintTicketScope; + +HRESULT WINAPI PTQuerySchemaVersionSupport(PCWSTR pszPrinterName, DWORD *pMaxVersion); +HRESULT WINAPI PTOpenProvider(PCWSTR pszPrinterName, DWORD dwVersion, HPTPROVIDER *phProvider); +HRESULT WINAPI PTOpenProviderEx(PCWSTR pszPrinterName, DWORD dwMaxVersion, DWORD dwPrefVersion, HPTPROVIDER *phProvider, DWORD *pUsedVersion); +HRESULT WINAPI PTCloseProvider(HPTPROVIDER hProvider); +HRESULT WINAPI PTReleaseMemory(PVOID pBuffer); +HRESULT WINAPI PTGetPrintCapabilities(HPTPROVIDER hProvider, IStream *pPrintTicket, IStream *pCapabilities, BSTR *pbstrErrorMessage); +HRESULT WINAPI PTGetPrintDeviceCapabilities(HPTPROVIDER hProvider, IStream *pPrintTicket, IStream *pDeviceCapabilities, BSTR *pbstrErrorMessage); +HRESULT WINAPI PTGetPrintDeviceResources(HPTPROVIDER hProvider, LPCWSTR pszLocaleName, IStream *pPrintTicket, IStream *pDeviceResources, BSTR *pbstrErrorMessage); +HRESULT WINAPI PTMergeAndValidatePrintTicket(HPTPROVIDER hProvider, IStream *pBaseTicket, IStream *pDeltaTicket, EPrintTicketScope scope, IStream *pResultTicket, BSTR *pbstrErrorMessage); +HRESULT WINAPI PTConvertPrintTicketToDevMode(HPTPROVIDER hProvider, IStream *pPrintTicket, EDefaultDevmodeType baseDevmodeType, EPrintTicketScope scope, ULONG *pcbDevmode, PDEVMODE *ppDevmode, BSTR *pbstrErrorMessage); +HRESULT WINAPI PTConvertDevModeToPrintTicket(HPTPROVIDER hProvider, ULONG cbDevmode, PDEVMODE pDevmode, EPrintTicketScope scope, IStream *pPrintTicket); + +#ifdef __cplusplus +} +#endif + +#endif /* WINAPI_PARTITION_DESKTOP */ + +#endif /* _PRNPTNTV_H_ */ -- 2.27.0 ___ Mingw-w64-public mailing list Mingw-w64-public@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mingw-w64-public