From 936015d49c389a6cafc40025f7881625ded90120 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Tue, 23 Dec 2025 16:17:29 +0900 Subject: w32: Fix spawn for 64-bit machine. * src/priv-io.h (struct spawn_fd_item_s): Use HANDLE for peer_name field. * src/dirinfo.c (read_gpgconf_dirs): Use ASSUAN_INVALID_FD for default value for peer_name field of CFD. * src/engine-gpgconf.c (gpgconf_read, gpgconf_write) (gpgconf_query_swdb): Likewise. * src/version.c (_gpgme_get_program_version): Likewise. * src/w32-io.c (handle_to_fd): Remove. (_gpgme_io_spawn): Assign HD to the peer_name field. Use %p for printing the value of peer_name field. * src/gpgme-w32spawn.c (my_spawn): Use peer_name field with no cast. Use %p for printing the value of peer_name field. Remove wrong CloseHandle calls. (translate_get_from_file): Use HANDLE type for the TO variable. Use strtoull on 64-bit machine. Use ASSUAN_INVALID_FD. -- Signed-off-by: NIIBE Yutaka --- src/priv-io.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/priv-io.h') diff --git a/src/priv-io.h b/src/priv-io.h index dbfb3a47..21734b8e 100644 --- a/src/priv-io.h +++ b/src/priv-io.h @@ -47,7 +47,11 @@ struct spawn_fd_item_s { int fd; int dup_to; +#ifdef HAVE_W32_SYSTEM + HANDLE peer_name; +#else int peer_name; +#endif int arg_loc; }; -- cgit