wine-commits November 2022

wine-commits@winehq.org

1 participants
1171 discussions

Piotr Caban : localspl: Add unixname port extension.
by Alexandre Julliard 29 Nov '22

29 Nov '22

Module: wine Branch: master Commit: 6372a61eb553c612553d2f43455cf53a2130a5d0 URL: https://gitlab.winehq.org/wine/wine/-/commit/6372a61eb553c612553d2f43455cf5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 28 13:05:22 2022 +0100 localspl: Add unixname port extension. --- dlls/localspl/cups.c | 35 +++++++++++++++++++++++++++++++++++ dlls/localspl/localmon.c | 6 +++--- dlls/localspl/provider.c | 2 +- 3 files changed, 39 insertions(+), 4 deletions(-) diff --git a/dlls/localspl/cups.c b/dlls/localspl/cups.c index 25c485e220e..fa685e26289 100644 --- a/dlls/localspl/cups.c +++ b/dlls/localspl/cups.c @@ -52,6 +52,10 @@ typedef struct _doc_t pid_t pid; int fd; } pipe; + struct + { + int fd; + } unixname; }; } doc_t; @@ -131,6 +135,35 @@ static BOOL pipe_start_doc(doc_t *doc, const WCHAR *cmd) return TRUE; } +static BOOL unixname_write_doc(doc_t *doc, const BYTE *buf, unsigned int size) +{ + return write(doc->unixname.fd, buf, size) == size; +} + +static BOOL unixname_end_doc(doc_t *doc) +{ + close(doc->unixname.fd); + return TRUE; +} + +static BOOL unixname_start_doc(doc_t *doc, const WCHAR *output) +{ + char *outputA; + DWORD len; + + doc->write_doc = unixname_write_doc; + doc->end_doc = unixname_end_doc; + + len = wcslen(output); + outputA = malloc(len * 3 + 1); + ntdll_wcstoumbs(output, len + 1, outputA, len * 3 + 1, FALSE); + + doc->unixname.fd = open(outputA, O_CREAT | O_TRUNC | O_WRONLY, 0666); + free(outputA); + + return doc->unixname.fd != -1; +} + static NTSTATUS start_doc(void *args) { const struct start_doc_params *params = args; @@ -141,6 +174,8 @@ static NTSTATUS start_doc(void *args) if (params->type == PORT_IS_PIPE) ret = pipe_start_doc(doc, params->port + 1 /* strlen("|") */); + else if (params->type == PORT_IS_UNIXNAME) + ret = unixname_start_doc(doc, params->port); if (ret) *params->doc = (size_t)doc; diff --git a/dlls/localspl/localmon.c b/dlls/localspl/localmon.c index 9f403b9e85e..d2712cde995 100644 --- a/dlls/localspl/localmon.c +++ b/dlls/localspl/localmon.c @@ -506,7 +506,7 @@ static BOOL WINAPI localmon_StartDocPort(HANDLE hport, WCHAR *printer_name, TRACE("(%p %s %ld %ld %p)\n", hport, debugstr_w(printer_name), job_id, level, doc_info); - if (port->type == PORT_IS_PIPE) + if (port->type == PORT_IS_PIPE || port->type == PORT_IS_UNIXNAME) { struct start_doc_params params; @@ -546,7 +546,7 @@ static BOOL WINAPI localmon_WritePort(HANDLE hport, BYTE *buf, DWORD size, TRACE("(%p %p %lu %p)\n", hport, buf, size, written); - if (port->type == PORT_IS_PIPE) + if (port->type == PORT_IS_PIPE || port->type == PORT_IS_UNIXNAME) { struct write_doc_params params; BOOL ret; @@ -568,7 +568,7 @@ static BOOL WINAPI localmon_EndDocPort(HANDLE hport) TRACE("(%p)\n", hport); - if (port->type == PORT_IS_PIPE) + if (port->type == PORT_IS_PIPE || port->type == PORT_IS_UNIXNAME) { struct end_doc_params params; diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index e79d8f23350..7b5a94b52f6 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -988,7 +988,7 @@ static monitor_t * monitor_load_by_port(LPCWSTR portname) TRACE("(%s)\n", debugstr_w(portname)); /* wine specific ports */ - if (portname[0] == '|') + if (portname[0] == '|' || portname[0] == '/') return monitor_load(L"Local Port", NULL); /* Try the Local Monitor first */

1 0

Piotr Caban : localspl: Add pipe port extension.
by Alexandre Julliard 29 Nov '22

29 Nov '22

Module: wine Branch: master Commit: fca258ef895949cc141b83ec3551e2327bd5bd80 URL: https://gitlab.winehq.org/wine/wine/-/commit/fca258ef895949cc141b83ec3551e2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Nov 27 21:59:38 2022 +0100 localspl: Add pipe port extension. --- dlls/localspl/Makefile.in | 2 + dlls/localspl/cups.c | 227 +++++++++++++++++++++++++++++++++++++++ dlls/localspl/localmon.c | 59 ++++++++-- dlls/localspl/localspl_private.h | 29 +++++ dlls/localspl/provider.c | 4 + 5 files changed, 313 insertions(+), 8 deletions(-)

1 0

Piotr Caban : localspl: Fix parameters validation in FILE StartDocPort.
by Alexandre Julliard 29 Nov '22

29 Nov '22

Module: wine Branch: master Commit: aa4e9c39d25069da7e54dd7c3196277aaf203e1e URL: https://gitlab.winehq.org/wine/wine/-/commit/aa4e9c39d25069da7e54dd7c319627… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 28 16:14:17 2022 +0100 localspl: Fix parameters validation in FILE StartDocPort. --- dlls/localspl/localmon.c | 2 +- dlls/localspl/tests/localmon.c | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/localspl/localmon.c b/dlls/localspl/localmon.c index a982d359058..43e6197fa47 100644 --- a/dlls/localspl/localmon.c +++ b/dlls/localspl/localmon.c @@ -509,7 +509,7 @@ static BOOL WINAPI localmon_StartDocPort(HANDLE hport, WCHAR *printer_name, if (!doc_info || !doc_info->pOutputFile) { - FIXME("set error\n"); + SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } diff --git a/dlls/localspl/tests/localmon.c b/dlls/localspl/tests/localmon.c index edc0b1f7cbb..931de81a503 100644 --- a/dlls/localspl/tests/localmon.c +++ b/dlls/localspl/tests/localmon.c @@ -914,9 +914,18 @@ static void test_file_port(void) ok(!res, "WritePort succeeded\n"); ok(GetLastError() == ERROR_INVALID_HANDLE, "GetLastError() = %lu\n", GetLastError()); - doc_info.pDocName = (WCHAR *)L"not used"; + SetLastError(0xdeadbeef); + res = pStartDocPort(hport, printer_name, 1, 1, NULL); + ok(!res, "StartDocPort succeeded\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError() = %lu\n", GetLastError()); + + memset(&doc_info, 0, sizeof(doc_info)); + SetLastError(0xdeadbeef); + res = pStartDocPort(hport, printer_name, 1, 1, (BYTE *)&doc_info); + ok(!res, "StartDocPort succeeded\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError() = %lu\n", GetLastError()); + doc_info.pOutputFile = tempfileW; - doc_info.pDatatype = (WCHAR *)L"not used"; res = pStartDocPort(hport, printer_name, 1, 1, (BYTE *)&doc_info); ok(res, "StartDocPort failed (%lu)\n", GetLastError());

1 0

Piotr Caban : localspl: Add printer port redirection extension.
by Alexandre Julliard 29 Nov '22

29 Nov '22

Module: wine Branch: master Commit: 604e7b4e77840dc99823c14b54c3f68e362842dd URL: https://gitlab.winehq.org/wine/wine/-/commit/604e7b4e77840dc99823c14b54c3f6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 28 12:54:50 2022 +0100 localspl: Add printer port redirection extension. --- dlls/localspl/provider.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index fcddd2a7018..f34653291c1 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -3240,6 +3240,7 @@ static BOOL WINAPI fpScheduleJob(HANDLE hprinter, DWORD job_id) BOOL ret_startdoc = FALSE, ret_open = FALSE, ret = TRUE; printer_t *printer = (printer_t *)hprinter; const WCHAR *port_name, *port; + WCHAR output[1024]; DOC_INFO_1W info; monitor_t *mon; BYTE buf[4096]; @@ -3247,6 +3248,7 @@ static BOOL WINAPI fpScheduleJob(HANDLE hprinter, DWORD job_id) DWORD r, w; job_t *job; HANDLE hf; + HKEY hkey; TRACE("%p %ld\n", hprinter, job_id); @@ -3280,10 +3282,22 @@ static BOOL WINAPI fpScheduleJob(HANDLE hprinter, DWORD job_id) } /* TODO: use print processor */ - if (isalpha(port[0]) && port[1] == ':') + port_name = port; + if ((isalpha(port[0]) && port[1] == ':') || + !wcsncmp(port, L"FILE:", ARRAY_SIZE(L"FILE:") - 1)) + { port_name = L"FILE:"; - else - port_name = port; + } + else if (!RegOpenKeyW(HKEY_CURRENT_USER, L"Software\\Wine\\Printing\\Spooler", &hkey)) + { + DWORD type, count = sizeof(output); + if (!RegQueryValueExW(hkey, port, NULL, &type, (BYTE *)output, &count)) + { + TRACE("overriding port %s -> %s\n", debugstr_w(port), debugstr_w(output)); + port_name = output; + } + RegCloseKey(hkey); + } if (!(mon = monitor_load_by_port(port_name)) || !mon->monitor.pfnOpenPort || !mon->monitor.pfnStartDocPort || !mon->monitor.pfnWritePort ||

1 0

Tim Clem : winex11.drv: Don't ignore virtual EnterNotify events.
by Alexandre Julliard 29 Nov '22

29 Nov '22

Module: wine Branch: master Commit: 6be2138da66db5d1a11787f705a32680c8e59560 URL: https://gitlab.winehq.org/wine/wine/-/commit/6be2138da66db5d1a11787f705a326… Author: Tim Clem <tclem(a)codeweavers.com> Date: Thu Nov 10 09:10:13 2022 -0800 winex11.drv: Don't ignore virtual EnterNotify events. These represent the mouse entering a client window child, and if no MotionNotify events follow, we'll be left out of sync with X. --- dlls/winex11.drv/mouse.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 4edf9c9596c..ebc8be643af 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -1811,7 +1811,6 @@ BOOL X11DRV_EnterNotify( HWND hwnd, XEvent *xev ) TRACE( "hwnd %p/%lx pos %d,%d detail %d\n", hwnd, event->window, event->x, event->y, event->detail ); - if (event->detail == NotifyVirtual) return FALSE; if (hwnd == x11drv_thread_data()->grab_hwnd) return FALSE; /* simulate a mouse motion event */

1 0

Piotr Caban : winspool: Don't translate port name to path in StartDocDlgW.
by Alexandre Julliard 29 Nov '22

29 Nov '22

Module: wine Branch: master Commit: d9a80adc234854fb0d00165ae25c9afee51b66a6 URL: https://gitlab.winehq.org/wine/wine/-/commit/d9a80adc234854fb0d00165ae25c9a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 29 12:53:46 2022 +0100 winspool: Don't translate port name to path in StartDocDlgW. --- dlls/winspool.drv/info.c | 52 ++++++++++++++++++++++++++++++++++-------------- 1 file changed, 37 insertions(+), 15 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 1434a5c1e2b..2cf8ab076dc 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -8033,6 +8033,28 @@ failed: return ret; } +static BOOL is_port(const WCHAR *port_list, const WCHAR *output) +{ + size_t len; + + if (!output) + return FALSE; + + if (wcschr(output, ':')) + return TRUE; + + len = wcslen(output); + while (port_list && *port_list) + { + if (!wcsncmp(output, port_list, len) && (!port_list[len] || port_list[len] == ',')) + return TRUE; + + port_list = wcschr(port_list, ','); + if (port_list) port_list++; + } + return FALSE; +} + /***************************************************************************** * StartDocDlgW [WINSPOOL.@] * @@ -8044,24 +8066,24 @@ failed: */ LPWSTR WINAPI StartDocDlgW( HANDLE hPrinter, DOCINFOW *doc ) { + PRINTER_INFO_5W *pi5; LPWSTR ret = NULL; DWORD len, attr; + BOOL b; - if(doc->lpszOutput == NULL) /* Check whether default port is FILE: */ - { - PRINTER_INFO_5W *pi5; - GetPrinterW(hPrinter, 5, NULL, 0, &len); - if(GetLastError() != ERROR_INSUFFICIENT_BUFFER) - return NULL; - pi5 = malloc(len); - GetPrinterW(hPrinter, 5, (LPBYTE)pi5, len, &len); - if(!pi5->pPortName || wcscmp( pi5->pPortName, L"FILE:" )) - { - free(pi5); - return NULL; - } - free(pi5); - } + GetPrinterW(hPrinter, 5, NULL, 0, &len); + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) + return NULL; + pi5 = malloc(len); + GetPrinterW(hPrinter, 5, (LPBYTE)pi5, len, &len); + + /* Check whether default port is FILE: */ + b = !doc->lpszOutput && (!pi5->pPortName || wcscmp( pi5->pPortName, L"FILE:" )); + if (!b) + b = is_port(pi5->pPortName, doc->lpszOutput); + free(pi5); + if (b) + return NULL; if(doc->lpszOutput == NULL || !wcscmp( doc->lpszOutput, L"FILE:" )) {

1 0

Piotr Caban : gdi32: NULL terminate output string in CreateDCW.
by Alexandre Julliard 29 Nov '22

29 Nov '22

Module: wine Branch: master Commit: b6204639ba864231bd14164363613963a9696278 URL: https://gitlab.winehq.org/wine/wine/-/commit/b6204639ba864231bd141643636139… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 29 12:17:11 2022 +0100 gdi32: NULL terminate output string in CreateDCW. --- dlls/gdi32/dc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 6ec11650d27..44dd9b9373d 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -244,7 +244,7 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, { return 0; } - else if (output && !(port = HeapAlloc( GetProcessHeap(), 0, output_str.Length ))) + else if (output && !(port = HeapAlloc( GetProcessHeap(), 0, output_str.Length + sizeof(WCHAR) ))) { ClosePrinter( hspool ); return 0; @@ -271,7 +271,10 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, if (ret && hspool && (dc_attr = get_dc_attr( ret ))) { if (port) + { memcpy( port, output, output_str.Length ); + port[output_str.Length / sizeof(WCHAR)] = 0; + } dc_attr->hspool = HandleToULong( hspool ); dc_attr->output = (ULONG_PTR)port; }

1 0

Alexandre Julliard : winebuild: Call __delayLoadHelper2 to resolve delay imports also on non-PE builds.
by Alexandre Julliard 29 Nov '22

29 Nov '22

Module: wine Branch: master Commit: de3c286adf70ffab9f02393536b5ea2bdfa05117 URL: https://gitlab.winehq.org/wine/wine/-/commit/de3c286adf70ffab9f02393536b5ea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 29 14:31:46 2022 +0100 winebuild: Call __delayLoadHelper2 to resolve delay imports also on non-PE builds. --- dlls/winecrt0/delay_load.c | 11 ----------- tools/winebuild/import.c | 45 ++++++++++++++++++++++++++++++++++----------- 2 files changed, 34 insertions(+), 22 deletions(-) diff --git a/dlls/winecrt0/delay_load.c b/dlls/winecrt0/delay_load.c index 219c9e741b4..3044fa4431f 100644 --- a/dlls/winecrt0/delay_load.c +++ b/dlls/winecrt0/delay_load.c @@ -44,14 +44,3 @@ FARPROC WINAPI __delayLoadHelper2( const IMAGE_DELAYLOAD_DESCRIPTOR *descr, IMAG { return ResolveDelayLoadedAPI( image_base(), descr, NULL, DelayLoadFailureHook, addr, 0 ); } - -#ifndef __WINE_PE_BUILD - -FARPROC WINAPI DECLSPEC_HIDDEN __wine_spec_delay_load( const IMAGE_DELAYLOAD_DESCRIPTOR *descr, unsigned int id ) -{ - IMAGE_THUNK_DATA *thunk = (IMAGE_THUNK_DATA *)((char *)image_base() + descr->ImportAddressTableRVA); - - return __delayLoadHelper2( descr, thunk + LOWORD(id) ); -} - -#endif /* __WINE_PE_BUILD */ diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 8245819ebfd..515283fb50f 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -511,7 +511,7 @@ static void add_extra_undef_symbols( DLLSPEC *spec ) add_extra_ld_symbol( spec->init_func ); if (spec->type == SPEC_WIN16) add_extra_ld_symbol( "DllMain" ); if (has_stubs( spec )) add_extra_ld_symbol( "__wine_spec_unimplemented_stub" ); - if (delayed_imports.count) add_extra_ld_symbol( "__wine_spec_delay_load" ); + if (delayed_imports.count) add_extra_ld_symbol( "__delayLoadHelper2" ); } /* check if a given imported dll is not needed, taking forwards into account */ @@ -1018,7 +1018,7 @@ static void output_delayed_imports( const DLLSPEC *spec ) /* output the delayed import thunks of a Win32 module */ static void output_delayed_import_thunks( const DLLSPEC *spec ) { - int j, pos; + int j, pos, iat_pos; struct import *import; static const char delayed_import_loaders[] = "__wine_spec_delayed_import_loaders"; static const char delayed_import_thunks[] = "__wine_spec_delayed_import_thunks"; @@ -1030,7 +1030,7 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output( "\t.align %d\n", get_alignment(8) ); output( "%s:\n", asm_name(delayed_import_loaders)); - pos = 0; + pos = iat_pos = 0; LIST_FOR_EACH_ENTRY( import, &dll_delayed, struct import, entry ) { char *module_func = strmake( "__wine_delay_load_asm_%s", import->c_name ); @@ -1060,7 +1060,7 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output( "\tpushl $.L__wine_spec_delay_imports+%d\n", pos ); output_cfi( ".cfi_adjust_cfa_offset 4" ); } - output( "\tcall %s\n", asm_name("__wine_spec_delay_load") ); + output( "\tcall %s\n", asm_name("__delayLoadHelper2") ); output_cfi( ".cfi_adjust_cfa_offset -8" ); output( "\tpopl %%edx\n" ); output_cfi( ".cfi_adjust_cfa_offset -4" ); @@ -1083,7 +1083,7 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output( "\tmovups %%xmm3,0x20(%%rsp)\n" ); output( "\tleaq .L__wine_spec_delay_imports+%d(%%rip),%%rcx\n", pos ); output( "\tmovq %%rax,%%rdx\n" ); - output( "\tcall %s\n", asm_name("__wine_spec_delay_load") ); + output( "\tcall %s\n", asm_name("__delayLoadHelper2") ); output( "\tmovups 0x20(%%rsp),%%xmm3\n" ); output( "\tmovups 0x30(%%rsp),%%xmm2\n" ); output( "\tmovups 0x40(%%rsp),%%xmm1\n" ); @@ -1103,7 +1103,7 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output( "\tmov r1,IP\n" ); output( "\tldr r0, 1f\n"); if (UsePIC) output( "2:\tadd r0, pc\n" ); - output( "\tbl %s\n", asm_name("__wine_spec_delay_load") ); + output( "\tbl %s\n", asm_name("__delayLoadHelper2") ); output( "\tmov IP,r0\n"); output( "\tpop {r0-r3,FP,LR}\n" ); output( "\tbx IP\n"); @@ -1123,7 +1123,7 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output( "\tadrp x0, %s\n", arm64_page(".L__wine_spec_delay_imports") ); output( "\tadd x0, x0, #%s\n", arm64_pageoff(".L__wine_spec_delay_imports") ); if (pos) output( "\tadd x0, x0, #%u\n", pos ); - output( "\tbl %s\n", asm_name("__wine_spec_delay_load") ); + output( "\tbl %s\n", asm_name("__delayLoadHelper2") ); output( "\tmov x16, x0\n" ); output( "\tldp x0, x1, [sp,#16]\n" ); output( "\tldp x2, x3, [sp,#32]\n" ); @@ -1148,20 +1148,43 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) switch (target.cpu) { case CPU_i386: + if (UsePIC) + { + output( "\tcall %s\n", asm_name("__wine_spec_get_pc_thunk_eax") ); + output( "1:\tleal .L__wine_delay_IAT+%d-1b(%%eax),%%eax\n", iat_pos ); + needs_get_pc_thunk = 1; + } + else output( "\tmovl $.L__wine_delay_IAT+%d,%%eax\n", iat_pos ); + output( "\tjmp %s\n", asm_name(module_func) ); + break; case CPU_x86_64: - output( "\tmovl $%d,%%eax\n", j ); + output( "\tleaq .L__wine_delay_IAT+%d(%%rip),%%rax\n", iat_pos ); output( "\tjmp %s\n", asm_name(module_func) ); break; case CPU_ARM: - output( "\tmov ip, #%u\n", j ); - output( "\tb %s\n", asm_name(module_func) ); + if (UsePIC) + { + output( "\tldr ip, 2f\n"); + output( "1:\tadd ip, pc\n" ); + output( "\tb %s\n", asm_name(module_func) ); + output( "2:\t.long .L__wine_delay_IAT+%u-1b-%u\n", iat_pos, thumb_mode ? 4 : 8 ); + } + else + { + output( "\tldr ip, 1f\n"); + output( "\tb %s\n", asm_name(module_func) ); + output( "1:\t.long .L__wine_delay_IAT+%u\n", iat_pos ); + } break; case CPU_ARM64: - output( "\tmov x16, #0x%x\n", j ); + output( "\tadrp x16, %s\n", arm64_page(".L__wine_delay_IAT") ); + output( "\tadd x16, x16, #%s\n", arm64_pageoff(".L__wine_delay_IAT") ); + if (iat_pos) output( "\tadd x16, x16, #%u\n", iat_pos ); output( "\tb %s\n", asm_name(module_func) ); break; } output_cfi( ".cfi_endproc" ); + iat_pos += get_ptr_size(); } pos += 8 * 4; /* IMAGE_DELAYLOAD_DESCRIPTOR is 8 DWORDs */ }

1 0

Alexandre Julliard : winebuild: Pass the delay import descriptor to the __wine_spec_delay_load function.
by Alexandre Julliard 29 Nov '22

29 Nov '22

Module: wine Branch: master Commit: 1181011c1ee01f62bb2c891cc99a5f252bc8c3f9 URL: https://gitlab.winehq.org/wine/wine/-/commit/1181011c1ee01f62bb2c891cc99a5f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 29 14:23:26 2022 +0100 winebuild: Pass the delay import descriptor to the __wine_spec_delay_load function. --- dlls/winecrt0/delay_load.c | 5 +---- tools/winebuild/import.c | 49 ++++++++++++++++++++++++++++++---------------- 2 files changed, 33 insertions(+), 21 deletions(-) diff --git a/dlls/winecrt0/delay_load.c b/dlls/winecrt0/delay_load.c index af14fce3668..219c9e741b4 100644 --- a/dlls/winecrt0/delay_load.c +++ b/dlls/winecrt0/delay_load.c @@ -47,11 +47,8 @@ FARPROC WINAPI __delayLoadHelper2( const IMAGE_DELAYLOAD_DESCRIPTOR *descr, IMAG #ifndef __WINE_PE_BUILD -extern IMAGE_DELAYLOAD_DESCRIPTOR __wine_spec_delay_imports[]; - -FARPROC WINAPI DECLSPEC_HIDDEN __wine_spec_delay_load( unsigned int id ) +FARPROC WINAPI DECLSPEC_HIDDEN __wine_spec_delay_load( const IMAGE_DELAYLOAD_DESCRIPTOR *descr, unsigned int id ) { - const IMAGE_DELAYLOAD_DESCRIPTOR *descr = __wine_spec_delay_imports + HIWORD(id); IMAGE_THUNK_DATA *thunk = (IMAGE_THUNK_DATA *)((char *)image_base() + descr->ImportAddressTableRVA); return __delayLoadHelper2( descr, thunk + LOWORD(id) ); diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 29a693d5908..8245819ebfd 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -943,7 +943,6 @@ static void output_delayed_imports( const DLLSPEC *spec ) output( "\t.data\n" ); output( "\t.align %d\n", get_alignment(get_ptr_size()) ); output( ".L__wine_spec_delay_imports:\n" ); - output( "%s\n", asm_globl("__wine_spec_delay_imports") ); /* list of dlls */ @@ -1014,13 +1013,12 @@ static void output_delayed_imports( const DLLSPEC *spec ) output( "\t%s \"%s\"\n", get_asm_string_keyword(), func->name ); } } - output_function_size( "__wine_spec_delay_imports" ); } /* output the delayed import thunks of a Win32 module */ static void output_delayed_import_thunks( const DLLSPEC *spec ) { - int idx, j, pos; + int j, pos; struct import *import; static const char delayed_import_loaders[] = "__wine_spec_delayed_import_loaders"; static const char delayed_import_thunks[] = "__wine_spec_delayed_import_thunks"; @@ -1032,7 +1030,7 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output( "\t.align %d\n", get_alignment(8) ); output( "%s:\n", asm_name(delayed_import_loaders)); - idx = 0; + pos = 0; LIST_FOR_EACH_ENTRY( import, &dll_delayed, struct import, entry ) { char *module_func = strmake( "__wine_delay_load_asm_%s", import->c_name ); @@ -1049,8 +1047,21 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output_cfi( ".cfi_adjust_cfa_offset 4" ); output( "\tpushl %%eax\n" ); output_cfi( ".cfi_adjust_cfa_offset 4" ); + if (UsePIC) + { + output( "\tcall %s\n", asm_name("__wine_spec_get_pc_thunk_eax") ); + output( "1:\tleal .L__wine_spec_delay_imports+%d-1b(%%eax),%%eax\n", pos ); + output( "\tpushl %%eax\n" ); + output_cfi( ".cfi_adjust_cfa_offset 4" ); + needs_get_pc_thunk = 1; + } + else + { + output( "\tpushl $.L__wine_spec_delay_imports+%d\n", pos ); + output_cfi( ".cfi_adjust_cfa_offset 4" ); + } output( "\tcall %s\n", asm_name("__wine_spec_delay_load") ); - output_cfi( ".cfi_adjust_cfa_offset -4" ); + output_cfi( ".cfi_adjust_cfa_offset -8" ); output( "\tpopl %%edx\n" ); output_cfi( ".cfi_adjust_cfa_offset -4" ); output( "\tpopl %%ecx\n" ); @@ -1070,7 +1081,8 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output( "\tmovups %%xmm1,0x40(%%rsp)\n" ); output( "\tmovups %%xmm2,0x30(%%rsp)\n" ); output( "\tmovups %%xmm3,0x20(%%rsp)\n" ); - output( "\tmovq %%rax,%%rcx\n" ); + output( "\tleaq .L__wine_spec_delay_imports+%d(%%rip),%%rcx\n", pos ); + output( "\tmovq %%rax,%%rdx\n" ); output( "\tcall %s\n", asm_name("__wine_spec_delay_load") ); output( "\tmovups 0x20(%%rsp),%%xmm3\n" ); output( "\tmovups 0x30(%%rsp),%%xmm2\n" ); @@ -1088,11 +1100,17 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) break; case CPU_ARM: output( "\tpush {r0-r3,FP,LR}\n" ); - output( "\tmov r0,IP\n" ); + output( "\tmov r1,IP\n" ); + output( "\tldr r0, 1f\n"); + if (UsePIC) output( "2:\tadd r0, pc\n" ); output( "\tbl %s\n", asm_name("__wine_spec_delay_load") ); output( "\tmov IP,r0\n"); output( "\tpop {r0-r3,FP,LR}\n" ); output( "\tbx IP\n"); + if (UsePIC) + output( "1:\t.long .L__wine_spec_delay_imports+%u-2b-%u\n", pos, thumb_mode ? 4 : 8 ); + else + output( "1:\t.long .L__wine_spec_delay_imports+%u\n", pos ); break; case CPU_ARM64: output( "\tstp x29, x30, [sp,#-80]!\n" ); @@ -1101,7 +1119,10 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output( "\tstp x2, x3, [sp,#32]\n" ); output( "\tstp x4, x5, [sp,#48]\n" ); output( "\tstp x6, x7, [sp,#64]\n" ); - output( "\tmov x0, x16\n" ); + output( "\tmov x1, x16\n" ); + output( "\tadrp x0, %s\n", arm64_page(".L__wine_spec_delay_imports") ); + output( "\tadd x0, x0, #%s\n", arm64_pageoff(".L__wine_spec_delay_imports") ); + if (pos) output( "\tadd x0, x0, #%u\n", pos ); output( "\tbl %s\n", asm_name("__wine_spec_delay_load") ); output( "\tmov x16, x0\n" ); output( "\tldp x0, x1, [sp,#16]\n" ); @@ -1128,27 +1149,21 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) { case CPU_i386: case CPU_x86_64: - output( "\tmovl $%d,%%eax\n", (idx << 16) | j ); + output( "\tmovl $%d,%%eax\n", j ); output( "\tjmp %s\n", asm_name(module_func) ); break; case CPU_ARM: output( "\tmov ip, #%u\n", j ); - if (idx) output( "\tmovt ip, #%u\n", idx ); output( "\tb %s\n", asm_name(module_func) ); break; case CPU_ARM64: - if (idx) - { - output( "\tmov x16, #0x%x\n", idx << 16 ); - if (j) output( "\tmovk x16, #0x%x\n", j ); - } - else output( "\tmov x16, #0x%x\n", j ); + output( "\tmov x16, #0x%x\n", j ); output( "\tb %s\n", asm_name(module_func) ); break; } output_cfi( ".cfi_endproc" ); } - idx++; + pos += 8 * 4; /* IMAGE_DELAYLOAD_DESCRIPTOR is 8 DWORDs */ } output_function_size( delayed_import_loaders );

1 0

Alexandre Julliard : winebuild: Generate a separate helper for each delay-imported module.
by Alexandre Julliard 29 Nov '22

29 Nov '22

Module: wine Branch: master Commit: a2d8e7a5d367a20ba973619b61d185b2335d2622 URL: https://gitlab.winehq.org/wine/wine/-/commit/a2d8e7a5d367a20ba973619b61d185… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 29 14:09:12 2022 +0100 winebuild: Generate a separate helper for each delay-imported module. --- tools/winebuild/import.c | 165 ++++++++++++++++++++++++----------------------- 1 file changed, 84 insertions(+), 81 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 4c77c6cc60e..29a693d5908 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1031,88 +1031,91 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output( "\t.text\n" ); output( "\t.align %d\n", get_alignment(8) ); output( "%s:\n", asm_name(delayed_import_loaders)); - output( "\t%s\n", func_declaration("__wine_delay_load_asm") ); - output( "%s:\n", asm_name("__wine_delay_load_asm") ); - output_cfi( ".cfi_startproc" ); - switch (target.cpu) - { - case CPU_i386: - output( "\tpushl %%ecx\n" ); - output_cfi( ".cfi_adjust_cfa_offset 4" ); - output( "\tpushl %%edx\n" ); - output_cfi( ".cfi_adjust_cfa_offset 4" ); - output( "\tpushl %%eax\n" ); - output_cfi( ".cfi_adjust_cfa_offset 4" ); - output( "\tcall %s\n", asm_name("__wine_spec_delay_load") ); - output_cfi( ".cfi_adjust_cfa_offset -4" ); - output( "\tpopl %%edx\n" ); - output_cfi( ".cfi_adjust_cfa_offset -4" ); - output( "\tpopl %%ecx\n" ); - output_cfi( ".cfi_adjust_cfa_offset -4" ); - output( "\tjmp *%%eax\n" ); - break; - case CPU_x86_64: - output( "\tsubq $0x98,%%rsp\n" ); - output_cfi( ".cfi_adjust_cfa_offset 0x98" ); - output( "\tmovq %%rdx,0x88(%%rsp)\n" ); - output( "\tmovq %%rcx,0x80(%%rsp)\n" ); - output( "\tmovq %%r8,0x78(%%rsp)\n" ); - output( "\tmovq %%r9,0x70(%%rsp)\n" ); - output( "\tmovq %%r10,0x68(%%rsp)\n" ); - output( "\tmovq %%r11,0x60(%%rsp)\n" ); - output( "\tmovups %%xmm0,0x50(%%rsp)\n" ); - output( "\tmovups %%xmm1,0x40(%%rsp)\n" ); - output( "\tmovups %%xmm2,0x30(%%rsp)\n" ); - output( "\tmovups %%xmm3,0x20(%%rsp)\n" ); - output( "\tmovq %%rax,%%rcx\n" ); - output( "\tcall %s\n", asm_name("__wine_spec_delay_load") ); - output( "\tmovups 0x20(%%rsp),%%xmm3\n" ); - output( "\tmovups 0x30(%%rsp),%%xmm2\n" ); - output( "\tmovups 0x40(%%rsp),%%xmm1\n" ); - output( "\tmovups 0x50(%%rsp),%%xmm0\n" ); - output( "\tmovq 0x60(%%rsp),%%r11\n" ); - output( "\tmovq 0x68(%%rsp),%%r10\n" ); - output( "\tmovq 0x70(%%rsp),%%r9\n" ); - output( "\tmovq 0x78(%%rsp),%%r8\n" ); - output( "\tmovq 0x80(%%rsp),%%rcx\n" ); - output( "\tmovq 0x88(%%rsp),%%rdx\n" ); - output( "\taddq $0x98,%%rsp\n" ); - output_cfi( ".cfi_adjust_cfa_offset -0x98" ); - output( "\tjmp *%%rax\n" ); - break; - case CPU_ARM: - output( "\tpush {r0-r3,FP,LR}\n" ); - output( "\tmov r0,IP\n" ); - output( "\tbl %s\n", asm_name("__wine_spec_delay_load") ); - output( "\tmov IP,r0\n"); - output( "\tpop {r0-r3,FP,LR}\n" ); - output( "\tbx IP\n"); - break; - case CPU_ARM64: - output( "\tstp x29, x30, [sp,#-80]!\n" ); - output( "\tmov x29, sp\n" ); - output( "\tstp x0, x1, [sp,#16]\n" ); - output( "\tstp x2, x3, [sp,#32]\n" ); - output( "\tstp x4, x5, [sp,#48]\n" ); - output( "\tstp x6, x7, [sp,#64]\n" ); - output( "\tmov x0, x16\n" ); - output( "\tbl %s\n", asm_name("__wine_spec_delay_load") ); - output( "\tmov x16, x0\n" ); - output( "\tldp x0, x1, [sp,#16]\n" ); - output( "\tldp x2, x3, [sp,#32]\n" ); - output( "\tldp x4, x5, [sp,#48]\n" ); - output( "\tldp x6, x7, [sp,#64]\n" ); - output( "\tldp x29, x30, [sp],#80\n" ); - output( "\tbr x16\n" ); - break; - } - output_cfi( ".cfi_endproc" ); - output_function_size( "__wine_delay_load_asm" ); - output( "\n" ); idx = 0; LIST_FOR_EACH_ENTRY( import, &dll_delayed, struct import, entry ) { + char *module_func = strmake( "__wine_delay_load_asm_%s", import->c_name ); + output( "\t.align %d\n", get_alignment(4) ); + output( "\t%s\n", func_declaration(module_func) ); + output( "%s:\n", asm_name(module_func) ); + output_cfi( ".cfi_startproc" ); + switch (target.cpu) + { + case CPU_i386: + output( "\tpushl %%ecx\n" ); + output_cfi( ".cfi_adjust_cfa_offset 4" ); + output( "\tpushl %%edx\n" ); + output_cfi( ".cfi_adjust_cfa_offset 4" ); + output( "\tpushl %%eax\n" ); + output_cfi( ".cfi_adjust_cfa_offset 4" ); + output( "\tcall %s\n", asm_name("__wine_spec_delay_load") ); + output_cfi( ".cfi_adjust_cfa_offset -4" ); + output( "\tpopl %%edx\n" ); + output_cfi( ".cfi_adjust_cfa_offset -4" ); + output( "\tpopl %%ecx\n" ); + output_cfi( ".cfi_adjust_cfa_offset -4" ); + output( "\tjmp *%%eax\n" ); + break; + case CPU_x86_64: + output( "\tsubq $0x98,%%rsp\n" ); + output_cfi( ".cfi_adjust_cfa_offset 0x98" ); + output( "\tmovq %%rdx,0x88(%%rsp)\n" ); + output( "\tmovq %%rcx,0x80(%%rsp)\n" ); + output( "\tmovq %%r8,0x78(%%rsp)\n" ); + output( "\tmovq %%r9,0x70(%%rsp)\n" ); + output( "\tmovq %%r10,0x68(%%rsp)\n" ); + output( "\tmovq %%r11,0x60(%%rsp)\n" ); + output( "\tmovups %%xmm0,0x50(%%rsp)\n" ); + output( "\tmovups %%xmm1,0x40(%%rsp)\n" ); + output( "\tmovups %%xmm2,0x30(%%rsp)\n" ); + output( "\tmovups %%xmm3,0x20(%%rsp)\n" ); + output( "\tmovq %%rax,%%rcx\n" ); + output( "\tcall %s\n", asm_name("__wine_spec_delay_load") ); + output( "\tmovups 0x20(%%rsp),%%xmm3\n" ); + output( "\tmovups 0x30(%%rsp),%%xmm2\n" ); + output( "\tmovups 0x40(%%rsp),%%xmm1\n" ); + output( "\tmovups 0x50(%%rsp),%%xmm0\n" ); + output( "\tmovq 0x60(%%rsp),%%r11\n" ); + output( "\tmovq 0x68(%%rsp),%%r10\n" ); + output( "\tmovq 0x70(%%rsp),%%r9\n" ); + output( "\tmovq 0x78(%%rsp),%%r8\n" ); + output( "\tmovq 0x80(%%rsp),%%rcx\n" ); + output( "\tmovq 0x88(%%rsp),%%rdx\n" ); + output( "\taddq $0x98,%%rsp\n" ); + output_cfi( ".cfi_adjust_cfa_offset -0x98" ); + output( "\tjmp *%%rax\n" ); + break; + case CPU_ARM: + output( "\tpush {r0-r3,FP,LR}\n" ); + output( "\tmov r0,IP\n" ); + output( "\tbl %s\n", asm_name("__wine_spec_delay_load") ); + output( "\tmov IP,r0\n"); + output( "\tpop {r0-r3,FP,LR}\n" ); + output( "\tbx IP\n"); + break; + case CPU_ARM64: + output( "\tstp x29, x30, [sp,#-80]!\n" ); + output( "\tmov x29, sp\n" ); + output( "\tstp x0, x1, [sp,#16]\n" ); + output( "\tstp x2, x3, [sp,#32]\n" ); + output( "\tstp x4, x5, [sp,#48]\n" ); + output( "\tstp x6, x7, [sp,#64]\n" ); + output( "\tmov x0, x16\n" ); + output( "\tbl %s\n", asm_name("__wine_spec_delay_load") ); + output( "\tmov x16, x0\n" ); + output( "\tldp x0, x1, [sp,#16]\n" ); + output( "\tldp x2, x3, [sp,#32]\n" ); + output( "\tldp x4, x5, [sp,#48]\n" ); + output( "\tldp x6, x7, [sp,#64]\n" ); + output( "\tldp x29, x30, [sp],#80\n" ); + output( "\tbr x16\n" ); + break; + } + output_cfi( ".cfi_endproc" ); + output_function_size( module_func ); + output( "\n" ); + for (j = 0; j < import->nb_imports; j++) { struct import_func *func = &import->imports[j]; @@ -1126,12 +1129,12 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) case CPU_i386: case CPU_x86_64: output( "\tmovl $%d,%%eax\n", (idx << 16) | j ); - output( "\tjmp %s\n", asm_name("__wine_delay_load_asm") ); + output( "\tjmp %s\n", asm_name(module_func) ); break; case CPU_ARM: output( "\tmov ip, #%u\n", j ); if (idx) output( "\tmovt ip, #%u\n", idx ); - output( "\tb %s\n", asm_name("__wine_delay_load_asm") ); + output( "\tb %s\n", asm_name(module_func) ); break; case CPU_ARM64: if (idx) @@ -1140,7 +1143,7 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) if (j) output( "\tmovk x16, #0x%x\n", j ); } else output( "\tmov x16, #0x%x\n", j ); - output( "\tb %s\n", asm_name("__wine_delay_load_asm") ); + output( "\tb %s\n", asm_name(module_func) ); break; } output_cfi( ".cfi_endproc" );

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
118
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2022