|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [win-pv-devel] [PATCH 1/2] Remove settings code
Unfortunately, after extensive testing of different scenarios, it seems to
be impossible to properly steal and restore network stack bindings from
within the XENVIF driver. Windows has already sampled some of the values
we need to modify and thus we cannot successfully modify them.
It appears the only way we can successfully use settings from an emulated
device is to do what the settings code was attempting to do, but do it
in XENNET's co-installer during the pre-install and pre-removal phases.
Signed-off-by: Paul Durrant <paul.durrant@xxxxxxxxxx>
---
src/xenvif/pdo.c | 49 ---
src/xenvif/settings.c | 821 -------------------------------------------
src/xenvif/settings.h | 54 ---
vs2012/xenvif/xenvif.vcxproj | 1 -
vs2013/xenvif/xenvif.vcxproj | 1 -
5 files changed, 926 deletions(-)
delete mode 100644 src/xenvif/settings.c
delete mode 100644 src/xenvif/settings.h
diff --git a/src/xenvif/pdo.c b/src/xenvif/pdo.c
index 5fefaeb..3fbf980 100644
--- a/src/xenvif/pdo.c
+++ b/src/xenvif/pdo.c
@@ -53,7 +53,6 @@
#include "registry.h"
#include "thread.h"
#include "link.h"
-#include "settings.h"
#include "dbg_print.h"
#include "assert.h"
#include "util.h"
@@ -98,9 +97,7 @@ struct _XENVIF_PDO {
PXENVIF_VIF_CONTEXT VifContext;
XENVIF_VIF_INTERFACE VifInterface;
- ULONG Number;
BOOLEAN HasAlias;
- BOOLEAN HasStolenLinkage;
};
static FORCEINLINE PVOID
@@ -300,23 +297,6 @@ PdoGetName(
return __PdoGetName(Pdo);
}
-static FORCEINLINE VOID
-__PdoSetNumber(
- IN PXENVIF_PDO Pdo,
- IN ULONG Number
- )
-{
- Pdo->Number = Number;
-}
-
-static FORCEINLINE ULONG
-__PdoGetNumber(
- IN PXENVIF_PDO Pdo
- )
-{
- return Pdo->Number;
-}
-
static FORCEINLINE BOOLEAN
__PdoSetEjectRequested(
IN PXENVIF_PDO Pdo
@@ -1287,11 +1267,6 @@ PdoStartDevice(
if (Row->OperStatus != IfOperStatusUp)
continue;
- (VOID) SettingsSetAlias(Row->Alias,
- Row->Description,
- &Row->InterfaceGuid,
- __PdoGetNumber(Pdo));
-
Pdo->HasAlias = TRUE;
}
@@ -1302,10 +1277,6 @@ PdoStartDevice(
goto fail9;
}
- status = SettingsStealAliasLinkage(__PdoGetSoftwareKey(Pdo),
- __PdoGetNumber(Pdo));
- Pdo->HasStolenLinkage = (NT_SUCCESS(status)) ? TRUE : FALSE;
-
StackLocation = IoGetCurrentIrpStackLocation(Irp);
status = PdoD3ToD0(Pdo);
@@ -1326,11 +1297,6 @@ PdoStartDevice(
fail10:
Error("fail10\n");
- if (Pdo->HasStolenLinkage) {
- (VOID) SettingsRestoreLinkage(__PdoGetSoftwareKey(Pdo));
- Pdo->HasStolenLinkage = FALSE;
- }
-
__FreeMibTable(Table);
goto fail6;
@@ -1428,11 +1394,6 @@ PdoStopDevice(
PdoD0ToD3(Pdo);
- if (Pdo->HasStolenLinkage) {
- (VOID) SettingsRestoreLinkage(__PdoGetSoftwareKey(Pdo));
- Pdo->HasStolenLinkage = FALSE;
- }
-
done:
RtlZeroMemory(&Pdo->CurrentAddress, sizeof (ETHERNET_ADDRESS));
@@ -1524,11 +1485,6 @@ PdoRemoveDevice(
PdoD0ToD3(Pdo);
- if (Pdo->HasStolenLinkage) {
- (VOID) SettingsRestoreLinkage(__PdoGetSoftwareKey(Pdo));
- Pdo->HasStolenLinkage = FALSE;
- }
-
done:
RtlZeroMemory(&Pdo->CurrentAddress, sizeof (ETHERNET_ADDRESS));
@@ -2694,7 +2650,6 @@ PdoCreate(
goto fail4;
__PdoSetName(Pdo, Number);
- __PdoSetNumber(Pdo, Number);
status = __PdoSetPermanentAddress(Pdo, Address);
if (!NT_SUCCESS(status))
@@ -2798,8 +2753,6 @@ fail4:
fail3:
Error("fail3\n");
- Pdo->Number = 0;
-
Pdo->Fdo = NULL;
Pdo->Dx = NULL;
@@ -2874,8 +2827,6 @@ PdoDestroy(
ThreadJoin(Pdo->SystemPowerThread);
Pdo->SystemPowerThread = NULL;
- Pdo->Number = 0;
-
Pdo->Fdo = NULL;
Pdo->Dx = NULL;
diff --git a/src/xenvif/settings.c b/src/xenvif/settings.c
deleted file mode 100644
index 0647d8d..0000000
--- a/src/xenvif/settings.c
+++ /dev/null
@@ -1,821 +0,0 @@
-/* Copyright (c) Citrix Systems Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms,
- * with or without modification, are permitted provided
- * that the following conditions are met:
- *
- * * Redistributions of source code must retain the above
- * copyright notice, this list of conditions and the
- * following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the
- * following disclaimer in the documentation and/or other
- * materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
- * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#define INITGUID 1
-
-#include <ntddk.h>
-#include <ntstrsafe.h>
-#include <devguid.h>
-
-#include "registry.h"
-#include "driver.h"
-#include "dbg_print.h"
-#include "assert.h"
-#include "util.h"
-
-#define SETTINGS_TAG 'TTES'
-
-static FORCEINLINE PVOID
-__SettingsAllocate(
- IN ULONG Length
- )
-{
- return __AllocatePoolWithTag(NonPagedPool, Length, SETTINGS_TAG);
-}
-
-static FORCEINLINE VOID
-__SettingsFree(
- IN PVOID Buffer
- )
-{
- __FreePoolWithTag(Buffer, SETTINGS_TAG);
-}
-
-static NTSTATUS
-SettingsCopyValue(
- IN HANDLE DestinationKey,
- IN HANDLE SourceKey,
- IN PCHAR ValueName,
- IN ULONG Type
- )
-{
- NTSTATUS status;
-
- Trace("%s\n", ValueName);
-
- switch (Type) {
- case REG_DWORD: {
- ULONG Value;
-
- status = RegistryQueryDwordValue(SourceKey,
- ValueName,
- &Value);
- if (!NT_SUCCESS(status))
- goto fail1;
-
- (VOID) RegistryUpdateDwordValue(DestinationKey,
- ValueName,
- Value);
-
- break;
- }
- case REG_SZ:
- case REG_MULTI_SZ: {
- PANSI_STRING Value;
-
- status = RegistryQuerySzValue(SourceKey,
- ValueName,
- NULL,
- &Value);
- if (!NT_SUCCESS(status))
- goto fail1;
-
- (VOID) RegistryUpdateSzValue(DestinationKey,
- ValueName,
- Type,
- Value);
-
- RegistryFreeSzValue(Value);
-
- break;
- }
- case REG_BINARY: {
- PVOID Value;
- ULONG Length;
-
- status = RegistryQueryBinaryValue(SourceKey,
- ValueName,
- &Value,
- &Length);
- if (!NT_SUCCESS(status))
- goto fail1;
-
- (VOID) RegistryUpdateBinaryValue(DestinationKey,
- ValueName,
- Value,
- Length);
- if (Length != 0)
- RegistryFreeBinaryValue(Value);
-
- break;
- }
- default:
- ASSERT(FALSE);
- }
-
- return STATUS_SUCCESS;
-
-fail1:
- Error("fail1 (%08x)\n", status);
-
- return status;
-}
-
-typedef struct _SETTINGS_COPY_SUBKEY_VALUE_PARAMETERS {
- HANDLE DestinationKey;
-} SETTINGS_COPY_SUBKEY_VALUE_PARAMETERS,
*PSETTINGS_COPY_SUBKEY_VALUE_PARAMETERS;
-
-static NTSTATUS
-SettingsCopySubKeyValue(
- IN PVOID Context,
- IN HANDLE Key,
- IN PANSI_STRING ValueName,
- IN ULONG Type
- )
-{
- PSETTINGS_COPY_SUBKEY_VALUE_PARAMETERS Parameters = Context;
-
- return SettingsCopyValue(Parameters->DestinationKey,
- Key,
- ValueName->Buffer,
- Type);
-}
-
-static NTSTATUS
-SettingsCopySubKey(
- IN HANDLE DestinationKey,
- IN HANDLE SourceKey,
- IN PCHAR SubKeyName
- )
-{
- SETTINGS_COPY_SUBKEY_VALUE_PARAMETERS Parameters;
- HANDLE DestinationSubKey;
- HANDLE SourceSubKey;
- NTSTATUS status;
-
- status = RegistryCreateSubKey(DestinationKey,
- SubKeyName,
- REG_OPTION_NON_VOLATILE,
- &DestinationSubKey);
- if (!NT_SUCCESS(status))
- goto fail1;
-
- status = RegistryOpenSubKey(SourceKey,
- SubKeyName,
- KEY_READ,
- &SourceSubKey);
- if (!NT_SUCCESS(status))
- goto fail2;
-
- RtlZeroMemory(&Parameters, sizeof (Parameters));
-
- Parameters.DestinationKey = DestinationSubKey;
-
- status = RegistryEnumerateValues(SourceSubKey,
- SettingsCopySubKeyValue,
- &Parameters);
- if (!NT_SUCCESS(status))
- goto fail3;
-
- RegistryCloseKey(SourceSubKey);
-
- RegistryCloseKey(DestinationSubKey);
-
- return STATUS_SUCCESS;
-
-fail3:
- Error("fail3\n");
-
- RegistryCloseKey(SourceSubKey);
-
-fail2:
- Error("fail2\n");
-
- RegistryCloseKey(DestinationSubKey);
-
-fail1:
- Error("fail1 (%08x)\n", status);
-
- return status;
-}
-
-#define CLASS_PATH
"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Control\\Class"
-
-static NTSTATUS
-SettingsOpenNetKey(
- IN ACCESS_MASK DesiredAccess,
- OUT PHANDLE NetKey
- )
-{
- HANDLE ClassKey;
- UNICODE_STRING Unicode;
- ANSI_STRING Ansi;
- NTSTATUS status;
-
- status = RegistryOpenSubKey(NULL,
- CLASS_PATH,
- KEY_ALL_ACCESS,
- &ClassKey);
- if (!NT_SUCCESS(status))
- goto fail1;
-
- status = RtlStringFromGUID(&GUID_DEVCLASS_NET, &Unicode);
- if (!NT_SUCCESS(status))
- goto fail2;
-
- status = RtlUnicodeStringToAnsiString(&Ansi, &Unicode, TRUE);
- if (!NT_SUCCESS(status))
- goto fail3;
-
- status = RegistryOpenSubKey(ClassKey,
- Ansi.Buffer,
- DesiredAccess,
- NetKey);
- if (!NT_SUCCESS(status))
- goto fail4;
-
- RtlFreeAnsiString(&Ansi);
-
- RtlFreeUnicodeString(&Unicode);
-
- RegistryCloseKey(ClassKey);
-
- return STATUS_SUCCESS;
-
-fail4:
- Error("fail4\n");
-
- RtlFreeAnsiString(&Ansi);
-
-fail3:
- Error("fail3\n");
-
- RtlFreeUnicodeString(&Unicode);
-
-fail2:
- Error("fail2\n");
-
- RegistryCloseKey(ClassKey);
-
-fail1:
- Error("fail1 (%08x)\n", status);
-
- return status;
-}
-
-typedef struct _SETTINGS_MATCH_NET_CFG_INSTANCE_ID_PARAMETERS {
- ANSI_STRING NetCfgInstanceID;
- ANSI_STRING SubKeyName;
-} SETTINGS_MATCH_NET_CFG_INSTANCE_ID_PARAMETERS,
*PSETTINGS_MATCH_NET_CFG_INSTANCE_ID_PARAMETERS;
-
-static NTSTATUS
-SettingsMatchNetCfgInstanceID(
- IN PVOID Context,
- IN HANDLE Key,
- IN PANSI_STRING SubKeyName
- )
-{
- PSETTINGS_MATCH_NET_CFG_INSTANCE_ID_PARAMETERS Parameters = Context;
- HANDLE SubKey;
- ANSI_STRING Ansi;
- ULONG Type;
- PANSI_STRING Value;
- NTSTATUS status;
-
- Trace("====> (%Z)\n", SubKeyName);
-
- if (Parameters->SubKeyName.Length != 0)
- goto done;
-
- RtlInitAnsiString(&Ansi, "Properties");
-
- if (RtlCompareString(&Ansi, SubKeyName, TRUE) == 0)
- goto done;
-
- status = RegistryOpenSubKey(Key,
- SubKeyName->Buffer,
- KEY_READ,
- &SubKey);
- if (!NT_SUCCESS(status))
- goto fail1;
-
- status = RegistryQuerySzValue(SubKey,
- "NetCfgInstanceID",
- &Type,
- &Value);
- if (!NT_SUCCESS(status))
- goto fail2;
-
- status = STATUS_INVALID_PARAMETER;
- if (Type != REG_SZ)
- goto fail3;
-
- if (RtlCompareString(&Parameters->NetCfgInstanceID,
- &Value[0],
- TRUE) == 0) {
- Parameters->SubKeyName.MaximumLength = SubKeyName->MaximumLength;
- Parameters->SubKeyName.Buffer =
__SettingsAllocate(Parameters->SubKeyName.MaximumLength);
-
- status = STATUS_NO_MEMORY;
- if (Parameters->SubKeyName.Buffer == NULL)
- goto fail4;
-
- RtlCopyMemory(Parameters->SubKeyName.Buffer,
- SubKeyName->Buffer,
- SubKeyName->Length);
-
- Parameters->SubKeyName.Length = SubKeyName->Length;
- }
-
- RegistryFreeSzValue(Value);
-
- RegistryCloseKey(SubKey);
-
-done:
- Trace("<====\n");
-
- return STATUS_SUCCESS;
-
-fail4:
- Error("fail4\n");
-
-fail3:
- Error("fail3\n");
-
- RegistryFreeSzValue(Value);
-
-fail2:
- Error("fail2\n");
-
- RegistryCloseKey(SubKey);
-
-fail1:
- Error("fail1 (%08x)\n", status);
-
- return status;
-}
-
-static NTSTATUS
-SettingsGetNetInstance(
- IN LPGUID NetCfgInstanceID,
- OUT PANSI_STRING SubKeyName
- )
-{
- HANDLE NetKey;
- UNICODE_STRING Unicode;
- ANSI_STRING Ansi;
- SETTINGS_MATCH_NET_CFG_INSTANCE_ID_PARAMETERS Parameters;
- NTSTATUS status;
-
- status = SettingsOpenNetKey(KEY_READ, &NetKey);
- if (!NT_SUCCESS(status))
- goto fail1;
-
- status = RtlStringFromGUID(NetCfgInstanceID, &Unicode);
- if (!NT_SUCCESS(status))
- goto fail2;
-
- status = RtlUnicodeStringToAnsiString(&Ansi, &Unicode, TRUE);
- if (!NT_SUCCESS(status))
- goto fail3;
-
- RtlZeroMemory(&Parameters, sizeof (Parameters));
-
- Parameters.NetCfgInstanceID = Ansi;
-
- status = RegistryEnumerateSubKeys(NetKey,
- SettingsMatchNetCfgInstanceID,
- &Parameters);
- if (!NT_SUCCESS(status))
- goto fail4;
-
- status = STATUS_UNSUCCESSFUL;
- if (Parameters.SubKeyName.Length == 0)
- goto fail5;
-
- Trace("%Z\n", &Parameters.SubKeyName);
-
- *SubKeyName = Parameters.SubKeyName;
-
- RtlFreeAnsiString(&Ansi);
-
- RtlFreeUnicodeString(&Unicode);
-
- RegistryCloseKey(NetKey);
-
- return STATUS_SUCCESS;
-
-fail5:
- Error("fail5\n");
-
-fail4:
- Error("fail4\n");
-
- RtlFreeAnsiString(&Ansi);
-
-fail3:
- Error("fail3\n");
-
- RtlFreeUnicodeString(&Unicode);
-
-fail2:
- Error("fail2\n");
-
- RegistryCloseKey(NetKey);
-
-fail1:
- Error("fail1 (%08x)\n", status);
-
- return status;
-}
-
-typedef struct _SETTINGS_MATCH_NUMBER_PARAMETERS {
- ULONG Number;
- ANSI_STRING SubKeyName;
-} SETTINGS_MATCH_NUMBER_PARAMETERS, *PSETTINGS_MATCH_NUMBER_PARAMETERS;
-
-static NTSTATUS
-SettingsMatchNumber(
- IN PVOID Context,
- IN HANDLE Key,
- IN PANSI_STRING SubKeyName
- )
-{
- PSETTINGS_MATCH_NUMBER_PARAMETERS Parameters = Context;
- HANDLE SubKey;
- ANSI_STRING Ansi;
- ULONG Value;
- NTSTATUS status;
-
- Trace("====> (%Z)\n", SubKeyName);
-
- if (Parameters->SubKeyName.Length != 0)
- goto done;
-
- RtlInitAnsiString(&Ansi, "Properties");
-
- if (RtlCompareString(&Ansi, SubKeyName, TRUE) == 0)
- goto done;
-
- status = RegistryOpenSubKey(Key,
- SubKeyName->Buffer,
- KEY_READ,
- &SubKey);
- if (!NT_SUCCESS(status))
- goto fail1;
-
- status = RegistryQueryDwordValue(SubKey,
- "VIF",
- &Value);
- if (NT_SUCCESS(status) &&
- Parameters->Number == Value) {
- Parameters->SubKeyName.MaximumLength = SubKeyName->MaximumLength;
- Parameters->SubKeyName.Buffer =
__SettingsAllocate(Parameters->SubKeyName.MaximumLength);
-
- status = STATUS_NO_MEMORY;
- if (Parameters->SubKeyName.Buffer == NULL)
- goto fail2;
-
- RtlCopyMemory(Parameters->SubKeyName.Buffer,
- SubKeyName->Buffer,
- SubKeyName->Length);
-
- Parameters->SubKeyName.Length = SubKeyName->Length;
- }
-
- RegistryCloseKey(SubKey);
-
-done:
- Trace("<====\n");
-
- return STATUS_SUCCESS;
-
-fail2:
- Error("fail2\n");
-
- RegistryCloseKey(SubKey);
-
-fail1:
- Error("fail1 (%08x)\n", status);
-
- return status;
-}
-
-static NTSTATUS
-SettingsGetAliasNetInstance(
- IN ULONG Number,
- OUT PANSI_STRING SubKeyName
- )
-{
- HANDLE NetKey;
- SETTINGS_MATCH_NUMBER_PARAMETERS Parameters;
- NTSTATUS status;
-
- status = SettingsOpenNetKey(KEY_READ, &NetKey);
- if (!NT_SUCCESS(status))
- goto fail1;
-
- RtlZeroMemory(&Parameters, sizeof (Parameters));
-
- Parameters.Number = Number;
-
- status = RegistryEnumerateSubKeys(NetKey,
- SettingsMatchNumber,
- &Parameters);
- if (!NT_SUCCESS(status))
- goto fail2;
-
- status = STATUS_UNSUCCESSFUL;
- if (Parameters.SubKeyName.Length == 0)
- goto fail3;
-
- Trace("%Z\n", &Parameters.SubKeyName);
-
- *SubKeyName = Parameters.SubKeyName;
-
- RegistryCloseKey(NetKey);
-
- return STATUS_SUCCESS;
-
-fail3:
- Error("fail3\n");
-
-fail2:
- Error("fail2\n");
-
- RegistryCloseKey(NetKey);
-
-fail1:
- Error("fail1 (%08x)\n", status);
-
- return status;
-}
-
-NTSTATUS
-SettingsSetAlias(
- IN PWCHAR Alias,
- IN PWCHAR Description,
- IN LPGUID NetCfgInstanceID,
- IN ULONG Number
- )
-{
- ANSI_STRING SubKeyName;
- HANDLE NetKey;
- HANDLE SubKey;
- NTSTATUS status;
-
- Trace("====>\n");
-
- Info("%ws (%ws)\n", Alias, Description);
-
- status = SettingsGetNetInstance(NetCfgInstanceID,
- &SubKeyName);
- if (!NT_SUCCESS(status))
- goto fail1;
-
- status = SettingsOpenNetKey(KEY_READ,
- &NetKey);
- if (!NT_SUCCESS(status))
- goto fail2;
-
- status = RegistryOpenSubKey(NetKey,
- SubKeyName.Buffer,
- KEY_READ,
- &SubKey);
- if (!NT_SUCCESS(status))
- goto fail3;
-
- status = RegistryUpdateDwordValue(SubKey,
- "VIF",
- Number);
- if (!NT_SUCCESS(status))
- goto fail4;
-
- RegistryCloseKey(SubKey);
-
- RegistryCloseKey(NetKey);
-
- __SettingsFree(SubKeyName.Buffer);
-
- Trace("<====\n");
-
- return STATUS_SUCCESS;
-
-fail4:
- Error("fail4\n");
-
- RegistryCloseKey(SubKey);
-
-fail3:
- Error("fail3\n");
-
- RegistryCloseKey(NetKey);
-
-fail2:
- Error("fail2\n");
-
- __SettingsFree(SubKeyName.Buffer);
-
-fail1:
- Error("fail1 (%08x)\n", status);
-
- return status;
-}
-
-static NTSTATUS
-SettingsCopyLinkage(
- IN HANDLE DestinationKey,
- IN HANDLE SourceKey
- )
-{
- NTSTATUS status;
-
- Trace("====>\n");
-
- status = SettingsCopyValue(DestinationKey,
- SourceKey,
- "NetCfgInstanceID",
- REG_SZ);
- if (!NT_SUCCESS(status))
- goto fail1;
-
- status = SettingsCopyValue(DestinationKey,
- SourceKey,
- "NetLuidIndex",
- REG_DWORD);
- if (!NT_SUCCESS(status))
- goto fail2;
-
- status = SettingsCopySubKey(DestinationKey,
- SourceKey,
- "Linkage");
- if (!NT_SUCCESS(status))
- goto fail3;
-
- Trace("<====\n");
-
- return STATUS_SUCCESS;
-
-fail3:
- Error("fail3\n");
-
-fail2:
- Error("fail2\n");
-
-fail1:
- Error("fail1 (%08x)\n", status);
-
- return status;
-}
-
-NTSTATUS
-SettingsStealAliasLinkage(
- IN HANDLE SoftwareKey,
- IN ULONG Number
- )
-{
- ANSI_STRING SubKeyName;
- HANDLE BackupKey;
- HANDLE NetKey;
- HANDLE SubKey;
- NTSTATUS status;
-
- Trace("====>\n");
-
- status = SettingsGetAliasNetInstance(Number,
- &SubKeyName);
- if (!NT_SUCCESS(status))
- goto fail1;
-
- Info("FROM %Z\n", &SubKeyName);
-
- status = RegistryCreateSubKey(SoftwareKey,
- "Backup",
- REG_OPTION_NON_VOLATILE,
- &BackupKey);
- if (!NT_SUCCESS(status))
- goto fail2;
-
- status = SettingsCopyLinkage(BackupKey,
- SoftwareKey);
- if (!NT_SUCCESS(status))
- goto fail3;
-
- status = SettingsOpenNetKey(KEY_READ,
- &NetKey);
- if (!NT_SUCCESS(status))
- goto fail4;
-
- status = RegistryOpenSubKey(NetKey,
- SubKeyName.Buffer,
- KEY_READ,
- &SubKey);
- if (!NT_SUCCESS(status))
- goto fail5;
-
- status = SettingsCopyLinkage(SoftwareKey,
- SubKey);
- if (!NT_SUCCESS(status))
- goto fail6;
-
- RegistryCloseKey(SubKey);
-
- RegistryCloseKey(NetKey);
-
- RegistryCloseKey(BackupKey);
-
- __SettingsFree(SubKeyName.Buffer);
-
- Trace("<====\n");
-
- return STATUS_SUCCESS;
-
-fail6:
- Error("fail6\n");
-
- RegistryCloseKey(SubKey);
-
-fail5:
- Error("fail5\n");
-
- RegistryCloseKey(NetKey);
-
-fail4:
- Error("fail4\n");
-
-fail3:
- Error("fail3\n");
-
- RegistryCloseKey(BackupKey);
-
- (VOID) RegistryDeleteSubKey(SoftwareKey, "Backup");
-
-fail2:
- Error("fail2\n");
-
- __SettingsFree(SubKeyName.Buffer);
-
-fail1:
- Error("fail1 (%08x)\n", status);
-
- return status;
-}
-
-NTSTATUS
-SettingsRestoreLinkage(
- IN HANDLE SoftwareKey
- )
-{
- HANDLE BackupKey;
- NTSTATUS status;
-
- Trace("====>\n");
-
- status = RegistryOpenSubKey(SoftwareKey,
- "Backup",
- KEY_READ,
- &BackupKey);
- if (!NT_SUCCESS(status))
- goto fail1;
-
- status = SettingsCopyLinkage(SoftwareKey,
- BackupKey);
- if (!NT_SUCCESS(status))
- goto fail2;
-
- RegistryCloseKey(BackupKey);
-
- (VOID) RegistryDeleteSubKey(SoftwareKey, "Backup");
-
- Trace("<====\n");
-
- return STATUS_SUCCESS;
-
-fail2:
- Error("fail2\n");
-
- RegistryCloseKey(BackupKey);
-
-fail1:
- Error("fail1 (%08x)\n", status);
-
- return status;
-}
diff --git a/src/xenvif/settings.h b/src/xenvif/settings.h
deleted file mode 100644
index eb77ec8..0000000
--- a/src/xenvif/settings.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* Copyright (c) Citrix Systems Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms,
- * with or without modification, are permitted provided
- * that the following conditions are met:
- *
- * * Redistributions of source code must retain the above
- * copyright notice, this list of conditions and the
- * following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the
- * following disclaimer in the documentation and/or other
- * materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
- * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _XENVIF_SETTINGS_H
-#define _XENVIF_SETTINGS_H
-
-extern NTSTATUS
-SettingsSetAlias(
- IN PWCHAR Alias,
- IN PWCHAR Description,
- IN LPGUID InterfaceGuid,
- IN ULONG Number
- );
-
-extern NTSTATUS
-SettingsStealAliasLinkage(
- IN HANDLE SoftwareKey,
- IN ULONG Number
- );
-
-extern NTSTATUS
-SettingsRestoreLinkage(
- IN HANDLE SoftwareKey
- );
-
-#endif // _XENVIF_SETTINGS_H
diff --git a/vs2012/xenvif/xenvif.vcxproj b/vs2012/xenvif/xenvif.vcxproj
index 170ab53..2c24e12 100644
--- a/vs2012/xenvif/xenvif.vcxproj
+++ b/vs2012/xenvif/xenvif.vcxproj
@@ -77,7 +77,6 @@
<ClCompile Include="../../src/xenvif/pdo.c" />
<ClCompile Include="../../src/xenvif/receiver.c" />
<ClCompile Include="../../src/xenvif/registry.c" />
- <ClCompile Include="../../src/xenvif/settings.c" />
<ClCompile Include="../../src/xenvif/thread.c" />
<ClCompile Include="../../src/xenvif/transmitter.c" />
<ClCompile Include="../../src/xenvif/controller.c" />
diff --git a/vs2013/xenvif/xenvif.vcxproj b/vs2013/xenvif/xenvif.vcxproj
index 9d1dba3..b1319cd 100644
--- a/vs2013/xenvif/xenvif.vcxproj
+++ b/vs2013/xenvif/xenvif.vcxproj
@@ -80,7 +80,6 @@
<ClCompile Include="../../src/xenvif/pdo.c" />
<ClCompile Include="../../src/xenvif/receiver.c" />
<ClCompile Include="../../src/xenvif/registry.c" />
- <ClCompile Include="../../src/xenvif/settings.c" />
<ClCompile Include="../../src/xenvif/thread.c" />
<ClCompile Include="../../src/xenvif/transmitter.c" />
<ClCompile Include="../../src/xenvif/controller.c" />
--
2.1.1
_______________________________________________
win-pv-devel mailing list
win-pv-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/cgi-bin/mailman/listinfo/win-pv-devel
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |