[PATCH 0/7] MR1724: wineps: Initial work on print processor
From: Piotr Caban <piotr(a)codeweavers.com> --- dlls/wineps.drv/printproc.c | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 287dac9a0cf..3b9f1404c3c 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -31,10 +31,38 @@ WINE_DEFAULT_DEBUG_CHANNEL(psdrv); BOOL WINAPI EnumPrintProcessorDatatypesW(WCHAR *server, WCHAR *name, DWORD level, BYTE *datatypes, DWORD size, DWORD *needed, DWORD *no) { - FIXME("%s, %s, %ld, %p, %ld, %p, %p\n", debugstr_w(server), debugstr_w(name), + static const WCHAR emf_1003[] = L"NT EMF 1.003"; + + DATATYPES_INFO_1W *info = (DATATYPES_INFO_1W *)datatypes; + + TRACE("%s, %s, %ld, %p, %ld, %p, %p\n", debugstr_w(server), debugstr_w(name), level, datatypes, size, needed, no); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + + if (!needed || !no) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + *no = 0; + *needed = sizeof(*info) + sizeof(emf_1003); + + if (level != 1 || (size && !datatypes)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (size < *needed) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return FALSE; + } + + *no = 1; + info->pName = (WCHAR*)(info + 1); + memcpy(info + 1, emf_1003, sizeof(emf_1003)); + return TRUE; } HANDLE WINAPI OpenPrintProcessor(WCHAR *port, PRINTPROCESSOROPENDATA *open_data) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1724
From: Piotr Caban <piotr(a)codeweavers.com> --- dlls/wineps.drv/printproc.c | 75 ++++++++++++++++++++++++++++++++----- 1 file changed, 66 insertions(+), 9 deletions(-) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 3b9f1404c3c..613b8752948 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdio.h> +#include <stdlib.h> #include <windows.h> #include <winspool.h> @@ -28,11 +28,33 @@ WINE_DEFAULT_DEBUG_CHANNEL(psdrv); +#define PP_MAGIC 0x952173fe + +struct pp_data +{ + DWORD magic; + HANDLE hport; + WCHAR *doc_name; + WCHAR *out_file; +}; + +static const WCHAR emf_1003[] = L"NT EMF 1.003"; + +static struct pp_data* get_handle_data(HANDLE pp) +{ + struct pp_data *ret = (struct pp_data *)pp; + + if (!ret || ret->magic != PP_MAGIC) + { + SetLastError(ERROR_INVALID_HANDLE); + return NULL; + } + return ret; +} + BOOL WINAPI EnumPrintProcessorDatatypesW(WCHAR *server, WCHAR *name, DWORD level, BYTE *datatypes, DWORD size, DWORD *needed, DWORD *no) { - static const WCHAR emf_1003[] = L"NT EMF 1.003"; - DATATYPES_INFO_1W *info = (DATATYPES_INFO_1W *)datatypes; TRACE("%s, %s, %ld, %p, %ld, %p, %p\n", debugstr_w(server), debugstr_w(name), @@ -67,9 +89,33 @@ BOOL WINAPI EnumPrintProcessorDatatypesW(WCHAR *server, WCHAR *name, DWORD level HANDLE WINAPI OpenPrintProcessor(WCHAR *port, PRINTPROCESSOROPENDATA *open_data) { - FIXME("%s, %p\n", debugstr_w(port), open_data); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return NULL; + struct pp_data *data; + HANDLE hport; + + TRACE("%s, %p\n", debugstr_w(port), open_data); + + if (!port || !open_data || !open_data->pDatatype) + { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + if (wcscmp(open_data->pDatatype, emf_1003)) + { + SetLastError(ERROR_INVALID_DATATYPE); + return NULL; + } + + if (!OpenPrinterW(port, &hport, NULL)) + return NULL; + + data = LocalAlloc(LMEM_FIXED | LMEM_ZEROINIT, sizeof(*data)); + if (!data) + return NULL; + data->magic = PP_MAGIC; + data->hport = hport; + data->doc_name = wcsdup(open_data->pDocumentName); + data->out_file = wcsdup(open_data->pOutputFile); + return (HANDLE)data; } BOOL WINAPI PrintDocumentOnPrintProcessor(HANDLE pp, WCHAR *doc_name) @@ -88,7 +134,18 @@ BOOL WINAPI ControlPrintProcessor(HANDLE pp, DWORD cmd) BOOL WINAPI ClosePrintProcessor(HANDLE pp) { - FIXME("%p\n", pp); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + struct pp_data *data = get_handle_data(pp); + + TRACE("%p\n", pp); + + if (!data) + return FALSE; + + ClosePrinter(data->hport); + free(data->doc_name); + free(data->out_file); + + memset(data, 0, sizeof(*data)); + LocalFree(data); + return TRUE; } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1724
From: Piotr Caban <piotr(a)codeweavers.com> --- loader/wine.inf.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 32a74a5950e..8bd7e448197 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2149,6 +2149,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 16427,System\OLE DB,msdaps.dll 16427,System\OLE DB,msdasql.dll 16427,System\ADO,msado15.dll +55,,wineps.drv 66000,3,wineps.drv 55,,winprint.dll 12,,*.sys,- @@ -2212,6 +2213,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 16427,System\OLE DB,msdaps.dll 16427,System\OLE DB,msdasql.dll 16427,System\ADO,msado15.dll +55,,wineps.drv 66000,3,wineps.drv 55,,winprint.dll 12,,*.sys -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1724
From: Piotr Caban <piotr(a)codeweavers.com> --- dlls/wineps.drv/printproc.c | 7 +++++++ dlls/wineps.drv/wineps.drv.spec | 1 + loader/wine.inf.in | 1 + 3 files changed, 9 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 613b8752948..f3cd99005ea 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -149,3 +149,10 @@ BOOL WINAPI ClosePrintProcessor(HANDLE pp) LocalFree(data); return TRUE; } + +HRESULT WINAPI DllRegisterServer(void) +{ + AddPrintProcessorW(NULL, (WCHAR *)L"Windows 4.0", (WCHAR *)L"wineps.drv", (WCHAR *)L"wineps"); + AddPrintProcessorW(NULL, NULL, (WCHAR *)L"wineps.drv", (WCHAR *)L"wineps"); + return S_OK; +} diff --git a/dlls/wineps.drv/wineps.drv.spec b/dlls/wineps.drv/wineps.drv.spec index 741212786e5..45b7d114e7e 100644 --- a/dlls/wineps.drv/wineps.drv.spec +++ b/dlls/wineps.drv/wineps.drv.spec @@ -1,4 +1,5 @@ @ cdecl wine_get_gdi_driver(long) PSDRV_get_gdi_driver +@ stdcall -private DllRegisterServer() # Printer driver config exports @ stdcall DrvDeviceCapabilities(ptr wstr long ptr ptr) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 8bd7e448197..f1525c4f6dd 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2075,6 +2075,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,urlmon.dll,1 11,,windowscodecs.dll,1 11,,winegstreamer.dll,1 +55,,wineps.drv,1 11,,wineqtdecoder.dll,1 11,,winevulkan.dll,1 55,,winprint.dll,1 -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1724
From: Piotr Caban <piotr(a)codeweavers.com> --- dlls/wineps.drv/printproc.c | 151 +++++++++++++++++++++++++++++++++++- 1 file changed, 148 insertions(+), 3 deletions(-) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index f3cd99005ea..8b9048c673e 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -28,6 +28,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(psdrv); +#define EMFSPOOL_VERSION 0x10000 #define PP_MAGIC 0x952173fe struct pp_data @@ -38,8 +39,82 @@ struct pp_data WCHAR *out_file; }; +typedef enum +{ + EMRI_METAFILE = 1, + EMRI_ENGINE_FONT, + EMRI_DEVMODE, + EMRI_TYPE1_FONT, + EMRI_PRESTARTPAGE, + EMRI_DESIGNVECTOR, + EMRI_SUBSET_FONT, + EMRI_DELTA_FONT, + EMRI_FORM_METAFILE, + EMRI_BW_METAFILE, + EMRI_BW_FORM_METAFILE, + EMRI_METAFILE_DATA, + EMRI_METAFILE_EXT, + EMRI_BW_METAFILE_EXT, + EMRI_ENGINE_FONT_EXT, + EMRI_TYPE1_FONT_EXT, + EMRI_DESIGNVECTOR_EXT, + EMRI_SUBSET_FONT_EXT, + EMRI_DELTA_FONT_EXT, + EMRI_PS_JOB_DATA, + EMRI_EMBED_FONT_EXT, +} record_type; + +typedef struct +{ + unsigned int dwVersion; + unsigned int cjSize; + unsigned int dpszDocName; + unsigned int dpszOutput; +} emfspool_header; + +typedef struct +{ + unsigned int ulID; + unsigned int cjSize; +} record_hdr; + +BOOL WINAPI SeekPrinter(HANDLE, LARGE_INTEGER, LARGE_INTEGER*, DWORD, BOOL); + static const WCHAR emf_1003[] = L"NT EMF 1.003"; +#define EMRICASE(x) case x: return #x +static const char * debugstr_rec_type(int id) +{ + switch (id) + { + EMRICASE(EMRI_METAFILE); + EMRICASE(EMRI_ENGINE_FONT); + EMRICASE(EMRI_DEVMODE); + EMRICASE(EMRI_TYPE1_FONT); + EMRICASE(EMRI_PRESTARTPAGE); + EMRICASE(EMRI_DESIGNVECTOR); + EMRICASE(EMRI_SUBSET_FONT); + EMRICASE(EMRI_DELTA_FONT); + EMRICASE(EMRI_FORM_METAFILE); + EMRICASE(EMRI_BW_METAFILE); + EMRICASE(EMRI_BW_FORM_METAFILE); + EMRICASE(EMRI_METAFILE_DATA); + EMRICASE(EMRI_METAFILE_EXT); + EMRICASE(EMRI_BW_METAFILE_EXT); + EMRICASE(EMRI_ENGINE_FONT_EXT); + EMRICASE(EMRI_TYPE1_FONT_EXT); + EMRICASE(EMRI_DESIGNVECTOR_EXT); + EMRICASE(EMRI_SUBSET_FONT_EXT); + EMRICASE(EMRI_DELTA_FONT_EXT); + EMRICASE(EMRI_PS_JOB_DATA); + EMRICASE(EMRI_EMBED_FONT_EXT); + default: + FIXME("unknown record type: %d\n", id); + return NULL; + } +} +#undef EMRICASE + static struct pp_data* get_handle_data(HANDLE pp) { struct pp_data *ret = (struct pp_data *)pp; @@ -120,9 +195,79 @@ HANDLE WINAPI OpenPrintProcessor(WCHAR *port, PRINTPROCESSOROPENDATA *open_data) BOOL WINAPI PrintDocumentOnPrintProcessor(HANDLE pp, WCHAR *doc_name) { - FIXME("%p, %s\n", pp, debugstr_w(doc_name)); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + struct pp_data *data = get_handle_data(pp); + emfspool_header header; + record_hdr record; + HANDLE spool_data; + LARGE_INTEGER pos; + DOC_INFO_1W info; + BOOL ret; + DWORD r; + + TRACE("%p, %s\n", pp, debugstr_w(doc_name)); + + if (!data) + return FALSE; + + if (!OpenPrinterW(doc_name, &spool_data, NULL)) + return FALSE; + + info.pDocName = data->doc_name; + info.pOutputFile = data->out_file; + info.pDatatype = (WCHAR *)L"RAW"; + if (!StartDocPrinterW(data->hport, 1, (BYTE *)&info)) + { + ClosePrinter(spool_data); + return FALSE; + } + + if (!(ret = ReadPrinter(spool_data, &header, sizeof(header), &r))) + goto cleanup; + if (r != sizeof(header)) + { + SetLastError(ERROR_INVALID_DATA); + ret = FALSE; + goto cleanup; + } + + if (header.dwVersion != EMFSPOOL_VERSION) + { + FIXME("unrecognized spool file format\n"); + SetLastError(ERROR_INTERNAL_ERROR); + goto cleanup; + } + pos.QuadPart = header.cjSize; + if (!(ret = SeekPrinter(spool_data, pos, NULL, FILE_BEGIN, FALSE))) + goto cleanup; + + while (1) + { + if (!(ret = ReadPrinter(spool_data, &record, sizeof(record), &r))) + goto cleanup; + if (!r) + break; + if (r != sizeof(record)) + { + SetLastError(ERROR_INVALID_DATA); + ret = FALSE; + goto cleanup; + } + + switch (record.ulID) + { + default: + FIXME("%s not supported, skipping\n", debugstr_rec_type(record.ulID)); + pos.QuadPart = record.cjSize; + ret = SeekPrinter(spool_data, pos, NULL, FILE_CURRENT, FALSE); + if (!ret) + goto cleanup; + break; + } + } + +cleanup: + ClosePrinter(spool_data); + return EndDocPrinter(data->hport) && ret; } BOOL WINAPI ControlPrintProcessor(HANDLE pp, DWORD cmd) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1724
From: Piotr Caban <piotr(a)codeweavers.com> --- dlls/wineps.drv/printproc.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 8b9048c673e..d671035fcb9 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -255,6 +255,12 @@ BOOL WINAPI PrintDocumentOnPrintProcessor(HANDLE pp, WCHAR *doc_name) switch (record.ulID) { + case EMRI_METAFILE_DATA: + pos.QuadPart = record.cjSize; + ret = SeekPrinter(spool_data, pos, NULL, FILE_CURRENT, FALSE); + if (!ret) + goto cleanup; + break; default: FIXME("%s not supported, skipping\n", debugstr_rec_type(record.ulID)); pos.QuadPart = record.cjSize; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1724
From: Piotr Caban <piotr(a)codeweavers.com> --- dlls/wineps.drv/printproc.c | 75 ++++++++++++++++++++++++++++++++++++- 1 file changed, 74 insertions(+), 1 deletion(-) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index d671035fcb9..b7b4749afcd 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -127,6 +127,55 @@ static struct pp_data* get_handle_data(HANDLE pp) return ret; } +static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, + const ENHMETARECORD *rec, int n, LPARAM arg) +{ + FIXME("unsupported record: %ld\n", rec->iType); + return 1; +} + +static BOOL print_metafile(struct pp_data *data, HANDLE hdata) +{ + record_hdr header; + HENHMETAFILE hmf; + BYTE *buf; + BOOL ret; + DWORD r; + + if (!ReadPrinter(hdata, &header, sizeof(header), &r)) + return FALSE; + if (r != sizeof(header)) + { + SetLastError(ERROR_INVALID_DATA); + return FALSE; + } + + buf = malloc(header.cjSize); + if (!buf) + return FALSE; + + if (!ReadPrinter(hdata, buf, header.cjSize, &r)) + { + free(buf); + return FALSE; + } + if (r != header.cjSize) + { + free(buf); + SetLastError(ERROR_INVALID_DATA); + return FALSE; + } + + hmf = SetEnhMetaFileBits(header.cjSize, buf); + free(buf); + if (!hmf) + return FALSE; + + ret = EnumEnhMetaFile(NULL, hmf, hmf_proc, NULL, NULL); + DeleteEnhMetaFile(hmf); + return ret; +} + BOOL WINAPI EnumPrintProcessorDatatypesW(WCHAR *server, WCHAR *name, DWORD level, BYTE *datatypes, DWORD size, DWORD *needed, DWORD *no) { @@ -197,9 +246,9 @@ BOOL WINAPI PrintDocumentOnPrintProcessor(HANDLE pp, WCHAR *doc_name) { struct pp_data *data = get_handle_data(pp); emfspool_header header; + LARGE_INTEGER pos, cur; record_hdr record; HANDLE spool_data; - LARGE_INTEGER pos; DOC_INFO_1W info; BOOL ret; DWORD r; @@ -261,6 +310,30 @@ BOOL WINAPI PrintDocumentOnPrintProcessor(HANDLE pp, WCHAR *doc_name) if (!ret) goto cleanup; break; + case EMRI_METAFILE_EXT: + case EMRI_BW_METAFILE_EXT: + pos.QuadPart = 0; + ret = SeekPrinter(spool_data, pos, &cur, FILE_CURRENT, FALSE); + if (ret) + { + cur.QuadPart += record.cjSize; + ret = ReadPrinter(spool_data, &pos, sizeof(pos), &r); + if (r != sizeof(pos)) + { + SetLastError(ERROR_INVALID_DATA); + ret = FALSE; + } + } + pos.QuadPart = -pos.QuadPart - 2 * sizeof(record); + if (ret) + ret = SeekPrinter(spool_data, pos, NULL, FILE_CURRENT, FALSE); + if (ret) + ret = print_metafile(data, spool_data); + if (ret) + ret = SeekPrinter(spool_data, cur, NULL, FILE_BEGIN, FALSE); + if (!ret) + goto cleanup; + break; default: FIXME("%s not supported, skipping\n", debugstr_rec_type(record.ulID)); pos.QuadPart = record.cjSize; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1724
Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details: The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=127302 Your paranoid android. === debian11 (32 bit report) === winhttp: notification.c:1019: Test failed: got 35
This merge request was approved by Huw Davies. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1724
participants (4)
-
Huw Davies (＠huw) -
Marvin -
Piotr Caban
-
Piotr Caban (＠piotr)