- Wine-Commits - list.winehq.org

Piotr Caban : localspl: Add support for Port handles.
by Alexandre Julliard Dec. 5, 2022

Dec. 5, 2022

Module: wine Branch: master Commit: 6bb5bb4486c376f3730d7750b87b3b4cab8de535 URL: https://gitlab.winehq.org/wine/wine/-/commit/6bb5bb4486c376f3730d7750b87b3b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 2 14:39:25 2022 +0100 localspl: Add support for Port handles. --- dlls/localspl/provider.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 79 insertions(+), 1 deletion(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index f3881ba7269..79a68729b3e 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -245,6 +245,7 @@ typedef struct { HANDLE_SERVER, HANDLE_PRINTER, HANDLE_XCV, + HANDLE_PORT, HANDLE_JOB, } type; } handle_header_t; @@ -257,6 +258,12 @@ typedef struct { HANDLE hxcv; } xcv_t; +typedef struct { + handle_header_t header; + monitor_t *mon; + HANDLE hport; +} port_t; + typedef struct { handle_header_t header; HANDLE hf; @@ -1648,6 +1655,66 @@ static HANDLE xcv_alloc_handle(const WCHAR *name, PRINTER_DEFAULTSW *def, BOOL * return (HANDLE)xcv; } +static HANDLE port_alloc_handle(const WCHAR *name, BOOL *stop_search) +{ + static const WCHAR portW[] = L"Port"; + + unsigned int i, name_len; + WCHAR *port_name; + port_t *port; + + *stop_search = FALSE; + for (name_len = 0; name[name_len] != ','; name_len++) + { + if (!name[name_len]) + return NULL; + } + + for (i = name_len + 1; name[i] == ' '; i++); + if (wcscmp(name + i, portW)) + return NULL; + + *stop_search = TRUE; + port_name = malloc((name_len + 1) * sizeof(WCHAR)); + if (!port_name) + return NULL; + memcpy(port_name, name, name_len * sizeof(WCHAR)); + port_name[name_len] = 0; + + port = calloc(1, sizeof(*port)); + if (!port) + { + free(port_name); + return NULL; + } + port->header.type = HANDLE_PORT; + + port->mon = monitor_load_by_port(port_name); + if (!port->mon) + { + free(port_name); + free(port); + return NULL; + } + if (!port->mon->monitor.pfnOpenPort || !port->mon->monitor.pfnWritePort + || !port->mon->monitor.pfnClosePort) + { + FIXME("port not supported: %s\n", debugstr_w(name)); + free(port_name); + fpClosePrinter((HANDLE)port); + return NULL; + } + + port->mon->monitor.pfnOpenPort(port->mon->hmon, port_name, &port->hport); + free(port_name); + if (!port->hport) + { + fpClosePrinter((HANDLE)port); + return NULL; + } + return (HANDLE)port; +} + static HANDLE job_alloc_handle(const WCHAR *name, BOOL *stop_search) { static const WCHAR jobW[] = L"Job "; @@ -1658,7 +1725,6 @@ static HANDLE job_alloc_handle(const WCHAR *name, BOOL *stop_search) job_t *job; *stop_search = FALSE; - name_len = 0; for (name_len = 0; name[name_len] != ','; name_len++) { if (!name[name_len]) @@ -2764,6 +2830,8 @@ static BOOL WINAPI fpOpenPrinter(WCHAR *name, HANDLE *hprinter, *hprinter = server_alloc_handle(basename, &stop_search); if (!*hprinter && !stop_search) *hprinter = xcv_alloc_handle(basename, def, &stop_search); + if (!*hprinter && !stop_search) + *hprinter = port_alloc_handle(basename, &stop_search); if (!*hprinter && !stop_search) *hprinter = job_alloc_handle(basename, &stop_search); if (!*hprinter && !stop_search) @@ -3553,6 +3621,16 @@ static BOOL WINAPI fpClosePrinter(HANDLE hprinter) monitor_unload(xcv->pm); free(xcv); } + else if (header->type == HANDLE_PORT) + { + port_t *port = (port_t *)hprinter; + + if (port->hport) + port->mon->monitor.pfnClosePort(port->hport); + if (port->mon) + monitor_unload(port->mon); + free(port); + } else if (header->type == HANDLE_JOB) { job_t *job = (job_t *)hprinter;

1 0

Piotr Caban : localspl: Support Port handles in WritePrinter.
by Alexandre Julliard Dec. 5, 2022

Dec. 5, 2022

Module: wine Branch: master Commit: 62e017c91b1edbe46c55bfff3af7a4e1d02962fe URL: https://gitlab.winehq.org/wine/wine/-/commit/62e017c91b1edbe46c55bfff3af7a4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 2 14:47:27 2022 +0100 localspl: Support Port handles in WritePrinter. --- dlls/localspl/provider.c | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 79a68729b3e..7ac171892d3 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -3223,23 +3223,38 @@ static DWORD WINAPI fpStartDocPrinter(HANDLE hprinter, DWORD level, BYTE *doc_in static BOOL WINAPI fpWritePrinter(HANDLE hprinter, void *buf, DWORD size, DWORD *written) { - printer_t *printer = (printer_t *)hprinter; + handle_header_t *header = (handle_header_t *)hprinter; TRACE("(%p, %p, %ld, %p)\n", hprinter, buf, size, written); - if(!printer || printer->header.type != HANDLE_PRINTER) + if (!header) { SetLastError(ERROR_INVALID_HANDLE); return FALSE; } - if(!printer->doc) + if (header->type == HANDLE_PORT) { - SetLastError(ERROR_SPL_NO_STARTDOC); - return FALSE; + port_t *port = (port_t *)hprinter; + + return port->mon->monitor.pfnWritePort(port->hport, buf, size, written); + } + + if (header->type == HANDLE_PRINTER) + { + printer_t *printer = (printer_t *)hprinter; + + if (!printer->doc) + { + SetLastError(ERROR_SPL_NO_STARTDOC); + return FALSE; + } + + return WriteFile(printer->doc->hf, buf, size, written, NULL); } - return WriteFile(printer->doc->hf, buf, size, written, NULL); + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; } static BOOL WINAPI fpSetJob(HANDLE hprinter, DWORD job_id,

1 0

Piotr Caban : wineps: Add print processor stub.
by Alexandre Julliard Dec. 5, 2022

Dec. 5, 2022

Module: wine Branch: master Commit: 4dca25432422c869200b357523c40d2e35fbd8cb URL: https://gitlab.winehq.org/wine/wine/-/commit/4dca25432422c869200b357523c40d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Oct 22 21:18:54 2022 +0200 wineps: Add print processor stub. --- dlls/wineps.drv/Makefile.in | 1 + dlls/wineps.drv/printproc.c | 66 +++++++++++++++++++++++++++++++++++++++++ dlls/wineps.drv/wineps.drv.spec | 7 +++++ 3 files changed, 74 insertions(+) diff --git a/dlls/wineps.drv/Makefile.in b/dlls/wineps.drv/Makefile.in index c7282d8a06e..52eb27923d9 100644 --- a/dlls/wineps.drv/Makefile.in +++ b/dlls/wineps.drv/Makefile.in @@ -55,6 +55,7 @@ C_SRCS = \ init.c \ pen.c \ ppd.c \ + printproc.c \ ps.c \ text.c \ type1.c \ diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c new file mode 100644 index 00000000000..287dac9a0cf --- /dev/null +++ b/dlls/wineps.drv/printproc.c @@ -0,0 +1,66 @@ +/* + * Print processor implementation. + * + * Copyright 2022 Piotr Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdio.h> + +#include <windows.h> +#include <winspool.h> +#include <ddk/winsplp.h> + +#include "wine/debug.h" + +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), + level, datatypes, size, needed, no); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +HANDLE WINAPI OpenPrintProcessor(WCHAR *port, PRINTPROCESSOROPENDATA *open_data) +{ + FIXME("%s, %p\n", debugstr_w(port), open_data); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return NULL; +} + +BOOL WINAPI PrintDocumentOnPrintProcessor(HANDLE pp, WCHAR *doc_name) +{ + FIXME("%p, %s\n", pp, debugstr_w(doc_name)); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +BOOL WINAPI ControlPrintProcessor(HANDLE pp, DWORD cmd) +{ + FIXME("%p, %ld\n", pp, cmd); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +BOOL WINAPI ClosePrintProcessor(HANDLE pp) +{ + FIXME("%p\n", pp); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/dlls/wineps.drv/wineps.drv.spec b/dlls/wineps.drv/wineps.drv.spec index 365965c69cf..741212786e5 100644 --- a/dlls/wineps.drv/wineps.drv.spec +++ b/dlls/wineps.drv/wineps.drv.spec @@ -3,3 +3,10 @@ # Printer driver config exports @ stdcall DrvDeviceCapabilities(ptr wstr long ptr ptr) @ stdcall DrvDocumentPropertySheets(ptr long) + +# Print processor exports +@ stdcall EnumPrintProcessorDatatypesW(ptr ptr long ptr long ptr ptr) +@ stdcall OpenPrintProcessor(ptr ptr) +@ stdcall PrintDocumentOnPrintProcessor(ptr ptr) +@ stdcall ControlPrintProcessor(ptr long) +@ stdcall ClosePrintProcessor(ptr)

1 0

Piotr Caban : localspl: Partially support Port handles in StartDocPrinter.
by Alexandre Julliard Dec. 5, 2022

Dec. 5, 2022

Module: wine Branch: master Commit: f079c02ff78a49580b5132e12ee5fee12fe87bcb URL: https://gitlab.winehq.org/wine/wine/-/commit/f079c02ff78a49580b5132e12ee5fe… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Dec 3 19:08:22 2022 +0100 localspl: Partially support Port handles in StartDocPrinter. --- dlls/localspl/provider.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 7ac171892d3..7336dbaa705 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -1697,7 +1697,7 @@ static HANDLE port_alloc_handle(const WCHAR *name, BOOL *stop_search) return NULL; } if (!port->mon->monitor.pfnOpenPort || !port->mon->monitor.pfnWritePort - || !port->mon->monitor.pfnClosePort) + || !port->mon->monitor.pfnClosePort || !port->mon->monitor.pfnStartDocPort) { FIXME("port not supported: %s\n", debugstr_w(name)); free(port_name); @@ -3199,7 +3199,21 @@ static DWORD WINAPI fpStartDocPrinter(HANDLE hprinter, DWORD level, BYTE *doc_in hprinter, level, doc_info, debugstr_w(info->pDocName), debugstr_w(info->pOutputFile), debugstr_w(info->pDatatype)); - if (!printer || printer->header.type != HANDLE_PRINTER) + if (!printer) + { + SetLastError(ERROR_INVALID_HANDLE); + return 0; + } + + if (printer->header.type == HANDLE_PORT) + { + port_t *port = (port_t *)hprinter; + /* TODO: pass printer name and job_id */ + return port->mon->monitor.pfnStartDocPort(port->hport, + NULL, 0, level, doc_info); + } + + if (printer->header.type != HANDLE_PRINTER) { SetLastError(ERROR_INVALID_HANDLE); return 0;

1 0

Piotr Caban : winprint: Fix parameters validation in EnumPrintProcessorDatatypesW.
by Alexandre Julliard Dec. 5, 2022

Dec. 5, 2022

Module: wine Branch: master Commit: a98fb06a5b0278383cd59690d756edeedcb807c4 URL: https://gitlab.winehq.org/wine/wine/-/commit/a98fb06a5b0278383cd59690d756ed… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Dec 3 18:42:10 2022 +0100 winprint: Fix parameters validation in EnumPrintProcessorDatatypesW. --- dlls/winprint/printproc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winprint/printproc.c b/dlls/winprint/printproc.c index d7d9cce9d93..8ea3557b3bc 100644 --- a/dlls/winprint/printproc.c +++ b/dlls/winprint/printproc.c @@ -81,7 +81,7 @@ BOOL WINAPI EnumPrintProcessorDatatypesW(WCHAR *server, WCHAR *name, DWORD level *no = 0; *needed = sizeof(*info) + sizeof(raw); - if (level != 1 || !datatypes) + if (level != 1 || (size && !datatypes)) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE;

1 0

Piotr Caban : winprint: Fix datatype validation in PrintDocumentOnPrintProcessor.
by Alexandre Julliard Dec. 5, 2022

Dec. 5, 2022

Module: wine Branch: master Commit: c8d28f270272133cb17ade93d2fe2dba2ab7e22b URL: https://gitlab.winehq.org/wine/wine/-/commit/c8d28f270272133cb17ade93d2fe2d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Dec 3 18:42:59 2022 +0100 winprint: Fix datatype validation in PrintDocumentOnPrintProcessor. --- dlls/winprint/printproc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winprint/printproc.c b/dlls/winprint/printproc.c index 8ea3557b3bc..03275bb4afb 100644 --- a/dlls/winprint/printproc.c +++ b/dlls/winprint/printproc.c @@ -111,7 +111,7 @@ HANDLE WINAPI OpenPrintProcessor(WCHAR *port, PRINTPROCESSOROPENDATA *open_data) SetLastError(ERROR_INVALID_PARAMETER); return NULL; } - if (!wcscmp(open_data->pDatatype, L"RAW")) + if (wcscmp(open_data->pDatatype, L"RAW")) { SetLastError(ERROR_INVALID_DATATYPE); return NULL;

1 0

Alexandre Julliard : ntdll: Initialize Unix calls early during startup.
by Alexandre Julliard Dec. 5, 2022

Dec. 5, 2022

Module: wine Branch: master Commit: 0538557512dd9785e9a9a92474c1e4cebc32cf25 URL: https://gitlab.winehq.org/wine/wine/-/commit/0538557512dd9785e9a9a92474c1e4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Dec 4 22:01:38 2022 +0100 ntdll: Initialize Unix calls early during startup. --- dlls/ntdll/loader.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 6484c0b312e..895a3f5b138 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2187,22 +2187,17 @@ static NTSTATUS build_module( LPCWSTR load_path, const UNICODE_STRING *nt_name, * * Build the module data for the initially-loaded ntdll. */ -static void build_ntdll_module(void) +static void build_ntdll_module( HMODULE module ) { - MEMORY_BASIC_INFORMATION meminfo; UNICODE_STRING nt_name; WINE_MODREF *wm; RtlInitUnicodeString( &nt_name, L"\\??\\C:\\windows\\system32\\ntdll.dll" ); - NtQueryVirtualMemory( GetCurrentProcess(), build_ntdll_module, MemoryBasicInformation, - &meminfo, sizeof(meminfo), NULL ); - wm = alloc_module( meminfo.AllocationBase, &nt_name, TRUE ); + wm = alloc_module( module, &nt_name, TRUE ); assert( wm ); wm->ldr.Flags &= ~LDR_DONT_RESOLVE_REFS; node_ntdll = wm->ldr.DdagNode; - if (TRACE_ON(relay)) RELAY_SetupDLL( meminfo.AllocationBase ); - NtQueryVirtualMemory( GetCurrentProcess(), meminfo.AllocationBase, MemoryWineUnixFuncs, - &ntdll_unix_handle, sizeof(ntdll_unix_handle), NULL ); + if (TRACE_ON(relay)) RELAY_SetupDLL( module ); } @@ -4112,10 +4107,16 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR if (!imports_fixup_done) { + MEMORY_BASIC_INFORMATION meminfo; ANSI_STRING func_name; WINE_MODREF *kernel32; PEB *peb = NtCurrentTeb()->Peb; + NtQueryVirtualMemory( GetCurrentProcess(), LdrInitializeThunk, MemoryBasicInformation, + &meminfo, sizeof(meminfo), NULL ); + NtQueryVirtualMemory( GetCurrentProcess(), meminfo.AllocationBase, MemoryWineUnixFuncs, + &ntdll_unix_handle, sizeof(ntdll_unix_handle), NULL ); + peb->LdrData = &ldr; peb->FastPebLock = &peb_lock; peb->TlsBitmap = &tls_bitmap; @@ -4137,7 +4138,7 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR wm = build_main_module(); wm->ldr.LoadCount = -1; - build_ntdll_module(); + build_ntdll_module( meminfo.AllocationBase ); if (NtCurrentTeb()->WowTebOffset) init_wow64( context );

1 0

Alexandre Julliard : ntdll: Move the .so module initialization to winecrt0.
by Alexandre Julliard Dec. 5, 2022

Dec. 5, 2022

Module: wine Branch: master Commit: bef09697227c29f53bb0ad95232399cbba5c9c6b URL: https://gitlab.winehq.org/wine/wine/-/commit/bef09697227c29f53bb0ad95232399… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 3 16:13:54 2022 +0100 ntdll: Move the .so module initialization to winecrt0. Use new ELF tag ids to avoid breaking backwards compatibility. --- configure | 6 ++ configure.ac | 2 +- dlls/ntdll/loader.c | 3 - dlls/ntdll/unix/loader.c | 85 ----------------------------- dlls/ntdll/unix/unix_private.h | 1 - dlls/ntdll/unix/virtual.c | 2 +- dlls/ntdll/unixlib.h | 1 - dlls/winecrt0/Makefile.in | 1 + dlls/winecrt0/dll_entry.c | 3 + dlls/winecrt0/dll_soinit.c | 121 +++++++++++++++++++++++++++++++++++++++++ dlls/winecrt0/exe_entry.c | 2 + dlls/winecrt0/exe_wentry.c | 2 + include/config.h.in | 3 + tools/winebuild/spec32.c | 6 +- 14 files changed, 143 insertions(+), 95 deletions(-)

1 0

Alexandre Julliard : winebuild: Reinstate the __wine_spec_dll_entry() entrypoint for .so dlls.
by Alexandre Julliard Dec. 5, 2022

Dec. 5, 2022

Module: wine Branch: master Commit: c20741b33a669f4a2a2d84908c17024043eb208a URL: https://gitlab.winehq.org/wine/wine/-/commit/c20741b33a669f4a2a2d84908c1702… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 3 16:12:16 2022 +0100 winebuild: Reinstate the __wine_spec_dll_entry() entrypoint for .so dlls. --- dlls/winecrt0/Makefile.in | 1 + dlls/winecrt0/dll_entry.c | 35 +++++++++++++++++++++++++++++++++++ tools/winebuild/main.c | 6 +++++- 3 files changed, 41 insertions(+), 1 deletion(-) diff --git a/dlls/winecrt0/Makefile.in b/dlls/winecrt0/Makefile.in index 17da4da29c6..1faed0827ec 100644 --- a/dlls/winecrt0/Makefile.in +++ b/dlls/winecrt0/Makefile.in @@ -6,6 +6,7 @@ C_SRCS = \ debug.c \ delay_load.c \ dll_canunload.c \ + dll_entry.c \ dll_main.c \ dll_register.c \ exception.c \ diff --git a/dlls/winecrt0/dll_entry.c b/dlls/winecrt0/dll_entry.c new file mode 100644 index 00000000000..1c7fe676c2c --- /dev/null +++ b/dlls/winecrt0/dll_entry.c @@ -0,0 +1,35 @@ +/* + * Default entry point for a .so dll + * + * Copyright 2022 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#if 0 +#pragma makedep unix +#endif + +/* this is actually part of a static lib linked into a .dll.so module, not a real Unix library */ +#undef WINE_UNIX_LIB + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DECLSPEC_HIDDEN __wine_spec_dll_entry( HINSTANCE inst, DWORD reason, LPVOID reserved ) +{ + return DllMain( inst, reason, reserved ); +} diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 875bf45f0a1..aae223f9e57 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -340,7 +340,11 @@ static void set_exec_mode( enum exec_mode_values mode ) /* get the default entry point for a given spec file */ static const char *get_default_entry_point( const DLLSPEC *spec ) { - if (spec->characteristics & IMAGE_FILE_DLL) return "DllMain"; + if (spec->characteristics & IMAGE_FILE_DLL) + { + add_spec_extra_ld_symbol("DllMain"); + return "__wine_spec_dll_entry"; + } if (spec->subsystem == IMAGE_SUBSYSTEM_NATIVE) return "DriverEntry"; if (spec->type == SPEC_WIN16) {

1 0

Nikolay Sivov : d3d10/effect: Add 'frc' instruction support for expressions.
by Alexandre Julliard Dec. 2, 2022

Dec. 2, 2022

Module: wine Branch: master Commit: 0fe562b4ae3f66f9c0e29ab8f27a4abf2ac78501 URL: https://gitlab.winehq.org/wine/wine/-/commit/0fe562b4ae3f66f9c0e29ab8f27a4a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 1 07:07:34 2022 +0300 d3d10/effect: Add 'frc' instruction support for expressions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/effect.c | 10 ++++++ dlls/d3d10/tests/effect.c | 80 ++++++++++++++++++++++++++++++++++------------- 2 files changed, 69 insertions(+), 21 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 21f41def5be..2b9c391023a 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -225,6 +225,15 @@ static void pres_rcp(float **args, unsigned int n, const struct preshader_instr retval[i] = 1.0f / args[0][i]; } +static void pres_frc(float **args, unsigned int n, const struct preshader_instr *instr) +{ + float *retval = args[1]; + unsigned int i; + + for (i = 0; i < instr->comp_count; ++i) + retval[i] = args[0][i] - floor(args[0][i]); +} + static void pres_sin(float **args, unsigned int n, const struct preshader_instr *instr) { float *retval = args[1]; @@ -323,6 +332,7 @@ static const struct preshader_op_info preshader_ops[] = { { 0x101, "neg", pres_neg }, { 0x103, "rcp", pres_rcp }, + { 0x104, "frc", pres_frc }, { 0x108, "sin", pres_sin }, { 0x109, "cos", pres_cos }, { 0x133, "ftou", pres_ftou }, diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index bdaf07be434..a2892efec70 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -8175,13 +8175,17 @@ technique10 tech { SetBlendState( NULL, 1.0f / g_var, 0 ); } + pass p7 + { + SetBlendState( NULL, frac(g_var), 0 ); + } } #endif static DWORD fx_test_value_expression[] = { - 0x43425844, 0xd2081c75, 0x0e089a32, 0xcda030e3, 0xc28f5c06, 0x00000001, 0x00000f2e, 0x00000001, - 0x00000024, 0x30315846, 0x00000f02, 0xfeff1001, 0x00000001, 0x00000002, 0x00000001, 0x00000000, - 0x00000000, 0x00000000, 0x00000001, 0x00000c8e, 0x00000000, 0x00000000, 0x00000001, 0x00000000, + 0x43425844, 0x52c4c6e1, 0x3efe62d7, 0xce564377, 0x35213200, 0x00000001, 0x00001075, 0x00000001, + 0x00000024, 0x30315846, 0x00001049, 0xfeff1001, 0x00000001, 0x00000002, 0x00000001, 0x00000000, + 0x00000000, 0x00000000, 0x00000001, 0x00000d99, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x6f6c4724, 0x736c6162, 0x6f6c6600, 0x00347461, 0x0000000d, 0x00000001, 0x00000000, 0x00000010, 0x00000010, 0x00000010, 0x0000210a, 0x61765f67, 0x5f670072, 0x32726176, 0x70654400, 0x74536874, 0x69636e65, @@ -8283,26 +8287,41 @@ static DWORD fx_test_value_expression[] = 0x00010000, 0x00011030, 0x00000000, 0x00020000, 0x00020000, 0x00000000, 0x00040000, 0x00020000, 0x00010000, 0x00011030, 0x00000000, 0x00020000, 0x00030000, 0x00000000, 0x00040000, 0x00030000, 0xf0f00000, 0x0f0ff0f0, 0xffff0f0f, 0x00010000, 0x00020000, 0x00000000, 0x00010000, 0x00020000, - 0x00000000, 0x00040000, 0x00200000, 0x00000000, 0x00020000, 0xffff0000, 0x0000ffff, 0x00300000, - 0x00140000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00360000, 0x00140000, - 0x00000000, 0x00100000, 0x00000000, 0x00000000, 0x00000000, 0x006b0000, 0x004f0000, 0x00000000, - 0xffff0000, 0x0001ffff, 0x00190000, 0x00000000, 0x00060000, 0x00740000, 0x00000000, 0x01640000, - 0x00070000, 0x00000000, 0x01690000, 0x00030000, 0x00000000, 0x000a0000, 0x00000000, 0x00060000, - 0x016c0000, 0x000b0000, 0x00000000, 0x00010000, 0x03b40000, 0x00020000, 0x00000000, 0x00010000, - 0x03c00000, 0x03cc0000, 0x00030000, 0x00000000, 0x000a0000, 0x00000000, 0x00060000, 0x03cf0000, - 0x000b0000, 0x00000000, 0x00010000, 0x05230000, 0x00020000, 0x00000000, 0x00010000, 0x052f0000, - 0x053b0000, 0x00030000, 0x00000000, 0x000a0000, 0x00000000, 0x00060000, 0x053e0000, 0x000b0000, - 0x00000000, 0x00010000, 0x076e0000, 0x00020000, 0x00000000, 0x00010000, 0x077a0000, 0x07860000, - 0x00030000, 0x00000000, 0x000a0000, 0x00000000, 0x00060000, 0x07890000, 0x000b0000, 0x00000000, - 0x00010000, 0x08b10000, 0x00020000, 0x00000000, 0x00010000, 0x08bd0000, 0x08c90000, 0x00030000, - 0x00000000, 0x000a0000, 0x00000000, 0x00060000, 0x08cc0000, 0x000b0000, 0x00000000, 0x00010000, - 0x09f40000, 0x00020000, 0x00000000, 0x00010000, 0x0a000000, 0x0a0c0000, 0x00030000, 0x00000000, - 0x000a0000, 0x00000000, 0x00060000, 0x0a0f0000, 0x000b0000, 0x00000000, 0x00010000, 0x0b0b0000, - 0x00020000, 0x00000000, 0x00010000, 0x0b170000, 0x0b230000, 0x00030000, 0x00000000, 0x000a0000, - 0x00000000, 0x00060000, 0x0b260000, 0x000b0000, 0x00000000, 0x00010000, 0x0c760000, 0x00020000, - 0x00000000, 0x00010000, 0x0c820000, 0x00000000, + 0x00000000, 0x37700000, 0x0000ec00, 0x42584400, 0x67aa4243, 0xe24a7796, 0x86419cce, 0xdf743a20, + 0x000001e1, 0x0000ec00, 0x00000300, 0x00002c00, 0x0000a800, 0x0000b400, 0x41544300, 0x00007442, + 0x00001c00, 0x00004b00, 0x58040000, 0x00000146, 0x00001c00, 0x00010000, 0x00004800, 0x00003000, + 0x00000200, 0x00000100, 0x00003800, 0x00000000, 0x765f6700, 0xab007261, 0x030001ab, 0x04000100, + 0x00000100, 0x00000000, 0x00787400, 0x7263694d, 0x666f736f, 0x52282074, 0x4c482029, 0x53204c53, + 0x65646168, 0x6f432072, 0x6c69706d, 0x31207265, 0x00312e30, 0x494c43ab, 0x00000434, 0x00000000, + 0x4c584600, 0x00003043, 0x00000100, 0x40000400, 0x00000110, 0x00000000, 0x00000200, 0x00000000, + 0x00000000, 0x00000400, 0x00000000, 0xf0f0f000, 0x0f0f0ff0, 0x00ffff0f, 0x00000100, 0x00000200, + 0x00000000, 0x00000100, 0x00000200, 0x00000000, 0x00000400, 0x00002000, 0x00000000, 0x00000200, + 0xffffff00, 0x000000ff, 0x00003000, 0x00001400, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00003600, 0x00001400, 0x00000000, 0x00001000, 0x00000000, 0x00000000, 0x00000000, + 0x00006b00, 0x00004f00, 0x00000000, 0xffffff00, 0x000001ff, 0x00001900, 0x00000000, 0x00000600, + 0x00007400, 0x00000000, 0x00016400, 0x00000800, 0x00000000, 0x00016900, 0x00000300, 0x00000000, + 0x00000a00, 0x00000000, 0x00000600, 0x00016c00, 0x00000b00, 0x00000000, 0x00000100, 0x0003b400, + 0x00000200, 0x00000000, 0x00000100, 0x0003c000, 0x0003cc00, 0x00000300, 0x00000000, 0x00000a00, + 0x00000000, 0x00000600, 0x0003cf00, 0x00000b00, 0x00000000, 0x00000100, 0x00052300, 0x00000200, + 0x00000000, 0x00000100, 0x00052f00, 0x00053b00, 0x00000300, 0x00000000, 0x00000a00, 0x00000000, + 0x00000600, 0x00053e00, 0x00000b00, 0x00000000, 0x00000100, 0x00076e00, 0x00000200, 0x00000000, + 0x00000100, 0x00077a00, 0x00078600, 0x00000300, 0x00000000, 0x00000a00, 0x00000000, 0x00000600, + 0x00078900, 0x00000b00, 0x00000000, 0x00000100, 0x0008b100, 0x00000200, 0x00000000, 0x00000100, + 0x0008bd00, 0x0008c900, 0x00000300, 0x00000000, 0x00000a00, 0x00000000, 0x00000600, 0x0008cc00, + 0x00000b00, 0x00000000, 0x00000100, 0x0009f400, 0x00000200, 0x00000000, 0x00000100, 0x000a0000, + 0x000a0c00, 0x00000300, 0x00000000, 0x00000a00, 0x00000000, 0x00000600, 0x000a0f00, 0x00000b00, + 0x00000000, 0x00000100, 0x000b0b00, 0x00000200, 0x00000000, 0x00000100, 0x000b1700, 0x000b2300, + 0x00000300, 0x00000000, 0x00000a00, 0x00000000, 0x00000600, 0x000b2600, 0x00000b00, 0x00000000, + 0x00000100, 0x000c7600, 0x00000200, 0x00000000, 0x00000100, 0x000c8200, 0x000c8e00, 0x00000300, + 0x00000000, 0x00000a00, 0x00000000, 0x00000600, 0x000c9100, 0x00000b00, 0x00000000, 0x00000100, + 0x000d8100, 0x00000200, 0x00000000, 0x00000100, 0x000d8d00, 0x00000000, }; +static float get_frc(float v) +{ + return v - floor(v); +} + static void test_effect_value_expression(void) { ID3D10EffectVectorVariable *g_var, *g_var2; @@ -8423,6 +8442,25 @@ static void test_effect_value_expression(void) ok(blend_factor[3] == 1.0f / 5.0f, "Got unexpected blend_factor[3] %.8e.\n", blend_factor[3]); ok(!sample_mask, "Got unexpected sample_mask %#x.\n", sample_mask); + /* frc */ + pass = t->lpVtbl->GetPassByName(t, "p7"); + ok(pass->lpVtbl->IsValid(pass), "Expected valid pass.\n"); + + f[0] = 0.0f; f[1] = 3.1f; f[2] = -4.2f; f[3] = 0.1f; + hr = g_var->lpVtbl->SetFloatVector(g_var, f); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = pass->lpVtbl->Apply(pass, 0); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + ID3D10Device_OMGetBlendState(device, &blend_state, blend_factor, &sample_mask); + ok(!blend_state, "Unexpected blend state %p.\n", blend_state); + ok(blend_factor[0] == get_frc(f[0]), "Got unexpected blend_factor[0] %.8e.\n", blend_factor[0]); + ok(blend_factor[1] == get_frc(f[1]), "Got unexpected blend_factor[1] %.8e.\n", blend_factor[1]); + ok(blend_factor[2] == get_frc(f[2]), "Got unexpected blend_factor[2] %.8e.\n", blend_factor[2]); + ok(blend_factor[3] == get_frc(f[3]), "Got unexpected blend_factor[3] %.8e.\n", blend_factor[3]); + ok(!sample_mask, "Got unexpected sample_mask %#x.\n", sample_mask); + /* Mutable state objects. */ v = effect->lpVtbl->GetVariableByName(effect, "ds_state"); ds = v->lpVtbl->AsDepthStencil(v);

1 0