December 2022 - Wine-commits

Alex Henrie : include: Annotate (Alloc|Realloc)ADs* with __WINE_(ALLOC_SIZE|DEALLOC|MALLOC).
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: wine Branch: master Commit: 5e943f6e1a4a09297ba74e2c7c1c893efa5ff89b URL: https://gitlab.winehq.org/wine/wine/-/commit/5e943f6e1a4a09297ba74e2c7c1c89… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Dec 6 22:26:18 2022 -0700 include: Annotate (Alloc|Realloc)ADs* with __WINE_(ALLOC_SIZE|DEALLOC|MALLOC). --- include/adshlp.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/include/adshlp.h b/include/adshlp.h index dac57857edb..5dacbb6b821 100644 --- a/include/adshlp.h +++ b/include/adshlp.h @@ -23,14 +23,17 @@ extern "C" { #endif +BOOL WINAPI FreeADsMem(void*); +void* WINAPI AllocADsMem(DWORD) __WINE_ALLOC_SIZE(1) __WINE_DEALLOC(FreeADsMem) __WINE_MALLOC; +void* WINAPI ReallocADsMem(void*,DWORD,DWORD) __WINE_ALLOC_SIZE(3) __WINE_DEALLOC(FreeADsMem) __WINE_MALLOC; +BOOL WINAPI FreeADsStr(WCHAR*); +WCHAR* WINAPI AllocADsStr(WCHAR*) __WINE_DEALLOC(FreeADsStr) __WINE_MALLOC; + HRESULT WINAPI ADsBuildEnumerator(IADsContainer*,IEnumVARIANT**); HRESULT WINAPI ADsBuildVarArrayStr(LPWSTR*,DWORD,VARIANT*); HRESULT WINAPI ADsEnumerateNext(IEnumVARIANT*,ULONG,VARIANT*,ULONG*); HRESULT WINAPI ADsGetObject(LPCWSTR,REFIID,VOID**); HRESULT WINAPI ADsOpenObject(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,REFIID,VOID**); -LPWSTR WINAPI AllocADsStr(LPWSTR); -BOOL WINAPI FreeADsMem(LPVOID); -BOOL WINAPI FreeADsStr(LPWSTR); #ifdef __cplusplus }

1 0

Piotr Caban : wineps: Add EnumPrintProcessorDatatypesW implementation.
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: wine Branch: master Commit: 1bbe86692cf119851a536405aab87ee98135db0c URL: https://gitlab.winehq.org/wine/wine/-/commit/1bbe86692cf119851a536405aab87e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 6 16:17:18 2022 +0100 wineps: Add EnumPrintProcessorDatatypesW implementation. --- 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)

1 0

Piotr Caban : wineps: Add OpenPrintProcessor implementation.
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: wine Branch: master Commit: 9e9c9c7a2415e0851d862e133548265782356640 URL: https://gitlab.winehq.org/wine/wine/-/commit/9e9c9c7a2415e0851d862e13354826… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 6 16:22:49 2022 +0100 wineps: Add OpenPrintProcessor implementation. --- 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; }

1 0

Piotr Caban : wine.inf: Also install wineps.drv to print processor directory.
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: wine Branch: master Commit: 28aa2017d75fe173f629be79c76f6410ff7e6752 URL: https://gitlab.winehq.org/wine/wine/-/commit/28aa2017d75fe173f629be79c76f64… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 6 16:13:33 2022 +0100 wine.inf: Also install wineps.drv to print processor directory. --- 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

1 0

Piotr Caban : wineps: Register print processor.
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: wine Branch: master Commit: b0900254791daa66164792170fe1dd38a4f60476 URL: https://gitlab.winehq.org/wine/wine/-/commit/b0900254791daa66164792170fe1dd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 6 16:27:21 2022 +0100 wineps: Register print processor. --- 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

1 0

Piotr Caban : wineps: Improve PrintDocumentOnPrintProcessor stub.
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: wine Branch: master Commit: acc9f648429a3a9efd359151ba3f6afdd5a8a97a URL: https://gitlab.winehq.org/wine/wine/-/commit/acc9f648429a3a9efd359151ba3f6a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 6 17:07:58 2022 +0100 wineps: Improve PrintDocumentOnPrintProcessor stub. --- 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)

1 0

Piotr Caban : wineps: Skip EMRI_METAFILE_DATA record silently.
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: wine Branch: master Commit: 659b4e511d538feab02390f294ce91a959bb753f URL: https://gitlab.winehq.org/wine/wine/-/commit/659b4e511d538feab02390f294ce91… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 6 17:57:03 2022 +0100 wineps: Skip EMRI_METAFILE_DATA record silently. --- 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;

1 0

Piotr Caban : wineps: Support parsing EMRI_METAFILE_EXT records.
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: wine Branch: master Commit: 2c76c73ade2606162fbea4b9bcebd0e5f2245052 URL: https://gitlab.winehq.org/wine/wine/-/commit/2c76c73ade2606162fbea4b9bcebd0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 6 18:41:49 2022 +0100 wineps: Support parsing EMRI_METAFILE_EXT records. --- 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;

1 0

Zhiyi Zhang : Revert "ntdll: Call usleep() instead of NtYieldExecution() in NtDelayExecution().".
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: wine Branch: master Commit: fc3b2ebaf4d92a77025f5c532a2415ada8de69c3 URL: https://gitlab.winehq.org/wine/wine/-/commit/fc3b2ebaf4d92a77025f5c532a2415… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Dec 7 10:17:25 2022 +0800 Revert "ntdll: Call usleep() instead of NtYieldExecution() in NtDelayExecution().". Manual tests on Windows 10 show that calling Sleep(0) or NtDelayExecution() with zero timeout in a loop do consume 100% of a CPU core, which is closer to the behavior of NtYieldExecution() than usleep(0). usleep(0) gives up the remaining timeslices even if there are no other threads to switch to, causing low utilization of CPU and performance issues. The original patch is b1a79c6 and the idea is to use usleep(0) to avoid a thread taking 100% of a CPU core for StarCraft 2 and Shadow of the Tomb Raider. However with wine-7.22, reverting the usleep(0) patch causes no behavior changes. For Shadow of the Tomb Raider, the 100% CPU issue is gone with or without the patch. For StarCraft 2, there is always a thread taking 100% CPU even with the patch. After discussing with Matteo, we decided it's better to revert the patch. Fix Mortal Kombat X performance drop during tower selection and Ragnarok Online bad performance. This reverts commit e86b4015ff405d4c054b8a5bc855ee655e1a833c. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53327 --- dlls/ntdll/unix/sync.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 650e32a7d41..a0905963562 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -1494,7 +1494,7 @@ NTSTATUS WINAPI NtDelayExecution( BOOLEAN alertable, const LARGE_INTEGER *timeou } /* Note that we yield after establishing the desired timeout */ - usleep(0); + NtYieldExecution(); if (!when) return STATUS_SUCCESS; for (;;)

1 0

Sven Baars : win32u: Pass the client instance to NtUserCreateWindowEx.
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: wine Branch: master Commit: f8a0716111d01c36613a3fcc221353efd8f7ca1e URL: https://gitlab.winehq.org/wine/wine/-/commit/f8a0716111d01c36613a3fcc221353… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Tue Dec 6 18:32:01 2022 +0100 win32u: Pass the client instance to NtUserCreateWindowEx. On 16-bit the module instance and client instance are different. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53568 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53646 --- dlls/user32/win.c | 2 +- dlls/win32u/window.c | 4 ++-- dlls/wow64win/user.c | 4 ++-- include/ntuser.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index d8869b2b9db..150c334b9d8 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -399,7 +399,7 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, hwnd = NtUserCreateWindowEx( cs->dwExStyle, &class, NULL, &window_name, cs->style, cs->x, cs->y, cs->cx, cs->cy, cs->hwndParent, menu, module, - cs->lpCreateParams, 0, NULL, 0, !unicode ); + cs->lpCreateParams, 0, cs->hInstance, 0, !unicode ); if (!hwnd && menu && menu != cs->hMenu) NtUserDestroyMenu( menu ); if (!unicode && window_name.Buffer != name_buf) RtlFreeUnicodeString( &window_name ); return hwnd; diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index d6fabff2cf1..9a8963ce2a1 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -5022,7 +5022,7 @@ HWND WINAPI NtUserCreateWindowEx( DWORD ex_style, UNICODE_STRING *class_name, UNICODE_STRING *version, UNICODE_STRING *window_name, DWORD style, INT x, INT y, INT cx, INT cy, HWND parent, HMENU menu, HINSTANCE instance, void *params, - DWORD flags, CBT_CREATEWNDW *client_cbtc, DWORD unk, BOOL ansi ) + DWORD flags, HINSTANCE client_instance, DWORD unk, BOOL ansi ) { UINT win_dpi, thread_dpi = get_thread_dpi(); DPI_AWARENESS_CONTEXT context; @@ -5036,7 +5036,7 @@ HWND WINAPI NtUserCreateWindowEx( DWORD ex_style, UNICODE_STRING *class_name, static const WCHAR messageW[] = {'M','e','s','s','a','g','e'}; cs.lpCreateParams = params; - cs.hInstance = instance; + cs.hInstance = client_instance ? client_instance : instance; cs.hMenu = menu; cs.hwndParent = parent; cs.style = style; diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 447e8f84495..afc73ca1322 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -1471,7 +1471,7 @@ NTSTATUS WINAPI wow64_NtUserCreateWindowEx( UINT *args ) HINSTANCE instance = get_handle( &args ); void *params = get_ptr( &args ); DWORD flags = get_ulong( &args ); - void *cbtc = get_ptr( &args ); + HINSTANCE client_instance = get_handle( &args ); DWORD unk = get_ulong( &args ); BOOL ansi = get_ulong( &args ); @@ -1483,7 +1483,7 @@ NTSTATUS WINAPI wow64_NtUserCreateWindowEx( UINT *args ) unicode_str_32to64( &version, version32 ), unicode_str_32to64( &window_name, window_name32 ), style, x, y, width, height, parent, menu, - instance, params, flags, cbtc, unk, ansi ); + instance, params, flags, client_instance, unk, ansi ); return HandleToUlong( ret ); } diff --git a/include/ntuser.h b/include/ntuser.h index b83ae2418d3..3c41e435712 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -678,7 +678,7 @@ HWND WINAPI NtUserCreateWindowEx( DWORD ex_style, UNICODE_STRING *class_name, UNICODE_STRING *version, UNICODE_STRING *window_name, DWORD style, INT x, INT y, INT cx, INT cy, HWND parent, HMENU menu, HINSTANCE instance, void *params, - DWORD flags, CBT_CREATEWNDW *cbtc, DWORD unk, BOOL ansi ); + DWORD flags, HINSTANCE client_instance, DWORD unk, BOOL ansi ); HWINSTA WINAPI NtUserCreateWindowStation( OBJECT_ATTRIBUTES *attr, ACCESS_MASK mask, ULONG arg3, ULONG arg4, ULONG arg5, ULONG arg6, ULONG arg7 ); HDWP WINAPI NtUserDeferWindowPosAndBand( HDWP hdwp, HWND hwnd, HWND after, INT x, INT y,

1 0