From nobody Mon Feb 9 22:03:54 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1547374191353449.51106716242543; Sun, 13 Jan 2019 02:09:51 -0800 (PST) Received: from localhost ([127.0.0.1]:33128 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gici9-000883-J5 for importer@patchew.org; Sun, 13 Jan 2019 05:09:45 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33794) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1giceL-0005mJ-Nt for qemu-devel@nongnu.org; Sun, 13 Jan 2019 05:05:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1giceK-0003W9-Vf for qemu-devel@nongnu.org; Sun, 13 Jan 2019 05:05:49 -0500 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:33743) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1giceK-0003VJ-P5 for qemu-devel@nongnu.org; Sun, 13 Jan 2019 05:05:48 -0500 Received: by mail-wm1-x342.google.com with SMTP id r24so5106531wmh.0 for ; Sun, 13 Jan 2019 02:05:48 -0800 (PST) Received: from bark.daynix ([141.226.163.173]) by smtp.gmail.com with ESMTPSA id j8sm62540340wmd.0.2019.01.13.02.05.46 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 13 Jan 2019 02:05:46 -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=arRHgga2quA2/zACUqHImErod+MeexWEf7WnETjMy7A=; b=niImpI/dHe0rxpskyfWIg3LSWIkM+oQCKCLvsNyXXnT5HnhbQ82bUD04uIiKyBw0vq hRWxKnJpcfC8pQsmVb4caH/u4gfUqnNHYIe/F4qdk/S25QmE3l8ZsWurkn0Ov43cWEMj gGQwrIxhrYYq3Zp6AHkbWf/D9IAxd0OtQPkRNrX4qf6q5Iq/cJg4l5zGWk5kBqnH1PhN 4GiT/1gNthIqJg0ity8XRoDg9RENgd/SSa+Z1ZKc2LlqBcvZOnLrP6MZMBavheeHMX77 pfTE8qxo5pUkeVJzsCbzNb9BrFm6ts9lnagc8UYGPa094M5gtdD5O5QRE1OIIln0+jkO 2Xyw== 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=arRHgga2quA2/zACUqHImErod+MeexWEf7WnETjMy7A=; b=hkmaafeRUJN7KtidzWbxfglSORbaFETNKkpN6VYY3oSd+p6oJCabEnPqqwhecMGvx6 pZRHVEtbGThldWBVOgKvagWEb6vIi/EmMzgvhKWfR5hXAY/Cpf//ZhTqH5pOtGHxIk+8 GrA0FhahEInzUSoGu7zYMvrP8d6DfSoWM6HNGM0qFSs2OErlLieJ7jGdejLLVjMo5lSS JCD4t6HQdZuG88yDpnaWAHk/jQ1Nd73QVI0YaVKBhYPiytpq18bUuppZEndFpvXXgRk8 RHA6nTB0P9MFujPIr6fOQs7SfIVCM/F5ZQiorv09t+HMp84X11ZJChszAeuCWRl6O0Qc t11A== X-Gm-Message-State: AJcUukcZRsEDVCFtvwVSRSjYHB3NxmT5jimI85koI+Xdz1gkzH3HeWbb aRrSijRKSZhJzvyMDCgIf4uqRJ6+tZc= X-Google-Smtp-Source: ALg8bN7/X3QrZMs5N+RvHyE753OhGDA6TQGj9Q8QVUwWQqQSspAviLUXU7k8wrTYETBPfr6uL/Z64g== X-Received: by 2002:a1c:8484:: with SMTP id g126mr8404858wmd.117.1547373947408; Sun, 13 Jan 2019 02:05:47 -0800 (PST) From: Basil Salman To: qemu-devel@nongnu.org, Michael Roth Date: Sun, 13 Jan 2019 12:05:31 +0200 Message-Id: <20190113100531.1346024-5-basil@daynix.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190113100531.1346024-1-basil@daynix.com> References: <20190113100531.1346024-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::342 Subject: [Qemu-devel] [PATCH v2 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 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/qga/vss-win32/install.cpp b/qga/vss-win32/install.cpp index 6713e58670..a456841360 100644 --- a/qga/vss-win32/install.cpp +++ b/qga/vss-win32/install.cpp @@ -443,6 +443,17 @@ 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_LNAME), + VSS_PROV_SOFTWARE, + const_cast + (QGA_PROVIDER_VERSION), + g_gProviderVersion); + } + if (FAILED(hr)) { errmsg_dialog(hr, "RegisterProvider failed"); } --=20 2.17.2