September 2020 - Wine-Commits

Rémi Bernon : user32: Return TRUE from ShowWindow(SW_SHOW) if already visible.
by Alexandre Julliard Sept. 11, 2020

Sept. 11, 2020

Module: wine Branch: master Commit: d50c310da96565dec98977e96a2d887097a6c1cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=d50c310da96565dec98977e9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 11 11:52:01 2020 +0200 user32: Return TRUE from ShowWindow(SW_SHOW) if already visible. Instead of calling SendMessage, similarly to the SW_HIDE case. Based on a patch by Kimmo Myllyvirta <kimmo.myllyvirta(a)gmail.com>. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39731 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 22 ++++++++++++++++++++-- dlls/user32/winpos.c | 3 +++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index f84525a0bf..bf20c5c7f2 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -5085,7 +5085,7 @@ static void test_WM_DEVICECHANGE(HWND hwnd) } } -static DWORD CALLBACK show_window_thread(LPVOID arg) +static DWORD CALLBACK hide_window_thread( LPVOID arg ) { HWND hwnd = arg; @@ -5095,6 +5095,16 @@ static DWORD CALLBACK show_window_thread(LPVOID arg) return 0; } +static DWORD CALLBACK show_window_thread( LPVOID arg ) +{ + HWND hwnd = arg; + + /* function will not return if ShowWindow(SW_SHOW) calls SendMessage() */ + ok( ShowWindow( hwnd, SW_SHOW ), "ShowWindow(SW_SHOW) expected TRUE\n" ); /* actually it's 24... */ + + return 0; +} + /* Helper function to easier test SetWindowPos messages */ #define test_msg_setpos( expected_list, flags, todo ) \ test_msg_setpos_( (expected_list), (flags), (todo), __FILE__, __LINE__) @@ -5156,7 +5166,7 @@ static void test_messages(void) ok_sequence(WmEmptySeq, "ShowWindow(SW_HIDE):overlapped", FALSE); /* test ShowWindow(SW_HIDE) on a hidden window - multi-threaded */ - hthread = CreateThread(NULL, 0, show_window_thread, hwnd, 0, &tid); + hthread = CreateThread( NULL, 0, hide_window_thread, hwnd, 0, &tid ); ok(hthread != NULL, "CreateThread failed, error %d\n", GetLastError()); ok(WaitForSingleObject(hthread, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); CloseHandle(hthread); @@ -5167,6 +5177,14 @@ static void test_messages(void) flush_events(); ok_sequence(WmShowOverlappedSeq, "ShowWindow(SW_SHOW):overlapped", TRUE); + /* test ShowWindow(SW_SHOW) on a visible window - multi-threaded */ + hthread = CreateThread( NULL, 0, show_window_thread, hwnd, 0, &tid ); + ok( hthread != NULL, "CreateThread failed, error %d\n", GetLastError() ); + ok( WaitForSingleObject( hthread, INFINITE ) == WAIT_OBJECT_0, "WaitForSingleObject failed\n" ); + CloseHandle( hthread ); + flush_events(); + ok_sequence( WmEmptySeq, "ShowWindow(SW_SHOW):overlapped", FALSE ); + ShowWindow(hwnd, SW_HIDE); flush_events(); ok_sequence(WmHideOverlappedSeq, "ShowWindow(SW_HIDE):overlapped", FALSE); diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index b45b74ce82..e3c3f5c5c6 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1231,6 +1231,9 @@ BOOL WINAPI ShowWindow( HWND hwnd, INT cmd ) if ((cmd == SW_HIDE) && !(GetWindowLongW( hwnd, GWL_STYLE ) & WS_VISIBLE)) return FALSE; + if ((cmd == SW_SHOW) && (GetWindowLongW( hwnd, GWL_STYLE ) & WS_VISIBLE)) + return TRUE; + return SendMessageW( hwnd, WM_WINE_SHOWWINDOW, cmd, 0 ); }

1 0

Zebediah Figura : server: Remove no longer used is_fd_signaled().
by Alexandre Julliard Sept. 11, 2020

Sept. 11, 2020

Module: wine Branch: master Commit: 820d703c3182de41a175f6dddf339b9f6147734f URL: https://source.winehq.org/git/wine.git/?a=commit;h=820d703c3182de41a175f6dd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 10 16:17:17 2020 -0500 server: Remove no longer used is_fd_signaled(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/fd.c | 6 ------ server/file.h | 1 - 2 files changed, 7 deletions(-) diff --git a/server/fd.c b/server/fd.c index 7ea8ac273e..a88ba39ef0 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2057,12 +2057,6 @@ void set_fd_signaled( struct fd *fd, int signaled ) if (signaled) wake_up( fd->user, 0 ); } -/* check if fd is signaled */ -int is_fd_signaled( struct fd *fd ) -{ - return fd->signaled; -} - /* handler for close_handle that refuses to close fd-associated handles in other processes */ int fd_close_handle( struct object *obj, struct process *process, obj_handle_t handle ) { diff --git a/server/file.h b/server/file.h index e8ace7f49e..b02c9fe603 100644 --- a/server/file.h +++ b/server/file.h @@ -99,7 +99,6 @@ extern obj_handle_t lock_fd( struct fd *fd, file_pos_t offset, file_pos_t count, extern void unlock_fd( struct fd *fd, file_pos_t offset, file_pos_t count ); extern void allow_fd_caching( struct fd *fd ); extern void set_fd_signaled( struct fd *fd, int signaled ); -extern int is_fd_signaled( struct fd *fd ); extern char *dup_fd_name( struct fd *root, const char *name ); extern int default_fd_signaled( struct object *obj, struct wait_queue_entry *entry );

1 0

Zebediah Figura : ws2_32: Close all open sockets in WSACleanup().
by Alexandre Julliard Sept. 11, 2020

Sept. 11, 2020

Module: wine Branch: master Commit: 470b9d037988cf5e79b039370e2c6c55daf3459c URL: https://source.winehq.org/git/wine.git/?a=commit;h=470b9d037988cf5e79b03937… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 10 16:17:15 2020 -0500 ws2_32: Close all open sockets in WSACleanup(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=18670 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 14 +++++++++++--- dlls/ws2_32/tests/sock.c | 3 --- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 4421463029..246a0e2819 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1770,9 +1770,17 @@ int WINAPI WSAStartup(WORD wVersionRequested, LPWSADATA lpWSAData) */ INT WINAPI WSACleanup(void) { - if (num_startup) { - num_startup--; - TRACE("pending cleanups: %d\n", num_startup); + TRACE("decreasing startup count from %d\n", num_startup); + if (num_startup) + { + if (!--num_startup) + { + unsigned int i; + + for (i = 0; i < socket_list_size; ++i) + CloseHandle(SOCKET2HANDLE(socket_list[i])); + memset(socket_list, 0, socket_list_size * sizeof(*socket_list)); + } return 0; } SetLastError(WSANOTINITIALISED); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index c7f88d6f3b..7835246397 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1221,7 +1221,6 @@ static void test_WithWSAStartup(void) ok(res == 0, "WSAStartup() failed unexpectedly: %d\n", res); /* show that sockets are destroyed automatically after WSACleanup */ - todo_wine { SetLastError(0xdeadbeef); res = send(pairs[0].src, "TEST", 4, 0); error = WSAGetLastError(); @@ -1258,8 +1257,6 @@ static void test_WithWSAStartup(void) } } - } - /* While wine is not fixed, close all sockets manually */ for (i = 0; i < socks; i++) {

1 0

Myah Caron : cmd.exe: Fix /Y flag for move builtin.
by Alexandre Julliard Sept. 11, 2020

Sept. 11, 2020

Module: wine Branch: master Commit: 81fe7a2165ed244cc0ac24b133e49ce596e77710 URL: https://source.winehq.org/git/wine.git/?a=commit;h=81fe7a2165ed244cc0ac24b1… Author: Myah Caron <qsniyg(a)protonmail.com> Date: Thu Sep 10 19:10:55 2020 +0000 cmd.exe: Fix /Y flag for move builtin. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48397 Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 15 +++++---------- programs/cmd/tests/test_builtins.cmd.exp | 4 ++-- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 70ccddebc1..d2f2ea517a 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -3003,6 +3003,7 @@ void WCMD_move (void) WCHAR src[MAX_PATH]; DWORD attribs; BOOL ok = TRUE; + DWORD flags = 0; WINE_TRACE("Processing file '%s'\n", wine_dbgstr_w(fd.cFileName)); @@ -3051,20 +3052,14 @@ void WCMD_move (void) question = WCMD_format_string(WCMD_LoadMessage(WCMD_OVERWRITE), dest); ok = WCMD_ask_confirm(question, FALSE, NULL); LocalFree(question); - - /* So delete the destination prior to the move */ - if (ok) { - if (!DeleteFileW(dest)) { - WCMD_print_error (); - errorlevel = 1; - ok = FALSE; - } - } } + + if (ok) + flags |= MOVEFILE_REPLACE_EXISTING; } if (ok) { - status = MoveFileW(src, dest); + status = MoveFileExW(src, dest, flags); } else { status = TRUE; } diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index fb84de2f5d..f75839fdbe 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -1343,8 +1343,8 @@ original file still present ------------ Testing move ------------ --- file move file move succeeded -(a)todo_wine@file move with overwrite succeeded(a)or_broken@file overwrite impossible! -(a)todo_wine@bar(a)or_broken@baz +file move with overwrite succeeded(a)or_broken@file overwrite impossible! +bar(a)or_broken@baz read-only files are moveable file moved in subdirectory moving a file to itself is a no-op(a)or_broken@moving a file to itself should be a no-op!

1 0

Jacek Caban : kernel32: Use IOCTL_CONDRV_WRITE_CONSOLE in WriteConsoleW when possible.
by Alexandre Julliard Sept. 11, 2020

Sept. 11, 2020

Module: wine Branch: master Commit: ab6056d6774310162ef268ca6af5e3ad2e556a4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab6056d6774310162ef268ca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 11 14:31:07 2020 +0200 kernel32: Use IOCTL_CONDRV_WRITE_CONSOLE in WriteConsoleW when possible. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 7 +++++++ server/console.c | 9 +++++++-- server/trace.c | 1 + 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 5b5722847f..afac9be760 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -794,6 +794,13 @@ BOOL WINAPI WriteConsoleW(HANDLE hConsoleOutput, LPCVOID lpBuffer, DWORD nNumber if (lpNumberOfCharsWritten) *lpNumberOfCharsWritten = 0; + if (DeviceIoControl(hConsoleOutput, IOCTL_CONDRV_WRITE_CONSOLE, (void *)lpBuffer, + nNumberOfCharsToWrite * sizeof(WCHAR), NULL, 0, NULL, NULL)) + { + if (lpNumberOfCharsWritten) *lpNumberOfCharsWritten = nNumberOfCharsToWrite; + return TRUE; + } + if ((fd = get_console_bare_fd(hConsoleOutput)) != -1) { char* ptr; diff --git a/server/console.c b/server/console.c index 6a4a0b60d5..c9db27935e 100644 --- a/server/console.c +++ b/server/console.c @@ -2106,8 +2106,13 @@ static int screen_buffer_ioctl( struct fd *fd, ioctl_code_t code, struct async * } default: - set_error( STATUS_INVALID_HANDLE ); - return 0; + if (!screen_buffer->input || !screen_buffer->input->server || code >> 16 != FILE_DEVICE_CONSOLE) + { + set_error( STATUS_INVALID_HANDLE ); + return 0; + } + return queue_host_ioctl( screen_buffer->input->server, code, screen_buffer->id, + async, &screen_buffer->ioctl_q ); } } diff --git a/server/trace.c b/server/trace.c index a0174a1bd6..c93e4fe3b4 100644 --- a/server/trace.c +++ b/server/trace.c @@ -128,6 +128,7 @@ static void dump_ioctl_code( const char *prefix, const ioctl_code_t *code ) CASE(IOCTL_CONDRV_READ_OUTPUT); CASE(IOCTL_CONDRV_SET_MODE); CASE(IOCTL_CONDRV_SET_OUTPUT_INFO); + CASE(IOCTL_CONDRV_WRITE_CONSOLE); CASE(IOCTL_CONDRV_WRITE_INPUT); CASE(IOCTL_CONDRV_WRITE_OUTPUT); CASE(FSCTL_DISMOUNT_VOLUME);

1 0

Matteo Bruni : d3d11: Report multisample flags in CheckFormatSupport().
by Alexandre Julliard Sept. 11, 2020

Sept. 11, 2020

Module: wine Branch: master Commit: 0b56461f35417ea56fbbe32116c49bf22decce9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b56461f35417ea56fbbe321… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Sep 10 21:20:42 2020 +0200 d3d11: Report multisample flags in CheckFormatSupport(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49614 Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 29fa8b3752..0508fa3f7b 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3402,6 +3402,18 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device2 * } } + /* d3d11 requires 4 and 8 sample counts support for formats reported to + * support multisample. */ + if (wined3d_check_device_multisample_type(wined3d_adapter, params.device_type, wined3d_format, + TRUE, WINED3D_MULTISAMPLE_4_SAMPLES, NULL) == WINED3D_OK && + wined3d_check_device_multisample_type(wined3d_adapter, params.device_type, wined3d_format, + TRUE, WINED3D_MULTISAMPLE_8_SAMPLES, NULL) == WINED3D_OK) + { + *format_support |= D3D11_FORMAT_SUPPORT_MULTISAMPLE_RESOLVE + | D3D11_FORMAT_SUPPORT_MULTISAMPLE_RENDERTARGET + | D3D11_FORMAT_SUPPORT_MULTISAMPLE_LOAD; + } + return S_OK; }

1 0

Jacek Caban : conhost/tests: Add WriteConsole tests.
by Alexandre Julliard Sept. 11, 2020

Sept. 11, 2020

Module: wine Branch: master Commit: 5d96c5aac883b343ddcfbe6f6b1b96ad6827a46b URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d96c5aac883b343ddcfbe6f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 11 14:31:24 2020 +0200 conhost/tests: Add WriteConsole tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 4 +- programs/conhost/tests/tty.c | 239 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 241 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5d96c5aac883b343ddcf…

1 0

Matteo Bruni : d3d11: Report D3D11_FORMAT_SUPPORT_MIP in CheckFormatSupport().
by Alexandre Julliard Sept. 11, 2020

Sept. 11, 2020

Module: wine Branch: master Commit: 5515458bc9cd2564eb8fe9d51bb1e7006e1e8ba1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5515458bc9cd2564eb8fe9d5… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Sep 10 21:20:39 2020 +0200 d3d11: Report D3D11_FORMAT_SUPPORT_MIP in CheckFormatSupport(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 880c8b6595..0d38a2f194 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3343,6 +3343,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device2 * {WINED3D_RTYPE_TEXTURE_2D, WINED3D_BIND_SHADER_RESOURCE, WINED3DUSAGE_LEGACY_CUBEMAP, D3D11_FORMAT_SUPPORT_TEXTURECUBE}, {WINED3D_RTYPE_NONE, WINED3D_BIND_RENDER_TARGET, 0, D3D11_FORMAT_SUPPORT_RENDER_TARGET}, {WINED3D_RTYPE_NONE, WINED3D_BIND_DEPTH_STENCIL, 0, D3D11_FORMAT_SUPPORT_DEPTH_STENCIL}, + {WINED3D_RTYPE_TEXTURE_2D, WINED3D_BIND_SHADER_RESOURCE, WINED3DUSAGE_QUERY_WRAPANDMIP, D3D11_FORMAT_SUPPORT_MIP}, }; HRESULT hr;

1 0

Alexandre Julliard : makefiles: Also store the basename without object dir for generated files.
by Alexandre Julliard Sept. 11, 2020

Sept. 11, 2020

Module: wine Branch: master Commit: 9da7d620efad6b14685f2c25a706affd4e5f7b53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9da7d620efad6b14685f2c25… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 11 09:53:23 2020 +0200 makefiles: Also store the basename without object dir for generated files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 62fa516319..7a559302c0 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -76,6 +76,7 @@ struct incl_file struct file *file; char *name; char *filename; + char *basename; /* base target name for generated files */ char *sourcename; /* source file name for generated headers */ struct incl_file *included_by; /* file that included this one */ int included_line; /* line where this file was included */ @@ -975,7 +976,8 @@ static struct incl_file *add_generated_source( struct makefile *make, memset( file, 0, sizeof(*file) ); file->file = add_file( name ); file->name = xstrdup( name ); - file->filename = obj_dir_path( make, filename ? filename : name ); + file->basename = xstrdup( filename ? filename : name ); + file->filename = obj_dir_path( make, file->basename ); file->file->flags = FLAG_GENERATED; file->use_msvcrt = make->use_msvcrt; list_add_tail( &make->sources, &file->entry ); @@ -3122,7 +3124,7 @@ static void output_source_default( struct makefile *make, struct incl_file *sour if ((source->file->flags & FLAG_GENERATED) && (!make->testdll || !strendswith( source->filename, "testlist.c" ))) - strarray_add( &make->clean_files, source->filename ); + strarray_add( &make->clean_files, source->basename ); if (source->file->flags & FLAG_C_IMPLIB) strarray_add( &make->implib_objs, strmake( "%s.o", obj )); if (need_obj)

1 0

Alexandre Julliard : makefiles: Add separate variable to keep track of source dir font files.
by Alexandre Julliard Sept. 11, 2020

Sept. 11, 2020

Module: wine Branch: master Commit: f2d60c16eacb538566e4f750f3476b2ef3b3e2ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2d60c16eacb538566e4f750… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 11 10:18:02 2020 +0200 makefiles: Add separate variable to keep track of source dir font files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/makedep.c b/tools/makedep.c index e675b800a8..e819cbb949 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -217,6 +217,7 @@ struct makefile struct strarray crossobj_files; struct strarray unixobj_files; struct strarray res_files; + struct strarray font_files; struct strarray c2man_files; struct strarray debug_files; struct strarray dlldata_files; @@ -2935,7 +2936,7 @@ static void output_source_sfd( struct makefile *make, struct incl_file *source, output( "%s: %s\n", ttf_file, source->filename ); output( "\t%s -script %s %s $@\n", fontforge, top_src_dir_path( make, "fonts/genttf.ff" ), source->filename ); - if (!(source->file->flags & FLAG_SFD_FONTS)) output( "all: %s\n", ttf_file ); + if (!(source->file->flags & FLAG_SFD_FONTS)) strarray_add( &make->font_files, ttf_obj ); } if (source->file->flags & FLAG_INSTALL) { @@ -3982,6 +3983,7 @@ static void output_sources( struct makefile *make ) { output( "%s:", obj_dir_path( make, "all" )); output_filenames_obj_dir( make, make->all_targets ); + output_filenames_obj_dir( make, make->font_files ); output( "\n" ); strarray_add_uniq( &make->phony_targets, obj_dir_path( make, "all" )); }

1 0