Piotr Caban : winspool: Fix FILE: output handling in StartDocDlgW.
Module: wine Branch: stable Commit: ac61163dd69d991fea9b037aecd6c116cd22870d URL: https://gitlab.winehq.org/wine/wine/-/commit/ac61163dd69d991fea9b037aecd6c11... Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Feb 19 17:18:38 2023 +0100 winspool: Fix FILE: output handling in StartDocDlgW. (cherry picked from commit 4a8cdc2b4981cc776d02a02de32fcb70dd86c0cd) --- dlls/winspool.drv/info.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index bc55d7f6d73..a137432b188 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -7491,9 +7491,6 @@ static BOOL is_port(const WCHAR *port_list, const WCHAR *output) { size_t len; - if (!output) - return FALSE; - if (wcschr(output, ':')) return TRUE; @@ -7533,7 +7530,7 @@ LPWSTR WINAPI StartDocDlgW( HANDLE hPrinter, DOCINFOW *doc ) /* Check whether default port is FILE: */ b = !doc->lpszOutput && (!pi5->pPortName || wcscmp( pi5->pPortName, L"FILE:" )); - if (!b) + if (!b && doc->lpszOutput && wcscmp( doc->lpszOutput, L"FILE:" )) b = is_port(pi5->pPortName, doc->lpszOutput); free(pi5); if (b)
participants (1)
-
Alexandre Julliard