- Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll: Support the machine extended parameter in NtMapViewOfSectionEx().
by Alexandre Julliard May 23, 2023

May 23, 2023

Module: wine Branch: master Commit: ebc1b099159059d35fd86e61122ab7f7aa6722ef URL: https://gitlab.winehq.org/wine/wine/-/commit/ebc1b099159059d35fd86e61122ab7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 23 10:40:46 2023 +0200 ntdll: Support the machine extended parameter in NtMapViewOfSectionEx(). --- dlls/ntdll/tests/virtual.c | 1 - dlls/ntdll/tests/wow64.c | 152 ++++++++++++++++++++++++++++++++++++++++- dlls/ntdll/unix/loader.c | 41 ++++++----- dlls/ntdll/unix/server.c | 8 ++- dlls/ntdll/unix/unix_private.h | 2 +- dlls/ntdll/unix/virtual.c | 68 ++++++++++-------- include/wine/server_protocol.h | 5 +- server/protocol.def | 3 +- server/trace.c | 3 +- 9 files changed, 229 insertions(+), 54 deletions(-)

1 0

Alexandre Julliard : ntdll: Catch MEM_EXTENDED_PARAMETER duplicates for all types.
by Alexandre Julliard May 23, 2023

May 23, 2023

Module: wine Branch: master Commit: 685f1b6b055f5a86aca9588f4f5aa95a36602ed5 URL: https://gitlab.winehq.org/wine/wine/-/commit/685f1b6b055f5a86aca9588f4f5aa9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 23 10:18:51 2023 +0200 ntdll: Catch MEM_EXTENDED_PARAMETER duplicates for all types. --- dlls/ntdll/tests/virtual.c | 72 ++++++++++++++++++++++++++++++++++++++++------ dlls/ntdll/unix/virtual.c | 12 +++++--- 2 files changed, 72 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index c125fdff0d7..00811938d6d 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -293,7 +293,7 @@ static void check_region_size_(void *p, SIZE_T s, unsigned int line) static void test_NtAllocateVirtualMemoryEx(void) { - MEM_EXTENDED_PARAMETER ext; + MEM_EXTENDED_PARAMETER ext[2]; SIZE_T size, size2; char *p, *p1, *p2; NTSTATUS status; @@ -425,13 +425,28 @@ static void test_NtAllocateVirtualMemoryEx(void) ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); } - memset( &ext, 0, sizeof(ext) ); - ext.Type = MemExtendedParameterAttributeFlags; - ext.ULong = MEM_EXTENDED_PARAMETER_EC_CODE; + memset( ext, 0, sizeof(ext) ); + ext[0].Type = MemExtendedParameterAttributeFlags; + ext[0].ULong = 0; + ext[1].Type = MemExtendedParameterAttributeFlags; + ext[1].ULong = 0; + size = 0x10000; + addr1 = NULL; + status = pNtAllocateVirtualMemoryEx( NtCurrentProcess(), &addr1, &size, MEM_RESERVE, + PAGE_EXECUTE_READWRITE, ext, 1 ); + ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); + NtFreeVirtualMemory( NtCurrentProcess(), &addr1, &size, MEM_DECOMMIT ); + status = pNtAllocateVirtualMemoryEx( NtCurrentProcess(), &addr1, &size, MEM_RESERVE, + PAGE_EXECUTE_READWRITE, ext, 2 ); + ok(status == STATUS_INVALID_PARAMETER, "Unexpected status %08lx.\n", status); + + memset( ext, 0, sizeof(ext) ); + ext[0].Type = MemExtendedParameterAttributeFlags; + ext[0].ULong = MEM_EXTENDED_PARAMETER_EC_CODE; size = 0x10000; addr1 = NULL; status = pNtAllocateVirtualMemoryEx( NtCurrentProcess(), &addr1, &size, MEM_RESERVE, - PAGE_EXECUTE_READWRITE, &ext, 1 ); + PAGE_EXECUTE_READWRITE, ext, 1 ); #ifdef __x86_64__ if (pRtlGetNativeSystemInformation) { @@ -453,7 +468,7 @@ static void test_NtAllocateVirtualMemoryEx(void) if (pRtlIsEcCode) ok( !pRtlIsEcCode( addr1 ), "EC code %p\n", addr1 ); size = 0x1000; status = pNtAllocateVirtualMemoryEx( NtCurrentProcess(), &addr1, &size, MEM_COMMIT, - PAGE_EXECUTE_READWRITE, &ext, 1 ); + PAGE_EXECUTE_READWRITE, ext, 1 ); ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); if (pRtlIsEcCode) { @@ -474,9 +489,9 @@ static void test_NtAllocateVirtualMemoryEx(void) if (pRtlIsEcCode) ok( pRtlIsEcCode( addr1 ), "not EC code %p\n", addr1 ); size = 0x2000; - ext.ULong = 0; + ext[0].ULong = 0; status = pNtAllocateVirtualMemoryEx( NtCurrentProcess(), &addr1, &size, MEM_COMMIT, - PAGE_EXECUTE_READWRITE, &ext, 1 ); + PAGE_EXECUTE_READWRITE, ext, 1 ); ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); if (pRtlIsEcCode) { @@ -1607,6 +1622,47 @@ static void test_NtMapViewOfSectionEx(void) CloseHandle(file); DeleteFileA(testfile); + file = CreateFileA( "c:\\windows\\system32\\version.dll", GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0 ); + ok( file != INVALID_HANDLE_VALUE, "Failed to open version.dll\n" ); + mapping = CreateFileMappingA( file, NULL, PAGE_READONLY | SEC_IMAGE, 0, 0, NULL ); + ok( mapping != 0, "CreateFileMapping failed\n" ); + + memset(&ext, 0, sizeof(ext)); + ext[0].Type = MemExtendedParameterImageMachine; + ext[0].ULong = 0; + ptr = NULL; + size = 0; + status = pNtMapViewOfSectionEx( mapping, process, &ptr, &offset, &size, 0, PAGE_READONLY, ext, 1 ); + if (status != STATUS_INVALID_PARAMETER) + { + ok(status == STATUS_SUCCESS || status == STATUS_IMAGE_NOT_AT_BASE, "NtMapViewOfSection returned %08lx\n", status); + NtUnmapViewOfSection(process, ptr); + + ext[1].Type = MemExtendedParameterImageMachine; + ext[1].ULong = 0; + ptr = NULL; + size = 0; + status = pNtMapViewOfSectionEx( mapping, process, &ptr, &offset, &size, 0, PAGE_READONLY, ext, 2 ); + ok(status == STATUS_INVALID_PARAMETER, "NtMapViewOfSection returned %08lx\n", status); + + ext[0].ULong = IMAGE_FILE_MACHINE_R3000; + ext[1].ULong = IMAGE_FILE_MACHINE_R4000; + ptr = NULL; + size = 0; + status = pNtMapViewOfSectionEx( mapping, process, &ptr, &offset, &size, 0, PAGE_READONLY, ext, 2 ); + ok(status == STATUS_INVALID_PARAMETER, "NtMapViewOfSection returned %08lx\n", status); + + ptr = NULL; + size = 0; + status = pNtMapViewOfSectionEx( mapping, process, &ptr, &offset, &size, 0, PAGE_READONLY, ext, 1 ); + todo_wine + ok(status == STATUS_NOT_SUPPORTED, "NtMapViewOfSection returned %08lx\n", status); + } + else win_skip( "MemExtendedParameterImageMachine not supported\n" ); + + NtClose(mapping); + CloseHandle(file); + TerminateProcess(process, 0); CloseHandle(process); } diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index b33b45ad07f..2255061ec75 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -4152,18 +4152,21 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG_PTR z static NTSTATUS get_extended_params( const MEM_EXTENDED_PARAMETER *parameters, ULONG count, ULONG_PTR *limit, ULONG_PTR *align, ULONG *attributes ) { - MEM_ADDRESS_REQUIREMENTS *r = NULL; - ULONG i; + ULONG i, present = 0; if (count && !parameters) return STATUS_INVALID_PARAMETER; for (i = 0; i < count; ++i) { + if (parameters[i].Type >= 32) return STATUS_INVALID_PARAMETER; + if (present & (1u << parameters[i].Type)) return STATUS_INVALID_PARAMETER; + present |= 1u << parameters[i].Type; + switch (parameters[i].Type) { case MemExtendedParameterAddressRequirements: - if (r) return STATUS_INVALID_PARAMETER; - r = parameters[i].Pointer; + { + MEM_ADDRESS_REQUIREMENTS *r = parameters[i].Pointer; if (r->LowestStartingAddress) FIXME( "Not supported requirements LowestStartingAddress %p, Alignment %p.\n", @@ -4188,6 +4191,7 @@ static NTSTATUS get_extended_params( const MEM_EXTENDED_PARAMETER *parameters, U } } break; + } case MemExtendedParameterAttributeFlags: *attributes = parameters[i].ULong;

1 0

Piotr Caban : wineps: Mark font as unset in PSDRV_SelectFont.
by Alexandre Julliard May 23, 2023

May 23, 2023

Module: wine Branch: master Commit: 189606e4bf947b3482a7b55f6970b690ceb891f1 URL: https://gitlab.winehq.org/wine/wine/-/commit/189606e4bf947b3482a7b55f6970b6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 22 21:04:42 2023 +0200 wineps: Mark font as unset in PSDRV_SelectFont. --- dlls/wineps.drv/font.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wineps.drv/font.c b/dlls/wineps.drv/font.c index 74171c09530..563f34afac8 100644 --- a/dlls/wineps.drv/font.c +++ b/dlls/wineps.drv/font.c @@ -41,6 +41,8 @@ HFONT CDECL PSDRV_SelectFont( print_ctx *ctx, HFONT hfont, UINT *aa_flags ) { struct font_info font_info; + ctx->font.set = UNSET; + if (ExtEscape(ctx->hdc, PSDRV_GET_BUILTIN_FONT_INFO, 0, NULL, sizeof(font_info), (char *)&font_info)) {

1 0

Piotr Caban : wineps: Fix download font escapement.
by Alexandre Julliard May 23, 2023

May 23, 2023

Module: wine Branch: master Commit: d225fb8e715c2adf66ff7a3094a737ea1fceaa88 URL: https://gitlab.winehq.org/wine/wine/-/commit/d225fb8e715c2adf66ff7a3094a737… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 22 21:06:25 2023 +0200 wineps: Fix download font escapement. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54956 --- dlls/wineps.drv/download.c | 8 +++----- dlls/wineps.drv/psdrv.h | 3 --- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/wineps.drv/download.c b/dlls/wineps.drv/download.c index 80cf4a0c13f..2197a96027a 100644 --- a/dlls/wineps.drv/download.c +++ b/dlls/wineps.drv/download.c @@ -258,7 +258,6 @@ BOOL PSDRV_WriteSetDownloadFont(print_ctx *ctx, BOOL vertical) LOGFONTW lf; UINT ppem; XFORM xform; - INT escapement; assert(ctx->font.fontloc == Download); @@ -281,7 +280,7 @@ BOOL PSDRV_WriteSetDownloadFont(print_ctx *ctx, BOOL vertical) if(GetGraphicsMode(ctx->hdc) == GM_COMPATIBLE) { - if (xform.eM22 < 0) ctx->font.escapement = -ctx->font.escapement; + if (xform.eM22 < 0) lf.lfEscapement = -lf.lfEscapement; xform.eM11 = xform.eM22 = fabs(xform.eM22); xform.eM21 = xform.eM12 = 0; } @@ -327,11 +326,10 @@ BOOL PSDRV_WriteSetDownloadFont(print_ctx *ctx, BOOL vertical) } } - escapement = ctx->font.escapement; if (vertical) - escapement += 900; + lf.lfEscapement += 900; - PSDRV_WriteSetFont(ctx, ps_name, ctx->font.size, escapement, + PSDRV_WriteSetFont(ctx, ps_name, ctx->font.size, lf.lfEscapement, is_fake_italic( ctx->hdc )); HeapFree(GetProcessHeap(), 0, ps_name); diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 09b3a57b76c..6173bdfc413 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -289,9 +289,6 @@ typedef struct { matrix size; PSCOLOR color; enum fontset set; /* Have we done a setfont yet */ - - /* These are needed by PSDRV_ExtTextOut */ - int escapement; } PSFONT; typedef struct {

1 0

Piotr Caban : winspool: Add AbortPrinter implementation.
by Alexandre Julliard May 23, 2023

May 23, 2023

Module: wine Branch: master Commit: 083946dbf41f06618db508e510c790de5385ae2e URL: https://gitlab.winehq.org/wine/wine/-/commit/083946dbf41f06618db508e510c790… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 22 18:56:28 2023 +0200 winspool: Add AbortPrinter implementation. --- dlls/winspool.drv/info.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 3c513f1c0e8..30df3199f40 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -6029,10 +6029,13 @@ DWORD WINAPI EnumPrinterDataExA(HANDLE hPrinter, LPCSTR pKeyName, /****************************************************************************** * AbortPrinter (WINSPOOL.@) */ -BOOL WINAPI AbortPrinter( HANDLE hPrinter ) +BOOL WINAPI AbortPrinter(HANDLE printer) { - FIXME("(%p), stub!\n", hPrinter); - return TRUE; + HANDLE handle = get_backend_handle(printer); + + TRACE("(%p)\n", printer); + + return backend->fpAbortPrinter(handle); } /******************************************************************************

1 0

Piotr Caban : gdi32: Abort printing if DeleteDC is called before EndDoc.
by Alexandre Julliard May 23, 2023

May 23, 2023

Module: wine Branch: master Commit: 0e976ca5444c699517f3ad7e84c7e0468b4adcbc URL: https://gitlab.winehq.org/wine/wine/-/commit/0e976ca5444c699517f3ad7e84c7e0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 22 18:52:26 2023 +0200 gdi32: Abort printing if DeleteDC is called before EndDoc. --- dlls/gdi32/dc.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index e7f2d8526d1..5ae7cc653d1 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -479,7 +479,12 @@ BOOL WINAPI DeleteDC( HDC hdc ) if (is_meta_dc( hdc )) return METADC_DeleteDC( hdc ); if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; - if (dc_attr->print) delete_print_dc( dc_attr ); + if (dc_attr->print) + { + if (dc_attr->emf) + AbortDoc( hdc ); + delete_print_dc( dc_attr ); + } if (dc_attr->emf) EMFDC_DeleteDC( dc_attr ); return NtGdiDeleteObjectApp( hdc ); }

1 0

Piotr Caban : localspl: Implement AbortPrinter while spooling.
by Alexandre Julliard May 23, 2023

May 23, 2023

Module: wine Branch: master Commit: 1b2db7f1715c18eee153fb91c2b5a34738b1fc55 URL: https://gitlab.winehq.org/wine/wine/-/commit/1b2db7f1715c18eee153fb91c2b5a3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 22 19:12:45 2023 +0200 localspl: Implement AbortPrinter while spooling. --- dlls/localspl/provider.c | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 9e990c75e0f..be4b81091eb 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -3823,6 +3823,43 @@ static BOOL WINAPI fpScheduleJob(HANDLE hprinter, DWORD job_id) return ret; } +static BOOL WINAPI fpAbortPrinter(HANDLE hprinter) +{ + printer_t *printer = (printer_t *)hprinter; + job_info_t *job; + + TRACE("%p\n", hprinter); + + if (!printer) + { + SetLastError(ERROR_INVALID_HANDLE); + return 0; + } + + if (printer->header.type != HANDLE_PRINTER) + { + FIXME("%x handle not supported\n", printer->header.type); + return FALSE; + } + + if (!printer->doc) + { + SetLastError(ERROR_SPL_NO_STARTDOC); + return FALSE; + } + + CloseHandle(printer->doc->hf); + printer->doc->hf = NULL; + + EnterCriticalSection(&printer->info->jobs_cs); + job = get_job(printer->info, printer->doc->id); + if (job) free_job(job); + LeaveCriticalSection(&printer->info->jobs_cs); + + printer->doc = NULL; + return TRUE; +} + static BOOL WINAPI fpReadPrinter(HANDLE hprinter, void *buf, DWORD size, DWORD *bytes_read) { job_t *job = (job_t *)hprinter; @@ -4003,7 +4040,7 @@ static const PRINTPROVIDOR backend = { NULL, /* fpStartPagePrinter */ fpWritePrinter, NULL, /* fpEndPagePrinter */ - NULL, /* fpAbortPrinter */ + fpAbortPrinter, fpReadPrinter, fpEndDocPrinter, fpAddJob,

1 0

Piotr Caban : wineps: Remove no longer used PSDRV_SelectDownloadFont helper.
by Alexandre Julliard May 23, 2023

May 23, 2023

Module: wine Branch: master Commit: fe111269016a083125dc805063b1db4e6a0ffe7a URL: https://gitlab.winehq.org/wine/wine/-/commit/fe111269016a083125dc805063b1db… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 22 19:23:35 2023 +0200 wineps: Remove no longer used PSDRV_SelectDownloadFont helper. --- dlls/wineps.drv/download.c | 13 ------------- dlls/wineps.drv/psdrv.h | 1 - 2 files changed, 14 deletions(-) diff --git a/dlls/wineps.drv/download.c b/dlls/wineps.drv/download.c index 89dd56d5b38..80cf4a0c13f 100644 --- a/dlls/wineps.drv/download.c +++ b/dlls/wineps.drv/download.c @@ -190,19 +190,6 @@ static UINT get_bbox(HDC hdc, RECT *rc) return GET_BE_WORD(head + 18); /* unitsPerEm */ } -/**************************************************************************** - * PSDRV_SelectDownloadFont - * - * Set up ctx->font for a downloadable font - * - */ -BOOL PSDRV_SelectDownloadFont(print_ctx *ctx) -{ - ctx->font.fontloc = Download; - ctx->font.fontinfo.Download = NULL; - return TRUE; -} - static UINT calc_ppem_for_height(HDC hdc, LONG height) { BYTE os2[78]; /* size of version 0 table */ diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 389c6a5b562..09b3a57b76c 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -491,7 +491,6 @@ SHORT PSDRV_CalcAvgCharWidth(const AFM *afm) DECLSPEC_HIDDEN; extern BOOL PSDRV_WriteSetBuiltinFont(print_ctx *ctx) DECLSPEC_HIDDEN; extern BOOL PSDRV_WriteBuiltinGlyphShow(print_ctx *ctx, LPCWSTR str, INT count) DECLSPEC_HIDDEN; -extern BOOL PSDRV_SelectDownloadFont(print_ctx *ctx) DECLSPEC_HIDDEN; extern BOOL PSDRV_WriteSetDownloadFont(print_ctx *ctx, BOOL vertical) DECLSPEC_HIDDEN; extern BOOL PSDRV_WriteDownloadGlyphShow(print_ctx *ctx, const WORD *glyphs, UINT count) DECLSPEC_HIDDEN; extern BOOL PSDRV_EmptyDownloadList(print_ctx *ctx, BOOL write_undef) DECLSPEC_HIDDEN;

1 0

Brendan Shanks : win32u: Propagate WM_MOUSEHWHEEL to the parent window in DefWindowProc().
by Alexandre Julliard May 23, 2023

May 23, 2023

Module: wine Branch: master Commit: 8a9c955b56ca3cbf2b1a19b0979584ee7add7a2b URL: https://gitlab.winehq.org/wine/wine/-/commit/8a9c955b56ca3cbf2b1a19b0979584… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Fri May 19 15:52:08 2023 -0700 win32u: Propagate WM_MOUSEHWHEEL to the parent window in DefWindowProc(). --- dlls/win32u/defwnd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/win32u/defwnd.c b/dlls/win32u/defwnd.c index 0635bd2b722..e5ff1a010b9 100644 --- a/dlls/win32u/defwnd.c +++ b/dlls/win32u/defwnd.c @@ -2562,8 +2562,9 @@ LRESULT default_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, break; case WM_MOUSEWHEEL: + case WM_MOUSEHWHEEL: if (get_window_long( hwnd, GWL_STYLE ) & WS_CHILD) - result = send_message( get_parent( hwnd ), WM_MOUSEWHEEL, wparam, lparam ); + result = send_message( get_parent( hwnd ), msg, wparam, lparam ); break; case WM_ERASEBKGND:

1 0

Ethan Lee : vkd3d-shader/hlsl: Add support for SampleGrad() method.
by Alexandre Julliard May 23, 2023

May 23, 2023

Module: vkd3d Branch: master Commit: 24d4ab7fb3ade55015d54ac1d6afd5311bb82d76 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/24d4ab7fb3ade55015d54ac1d6afd… Author: Ethan Lee <flibitijibibo(a)gmail.com> Date: Fri May 5 11:13:18 2023 -0400 vkd3d-shader/hlsl: Add support for SampleGrad() method. Signed-off-by: Ethan Lee <flibitijibibo(a)gmail.com> --- libs/vkd3d-shader/hlsl.c | 17 ++++++++++ libs/vkd3d-shader/hlsl.h | 5 +-- libs/vkd3d-shader/hlsl.y | 71 ++++++++++++++++++++++++++++++++++++++++ libs/vkd3d-shader/hlsl_codegen.c | 4 +++ libs/vkd3d-shader/tpf.c | 13 +++++++- tests/sample-grad.shader_test | 14 ++++---- 6 files changed, 114 insertions(+), 10 deletions(-)

1 0