November 2022 - Wine-commits

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 : 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

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 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: 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 lpr port extension.
by Alexandre Julliard 29 Nov '22

29 Nov '22

Module: wine Branch: master Commit: 90149034efa232679adafa26febf00bf0c32225f URL: https://gitlab.winehq.org/wine/wine/-/commit/90149034efa232679adafa26febf00… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 28 13:33:15 2022 +0100 localspl: Add lpr port extension. --- dlls/localspl/cups.c | 16 ++++++++++++++++ dlls/localspl/localmon.c | 9 ++++++--- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/localspl/cups.c b/dlls/localspl/cups.c index fa685e26289..47362c1f138 100644 --- a/dlls/localspl/cups.c +++ b/dlls/localspl/cups.c @@ -164,6 +164,20 @@ static BOOL unixname_start_doc(doc_t *doc, const WCHAR *output) return doc->unixname.fd != -1; } +static BOOL lpr_start_doc(doc_t *doc, const WCHAR *printer_name) +{ + static const WCHAR lpr[] = { 'l','p','r',' ','-','P','\'' }; + static const WCHAR quote[] = { '\'',0 }; + int printer_len = wcslen(printer_name); + WCHAR *cmd; + + cmd = malloc(printer_len * sizeof(WCHAR) + sizeof(lpr) + sizeof(quote)); + memcpy(cmd, lpr, sizeof(lpr)); + memcpy(cmd + ARRAY_SIZE(lpr), printer_name, printer_len * sizeof(WCHAR)); + memcpy(cmd + ARRAY_SIZE(lpr) + printer_len, quote, sizeof(quote)); + return pipe_start_doc(doc, cmd); +} + static NTSTATUS start_doc(void *args) { const struct start_doc_params *params = args; @@ -176,6 +190,8 @@ static NTSTATUS start_doc(void *args) ret = pipe_start_doc(doc, params->port + 1 /* strlen("|") */); else if (params->type == PORT_IS_UNIXNAME) ret = unixname_start_doc(doc, params->port); + else if (params->type == PORT_IS_LPR) + ret = lpr_start_doc(doc, params->port + 4 /* strlen("lpr:") */); if (ret) *params->doc = (size_t)doc; diff --git a/dlls/localspl/localmon.c b/dlls/localspl/localmon.c index d2712cde995..8cef23787e7 100644 --- a/dlls/localspl/localmon.c +++ b/dlls/localspl/localmon.c @@ -506,7 +506,8 @@ 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 || port->type == PORT_IS_UNIXNAME) + if (port->type == PORT_IS_PIPE || port->type == PORT_IS_UNIXNAME || + port->type == PORT_IS_LPR) { struct start_doc_params params; @@ -546,7 +547,8 @@ 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 || port->type == PORT_IS_UNIXNAME) + if (port->type == PORT_IS_PIPE || port->type == PORT_IS_UNIXNAME || + port->type == PORT_IS_LPR) { struct write_doc_params params; BOOL ret; @@ -568,7 +570,8 @@ static BOOL WINAPI localmon_EndDocPort(HANDLE hport) TRACE("(%p)\n", hport); - if (port->type == PORT_IS_PIPE || port->type == PORT_IS_UNIXNAME) + if (port->type == PORT_IS_PIPE || port->type == PORT_IS_UNIXNAME || + port->type == PORT_IS_LPR) { struct end_doc_params params;

1 0

Alex Henrie : atl: Fix memory leak on error path in do_process_root_key (scan-build).
by Alexandre Julliard 29 Nov '22

29 Nov '22

Module: wine Branch: master Commit: cb4d61efa185f495d4a9a371f8ea857bbe1e785e URL: https://gitlab.winehq.org/wine/wine/-/commit/cb4d61efa185f495d4a9a371f8ea85… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 28 21:50:39 2022 -0700 atl: Fix memory leak on error path in do_process_root_key (scan-build). --- dlls/atl/registrar.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c index 5e03b42132c..9009cd1c7cf 100644 --- a/dlls/atl/registrar.c +++ b/dlls/atl/registrar.c @@ -383,7 +383,7 @@ static HRESULT do_process_root_key(LPCOLESTR data, BOOL do_register) strbuf_init(&buf); hres = get_word(&iter, &buf); if(FAILED(hres)) - return hres; + goto done; while(*iter) { if(!buf.len) { @@ -417,6 +417,8 @@ static HRESULT do_process_root_key(LPCOLESTR data, BOOL do_register) if(FAILED(hres)) break; } + +done: free(buf.str); return hres; }

1 0

Alex Henrie : vbscript: Fix memory leak on realloc failure in Global_Split (cppcheck).
by Alexandre Julliard 29 Nov '22

29 Nov '22

Module: wine Branch: master Commit: 06395e5cd95fb5cbbc6724d9eddc0ca7bdc46842 URL: https://gitlab.winehq.org/wine/wine/-/commit/06395e5cd95fb5cbbc6724d9eddc0c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 28 22:30:40 2022 -0700 vbscript: Fix memory leak on realloc failure in Global_Split (cppcheck). --- dlls/vbscript/global.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 98c705f4712..9eac80218fd 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2574,7 +2574,7 @@ static HRESULT Global_Split(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, { BSTR str, string, delimiter = NULL; int count, max, mode, len, start, end, ret, delimiterlen = 1; - int i,*indices = NULL, indices_max = 8; + int i, *indices = NULL, *new_indices, indices_max = 8; SAFEARRAYBOUND bounds; SAFEARRAY *sa = NULL; VARIANT *data, var; @@ -2656,12 +2656,13 @@ static HRESULT Global_Split(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, } if (count == indices_max) { - indices_max *= 2; - indices = realloc( indices, indices_max * sizeof(int)); - if(!indices) { + new_indices = realloc(indices, indices_max * 2 * sizeof(int)); + if(!new_indices) { hres = E_OUTOFMEMORY; goto error; } + indices = new_indices; + indices_max *= 2; } indices[count++] = end;

1 0

Alexandre Julliard : ntdll: Also fixup the delay import directory when mapping a .so dll.
by Alexandre Julliard 29 Nov '22

29 Nov '22

Module: wine Branch: master Commit: d406de182808fa58f9c1e30f46080ff80cb03a75 URL: https://gitlab.winehq.org/wine/wine/-/commit/d406de182808fa58f9c1e30f46080f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 29 13:15:52 2022 +0100 ntdll: Also fixup the delay import directory when mapping a .so dll. --- dlls/ntdll/unix/loader.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index deb25a8e35e..8e7bb155c86 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -962,6 +962,27 @@ static NTSTATUS map_so_dll( const IMAGE_NT_HEADERS *nt_descr, HMODULE module ) fixup_rva_dwords( (DWORD *)(addr + exports->AddressOfNames), delta, exports->NumberOfNames ); fixup_rva_ptrs( addr + exports->AddressOfFunctions, addr, exports->NumberOfFunctions ); } + + /* build the delay import directory */ + + dir = &nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT]; + if (dir->Size) + { + IMAGE_DELAYLOAD_DESCRIPTOR *imports = (IMAGE_DELAYLOAD_DESCRIPTOR *)(addr + dir->VirtualAddress); + + while (imports->DllNameRVA) + { + fixup_rva_dwords( &imports->DllNameRVA, delta, 1 ); + fixup_rva_dwords( &imports->ModuleHandleRVA, delta, 1 ); + fixup_rva_dwords( &imports->ImportAddressTableRVA, delta, 1 ); + fixup_rva_dwords( &imports->ImportNameTableRVA, delta, 1 ); + fixup_rva_dwords( &imports->BoundImportAddressTableRVA, delta, 1 ); + fixup_rva_dwords( &imports->UnloadInformationTableRVA, delta, 1 ); + fixup_rva_names( (UINT_PTR *)(addr + imports->ImportNameTableRVA), delta ); + imports++; + } + } + return STATUS_SUCCESS; }

1 0

Alexandre Julliard : winebuild: Add a helper function to output a thunk data pointer.
by Alexandre Julliard 29 Nov '22

29 Nov '22

Module: wine Branch: master Commit: 29060f3d7812d511cb11cb2f8d87c6c43b075881 URL: https://gitlab.winehq.org/wine/wine/-/commit/29060f3d7812d511cb11cb2f8d87c6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 29 13:55:01 2022 +0100 winebuild: Add a helper function to output a thunk data pointer. --- tools/winebuild/build.h | 2 ++ tools/winebuild/import.c | 33 ++++----------------------------- tools/winebuild/utils.c | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 38 insertions(+), 29 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 576304cd2b8..f501cca8f84 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -252,6 +252,8 @@ extern void output_cfi( const char *format, ... ) __attribute__ ((__format__ (__printf__, 1, 2))); extern void output_rva( const char *format, ... ) __attribute__ ((__format__ (__printf__, 1, 2))); +extern void output_thunk_rva( int ordinal, const char *format, ... ) + __attribute__ ((__format__ (__printf__, 2, 3))); extern void spawn( struct strarray array ); extern struct strarray find_tool( const char *name, const char * const *names ); extern struct strarray find_link_tool(void); diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 9f87adcf593..57adbef0d23 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -869,16 +869,8 @@ static void output_immediate_imports(void) if (func->name) output( "__imp_%s:\n", asm_name( func->name )); else if (func->export_name) output( "__imp_%s:\n", asm_name( func->export_name )); } - if (func->name) - output( "\t%s .L__wine_spec_import_data_%s_%s-.L__wine_spec_rva_base\n", - get_asm_ptr_keyword(), import->c_name, func->name ); - else - { - if (get_ptr_size() == 8) - output( "\t.quad 0x800000000000%04x\n", func->ordinal ); - else - output( "\t.long 0x8000%04x\n", func->ordinal ); - } + output_thunk_rva( func->name ? -1 : func->ordinal, + ".L__wine_spec_import_data_%s_%s", import->c_name, func->name ); } output( "\t%s 0\n", get_asm_ptr_keyword() ); } @@ -1861,31 +1853,14 @@ static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struc } output( "\n\t.section \".idata$4\"\n" ); - if (by_name) - { - output_rva( ".L__wine_import_name" ); - if (get_ptr_size() == 8) output( "\t.long 0\n" ); - } - else - { - if (get_ptr_size() == 4) output( "\t.long 0x8000%04x\n", odp->ordinal ); - else output( "\t.quad 0x800000000000%04x\n", odp->ordinal ); - } + output_thunk_rva( by_name ? -1 : odp->ordinal, ".L__wine_import_name" ); output( "\n\t.section \".idata$5\"\n" ); output( "%s\n", asm_globl( imp_name ) ); if (is_delay) output( "\t%s .L__wine_delay_import\n", get_asm_ptr_keyword() ); - else if (by_name) - { - output_rva( ".L__wine_import_name" ); - if (get_ptr_size() == 8) output( "\t.long 0\n" ); - } else - { - if (get_ptr_size() == 4) output( "\t.long 0x8000%04x\n", odp->ordinal ); - else output( "\t.quad 0x800000000000%04x\n", odp->ordinal ); - } + output_thunk_rva( by_name ? -1 : odp->ordinal, ".L__wine_import_name" ); if (by_name) { diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 7f10939da36..21de209f65c 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -984,6 +984,38 @@ void output_rva( const char *format, ... ) va_end( valist ); } +/* output an RVA pointer or ordinal for a function thunk */ +void output_thunk_rva( int ordinal, const char *format, ... ) +{ + if (ordinal == -1) + { + va_list valist; + + va_start( valist, format ); + switch (target.platform) + { + case PLATFORM_MINGW: + case PLATFORM_WINDOWS: + output( "\t.rva " ); + vfprintf( output_file, format, valist ); + fputc( '\n', output_file ); + if (get_ptr_size() == 8) output( "\t.long 0\n" ); + break; + default: + output( "\t%s ", get_asm_ptr_keyword() ); + vfprintf( output_file, format, valist ); + output( " - .L__wine_spec_rva_base\n" ); + break; + } + va_end( valist ); + } + else + { + if (get_ptr_size() == 4) output( "\t.long 0x8000%04x\n", ordinal ); + else output( "\t.quad 0x800000000000%04x\n", ordinal ); + } +} + /* output the GNU note for non-exec stack */ void output_gnu_stack_note(void) {

1 0