From nobody Mon Feb 9 12:15:04 2026 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1546528525947530.6731410004555; Thu, 3 Jan 2019 07:15:25 -0800 (PST) Received: from localhost ([127.0.0.1]:55229 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gf4iP-00008O-69 for importer@patchew.org; Thu, 03 Jan 2019 10:15:21 -0500 Received: from eggs.gnu.org ([208.118.235.92]:34406) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gf22C-0005FU-Ej for qemu-devel@nongnu.org; Thu, 03 Jan 2019 07:23:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gf22B-0004Dx-9u for qemu-devel@nongnu.org; Thu, 03 Jan 2019 07:23:36 -0500 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:42098) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gf22B-0004DN-48 for qemu-devel@nongnu.org; Thu, 03 Jan 2019 07:23:35 -0500 Received: by mail-wr1-x443.google.com with SMTP id q18so33377187wrx.9 for ; Thu, 03 Jan 2019 04:23:35 -0800 (PST) Received: from bark.daynix ([141.226.163.173]) by smtp.gmail.com with ESMTPSA id t76sm72325798wme.33.2019.01.03.04.23.32 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Jan 2019 04:23:33 -0800 (PST) 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=aS0ErmbN94onBZTh0RPsoeTA+8rMOGgk1WSn4rtb1wk=; b=GgVZNal4lsjNvwtfRfxpqwGYc1VgDBHEOjIsVSJno/AnhxQJOPjQNb2WeZerAbmxFj bmI28rdxR2lV/F11Vqi6+ZUq8t1DK5Yz8SNelcQF6se8krWEvGzoYjG2qYSGCP8oSjIO zT9dCevELkq0bO5HZx3bamt3UV54fs/QjfrjkGmI3vl7LShj+UeqJNOOZrSwYr9O1yWt 12X0wBQEHhRtWIqJi3iQqwR8jlaxLXIISv1mg1PDCMUGex7CVaTX3B4TIh3P+sKHXE9y EyT6oUGzGY0gJWS/k9pYds08ub4EK8Cb3WHNJpPy33qbguBzI1Rqw+pflUmGLZUww0ny 66Ig== 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=aS0ErmbN94onBZTh0RPsoeTA+8rMOGgk1WSn4rtb1wk=; b=cADtmOT4QRdX/tOJC8p5UJKUm0KgokmBtXqVNGRpdTHL8Ri3tp5JUGVOULOoAjuD5p q8aSo+GIB5306ttwZ10k/DdbkK9V5uXOqxrlYY9lgbX+aLfc3HPMylNgEMLSZ5vE09VF ZVqN6ihKHv8QLZDiUEJKINbP/GjrZ5frBqHDcBYbsnnKs0C1317WSyZ3KNt1vmDEPBb6 UomeqHImu4SBpdi7G3fl5k3eSNC9MGKtM71hG7pZtNdwbPzqXlR6fPZghmLTEF59VsnJ HhfX6rOsSh/Gn7GrVn6AKJOwB7yG703oG1mWMC1tf4dTFFOT8Rr5rwdm/wkhrRoxHp86 O7eA== X-Gm-Message-State: AJcUukfhVrSydeRHrh6FXX1rogLLq9xXDpADzbu+ErdJYWLE2DVZpVEk JCvgJ22Ix7H5eulgm/Ngbs42/GM1394= X-Google-Smtp-Source: ALg8bN7GbeSu+nMF1bJzDponR2fuoUJDFh0JYBcKAc8+UjoKPoonxe8NB9sbKWT3U8bSoTgkZZxyqQ== X-Received: by 2002:adf:8544:: with SMTP id 62mr43466989wrh.1.1546518213991; Thu, 03 Jan 2019 04:23:33 -0800 (PST) From: Basil Salman To: qemu-devel@nongnu.org, Michael Roth Date: Thu, 3 Jan 2019 14:23:23 +0200 Message-Id: <20190103122323.1273034-5-basil@daynix.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190103122323.1273034-1-basil@daynix.com> References: <20190103122323.1273034-1-basil@daynix.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 X-Mailman-Approved-At: Thu, 03 Jan 2019 10:10:24 -0500 Subject: [Qemu-devel] [PATCH 4/4] qga-win: Handle VSS_E_PROVIDER_ALREADY_REGISTERED error 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: Yan Vugenfirer , Bishara AbuHattoum Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Sameeh Jubran This patch handles the case where VSS Provider is already registered, where in such case qga uninstalls the provider and registers it again. Signed-off-by: Sameeh Jubran Signed-off-by: Basil Salman --- qga/vss-win32/install.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/qga/vss-win32/install.cpp b/qga/vss-win32/install.cpp index 6713e58670..28deeb9f0e 100644 --- a/qga/vss-win32/install.cpp +++ b/qga/vss-win32/install.cpp @@ -443,6 +443,16 @@ STDAPI DllRegisterServer(void) VSS_PROV_SOFTWARE, const_cast(QGA_PROVIDER_VERSI= ON), g_gProviderVersion); + if (hr =3D=3D (long int) VSS_E_PROVIDER_ALREADY_REGISTERED) + { + DllUnregisterServer(); + hr =3D pVssAdmin->RegisterProvider(g_gProviderId, CLSID_QGAVSSProv= ider, + const_cast(QGA_PROVIDER_L= NAME), + VSS_PROV_SOFTWARE, + const_cast(QGA_PROVIDER_V= ERSION), + g_gProviderVersion); + } + if (FAILED(hr)) { errmsg_dialog(hr, "RegisterProvider failed"); } --=20 2.17.2