From nobody Mon May 6 00:16:35 2024 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.zoho.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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1493299359253473.301800934463; Thu, 27 Apr 2017 06:22:39 -0700 (PDT) Received: from localhost ([::1]:60698 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d3jNV-0004iR-6v for importer@patchew.org; Thu, 27 Apr 2017 09:22:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45897) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d3jMC-0004Ai-81 for qemu-devel@nongnu.org; Thu, 27 Apr 2017 09:21:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d3jMA-0001bN-5R for qemu-devel@nongnu.org; Thu, 27 Apr 2017 09:21:16 -0400 Received: from mail-wr0-x244.google.com ([2a00:1450:400c:c0c::244]:35355) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d3jM9-0001b9-UZ for qemu-devel@nongnu.org; Thu, 27 Apr 2017 09:21:14 -0400 Received: by mail-wr0-x244.google.com with SMTP id g12so3768684wrg.2 for ; Thu, 27 Apr 2017 06:21:13 -0700 (PDT) Received: from snarl.daynix ([141.226.163.173]) by smtp.gmail.com with ESMTPSA id v27sm1897089wra.19.2017.04.27.06.21.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 27 Apr 2017 06:21:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=M0s+e42gBnxk+Y8TryHlDsWP4Ub3xrC6jjTUUyIgXio=; b=a7cnCEWdCjSfaatYt7I+ybdAU5tGAccZD1T8ij5Vx5ZfmioRnx4WEpyu/Qftl3YkvR MfIt1xXN4Izjuiw1loIODSlFi7Xczu0vENsdg1zZrFOYdWhEoCeJwrP2fKrw8QBhetkk SqezL2JugIpEXZKfocvZBuO0eFypKrHk4d2+ujPWA2LlmWzogW8eroKtY17hlJk47Y9d tazx9uzqh2b7HWXFt398TvBGN1e5pn6CDv6GPZJf2Z7kV3A5SlQn0d4/MaD0oq5zyDTh W1YQ+IO1D35YyDP5giW60irdQgr27aTT/DigYfQk/d5cBeZHtZSwBJd9ILyqccCdH4oi Cnsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=M0s+e42gBnxk+Y8TryHlDsWP4Ub3xrC6jjTUUyIgXio=; b=lid0o/HJTiAd7oY4Q2OVyE0ouZVbJS/MArb+aJ9wAudvP/NdQWAAc2u6RKOT/Yd34X MmDLXFq6SShkmqTKvrzgucjFIgbBwJZlNhwHcW97L8J4+yDAJmh0zX9Wil6SxfmxmCto hmo0+uqH4NPSsqB2ixrmiqfn3ihw73jZDMf9zAAU/IkLrZx+AQQFcYF+TXtWlIIqFjp3 87BxDjWbM12Ph4YkndEpB5Jm/+C25phRT8zMbUUAgn09FOBMIkvy95fgDrqqEZsiFLUP e4DPR7P0OVqT5mMCKpVXeKyDm3tvxRw01wrCrLwpcr3j6FYO35WuNtBSrv23nOzg58G+ O5qA== X-Gm-Message-State: AN3rC/4TlQOS8WjXBxClZ7u1nr7f9bFOnpmi0vYt4LYKNDce+u2Z1jVV f7bUyfoWOEOtvnLo X-Received: by 10.223.136.131 with SMTP id f3mr3007060wrf.70.1493299272661; Thu, 27 Apr 2017 06:21:12 -0700 (PDT) From: Daniel Rempel To: qemu-devel@nongnu.org Date: Thu, 27 Apr 2017 16:21:04 +0300 Message-Id: <1493299264-10669-2-git-send-email-daniel@daynix.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1493299264-10669-1-git-send-email-daniel@daynix.com> References: <1493299264-10669-1-git-send-email-daniel@daynix.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::244 Subject: [Qemu-devel] [PATCH v2 1/1] qga-win: fix installation on localized windows 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: Dmitry Fleytman , Yan Vugenfirer , 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 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Bug: https://bugzilla.redhat.com/show_bug.cgi?id=3D1357789 Replace hardcoded user and group names ("Administrators", "SYSTEM") with th= e ones acquired from system. Windows uses localized strings for these names= and it may cause the installation to fail. Windows has Well-known SIDs for "Administrators" group and "SYSTEM" user so= they were used to identify required users and groups. Well-known SIDs: https://support.microsoft.com/en-us/help/243330/well-known= -security-identifiers-in-windows-operating-systems Signed-off-by: Daniel Rempel Acked-by: Sameeh Jubran Reviewed-by: Sameeh Jubran --- qga/vss-win32/install.cpp | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/qga/vss-win32/install.cpp b/qga/vss-win32/install.cpp index f4160a3..1be482a 100644 --- a/qga/vss-win32/install.cpp +++ b/qga/vss-win32/install.cpp @@ -18,6 +18,9 @@ #include #include #include +#include + +#define BUFFER_SIZE 1024 =20 extern HINSTANCE g_hinstDll; =20 @@ -135,6 +138,27 @@ out: return hr; } =20 +/* Acquire group or user name by SID */ +static HRESULT getNameByStringSID( + const wchar_t *sid, LPWSTR buffer, LPDWORD bufferLen) +{ + HRESULT hr =3D S_OK; + PSID psid =3D NULL; + SID_NAME_USE groupType; + DWORD domainNameLen =3D BUFFER_SIZE; + wchar_t domainName[BUFFER_SIZE]; + + chk(ConvertStringSidToSidW(sid, &psid)); + LookupAccountSidW(NULL, psid, buffer, bufferLen, + domainName, &domainNameLen, &groupType); + hr =3D HRESULT_FROM_WIN32(GetLastError()); + + LocalFree(psid); + +out: + return hr; +} + /* Find and iterate QGA VSS provider in COM+ Application Catalog */ static HRESULT QGAProviderFind( HRESULT (*found)(ICatalogCollection *, int, void *), void *arg) @@ -216,6 +240,10 @@ STDAPI COMRegister(void) CHAR dllPath[MAX_PATH], tlbPath[MAX_PATH]; bool unregisterOnFailure =3D false; int count =3D 0; + DWORD bufferLen =3D BUFFER_SIZE; + wchar_t buffer[BUFFER_SIZE]; + const wchar_t *administratorsGroupSID =3D L"S-1-5-32-544"; + const wchar_t *systemUserSID =3D L"S-1-5-18"; =20 if (!g_hinstDll) { errmsg(E_FAIL, "Failed to initialize DLL"); @@ -284,11 +312,12 @@ STDAPI COMRegister(void) =20 /* Setup roles of the applicaion */ =20 + chk(getNameByStringSID(administratorsGroupSID, buffer, &bufferLen)); chk(pApps->GetCollection(_bstr_t(L"Roles"), key, (IDispatch **)pRoles.replace())); chk(pRoles->Populate()); chk(pRoles->Add((IDispatch **)pObj.replace())); - chk(put_Value(pObj, L"Name", L"Administrators")); + chk(put_Value(pObj, L"Name", buffer)); chk(put_Value(pObj, L"Description", L"Administrators group")); chk(pRoles->SaveChanges(&n)); chk(pObj->get_Key(&key)); @@ -303,8 +332,10 @@ STDAPI COMRegister(void) chk(GetAdminName(&name)); chk(put_Value(pObj, L"User", _bstr_t(".\\") + name)); =20 + bufferLen =3D BUFFER_SIZE; + chk(getNameByStringSID(systemUserSID, buffer, &bufferLen)); chk(pUsersInRole->Add((IDispatch **)pObj.replace())); - chk(put_Value(pObj, L"User", L"SYSTEM")); + chk(put_Value(pObj, L"User", buffer)); chk(pUsersInRole->SaveChanges(&n)); =20 out: --=20 2.9.3