From nobody Wed Nov 5 05:26:58 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1533171157464141.53981147928982; Wed, 1 Aug 2018 17:52:37 -0700 (PDT) Received: from localhost ([::1]:43408 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fl1qr-0004mf-9q for importer@patchew.org; Wed, 01 Aug 2018 20:52:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42611) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fl0Gv-00028H-1c for qemu-devel@nongnu.org; Wed, 01 Aug 2018 19:11:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fl0Gt-0001Bm-VW for qemu-devel@nongnu.org; Wed, 01 Aug 2018 19:11:13 -0400 Received: from mail-yb0-x243.google.com ([2607:f8b0:4002:c09::243]:45036) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fl0Gt-0001A2-O9 for qemu-devel@nongnu.org; Wed, 01 Aug 2018 19:11:11 -0400 Received: by mail-yb0-x243.google.com with SMTP id l16-v6so108520ybk.11 for ; Wed, 01 Aug 2018 16:11:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cc-sw-com.20150623.gappssmtp.com; s=20150623; h=mime-version:from:date:message-id:subject:to:cc; bh=5iqbFabDek98svjRdjqA04PvbN77msKhT6Q7EgPdqUM=; b=bZOtNvTbuviyrdO1fmD0c6kWPb/WKI+uOCgfLrHJlMpcReE3PFnAOEj15nWztIPLpq LDOTsP5ZQgSKZKO4ynegVlft8qPk385FPuootoQ3klqAazBVXfTVxU+EJlyc8d+Gw94c 24ihfxFjmwol9kCe5Or1EH6C99ItuzlzvmIRWLC2WlgGUMJADnS/kb2g0RB7Ihs6KWjH SbJx/10sLVIM1THQgxux1kM6+uikUWp061vPQ+nWrDqTmxgrhscjW5/VV4pZYxNFGWZn 4okT3Gbj/pf64IN1OZldmzPR9zf034dBlIam/ApNTQeEec7gKvCs6/lpU6wMIc7j63bZ NSpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to:cc; bh=5iqbFabDek98svjRdjqA04PvbN77msKhT6Q7EgPdqUM=; b=ZOxi+GLjWucxjK+rTlFq2Yc11/Vg/ocBxFDHmZvbzicm/D64XxdTIFrqnR2YmwiAvE wuxIBYX1ND69ml131JJxlVGl+JWQUigvB2Rm0/BYmVXxff/y+nZVehhX3C7pl+M+/prX 58dxfx1hXBU1r0K5mrJg3dse9Y0qmJZ3lSNcD6EWjeRZZxHCntwKmzUqDywf7qRH5VxL hG+ifG6q4vGSFQXextmO8dSXw05OWp3bgDslaGbDiIESP/BQZcyvKzu+CvPpiJHmivzM 3RfNRzEihAWtNkwAbrRPfPH4heX/g8xYEmAH3r3HBfI/BYzWO+0S7HhYoo0/UdiJRrYj 9RHA== X-Gm-Message-State: AOUpUlFY7Z+Z8N8MMLe/9jd5HZMAK9CsZYf/aGDcMvR+q/6A0Vwbj0Jt nDTNFGdVPTOEg0lOBCOuGN3hj0gsljr3E5UXpvfwaRs3a10= X-Google-Smtp-Source: AAOMgpe7RWkBprdk1blt2pvi4hhkYBwCGbH4eKWUgBtZACw210bXwUBQ3EUkcu24hmBpKQLByoEhSDMXgm/ZZu/1ZkA= X-Received: by 2002:a25:1388:: with SMTP id 130-v6mr196117ybt.346.1533165070556; Wed, 01 Aug 2018 16:11:10 -0700 (PDT) MIME-Version: 1.0 From: Jonathon Reinhart Date: Wed, 1 Aug 2018 19:10:59 -0400 Message-ID: To: qemu-devel@nongnu.org X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4002:c09::243 X-Mailman-Approved-At: Wed, 01 Aug 2018 20:51:30 -0400 Subject: [Qemu-devel] [PATCH] qga: Support Unicode paths in guest-file-open on win32 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Roth Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Currently, the win32 port of QEMU Guest Agent does not properly handle Unic= ode paths. The JSON decoder produces a valid UTF-8 path string, but this is pas= sed directly to CreateFileA, which is expecting an ANSI string and not UTF-8. T= his leads to mangled filenames. This patch follows the example of qmp_guest_set_user_password() and uses g_utf8_to_utf16() to convert the string to UTF-16 and calls CreateFileW() explicitly. Signed-off-by: Jonathon Reinhart --- qga/commands-win32.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/qga/commands-win32.c b/qga/commands-win32.c index 98d9735389..416343b97b 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -160,13 +160,15 @@ static void handle_set_nonblocking(HANDLE fh) int64_t qmp_guest_file_open(const char *path, bool has_mode, const char *mode, Error **errp) { - int64_t fd; + int64_t fd =3D -1; HANDLE fh; HANDLE templ_file =3D NULL; DWORD share_mode =3D FILE_SHARE_READ; DWORD flags_and_attr =3D FILE_ATTRIBUTE_NORMAL; LPSECURITY_ATTRIBUTES sa_attr =3D NULL; OpenFlags *guest_flags; + GError *gerr =3D NULL; + wchar_t *w_path =3D NULL; if (!has_mode) { mode =3D "r"; @@ -175,16 +177,21 @@ int64_t qmp_guest_file_open(const char *path, bool has_mode, guest_flags =3D find_open_flag(mode); if (guest_flags =3D=3D NULL) { error_setg(errp, "invalid file open mode"); - return -1; + goto done; + } + + w_path =3D g_utf8_to_utf16(path, -1, NULL, NULL, &gerr); + if (!w_path) { + goto done; } - fh =3D CreateFile(path, guest_flags->desired_access, share_mode, sa_at= tr, + fh =3D CreateFileW(w_path, guest_flags->desired_access, share_mode, sa= _attr, guest_flags->creation_disposition, flags_and_attr, templ_file); if (fh =3D=3D INVALID_HANDLE_VALUE) { error_setg_win32(errp, GetLastError(), "failed to open file '%s'", path); - return -1; + goto done; } /* set fd non-blocking to avoid common use cases (like reading from a @@ -196,10 +203,17 @@ int64_t qmp_guest_file_open(const char *path, bool has_mode, if (fd < 0) { CloseHandle(fh); error_setg(errp, "failed to add handle to qmp handle table"); - return -1; + goto done; } slog("guest-file-open, handle: % " PRId64, fd); + +done: + if (gerr) { + error_setg(errp, QERR_QGA_COMMAND_FAILED, gerr->message); + g_error_free(gerr); + } + g_free(w_path); return fd; } --=20 2.11.0