External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

vbox: Fix version extraction on Windows for newer VirtualBox versions

Browse Source 
VirtualBox 4.0.8 changed the registry key layout. Before the version
number was in a Version key. Now the Version key contains %VER% and
the actual version number is in VersionExt now.

Move value lookup code into its own function: vboxLookupRegistryValue.
This commit is contained in:
Matthias Bolte 2011-06-04 10:50:36 +02:00
parent 33d90bafe7
commit eb2664cbe6
1 changed files with 65 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
src/vbox/vbox_MSCOMGlue.c
View File

@ -2,7 +2,7 @@
/* /*
* vbox_MSCOMGlue.c: glue to the MSCOM based VirtualBox API * vbox_MSCOMGlue.c: glue to the MSCOM based VirtualBox API
* *
* Copyright (C) 2010 Matthias Bolte <matthias.bolte@googlemail.com> * Copyright (C) 2010-2011 Matthias Bolte <matthias.bolte@googlemail.com>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
@ -338,6 +338,57 @@ static nsIEventQueue vboxEventQueue = {
static char *
vboxLookupRegistryValue(HKEY key, const char *keyName, const char *valueName)
{
LONG status;
DWORD type;
DWORD length;
char *value = NULL;
status = RegQueryValueEx(key, valueName, NULL, &type, NULL, &length);
if (status != ERROR_SUCCESS) {
VIR_ERROR(_("Could not query registry value '%s\\%s'"),
keyName, valueName);
goto cleanup;
}
if (type != REG_SZ) {
VIR_ERROR(_("Registry value '%s\\%s' has unexpected type"),
keyName, valueName);
goto cleanup;
}
if (length < 2) {
VIR_ERROR(_("Registry value '%s\\%s' is too short"),
keyName, valueName);
goto cleanup;
}
/* +1 for the null-terminator if it's missing */
if (VIR_ALLOC_N(value, length + 1) < 0) {
virReportOOMError();
goto cleanup;
}
status = RegQueryValueEx(key, valueName, NULL, NULL, (LPBYTE)value, &length);
if (status != ERROR_SUCCESS) {
VIR_FREE(value);
VIR_ERROR(_("Could not query registry value '%s\\%s'"),
keyName, valueName);
goto cleanup;
}
if (value[length - 1] != '\0') {
value[length] = '\0';
}
cleanup:
return value;
}
static int static int
vboxLookupVersionInRegistry(void) vboxLookupVersionInRegistry(void)
{ {
@ -345,8 +396,6 @@ vboxLookupVersionInRegistry(void)
const char *keyName = VBOX_REGKEY_ORACLE; const char *keyName = VBOX_REGKEY_ORACLE;
LONG status; LONG status;
HKEY key; HKEY key;
DWORD type;
DWORD length;
char *value = NULL; char *value = NULL;
status = RegOpenKeyEx(HKEY_LOCAL_MACHINE, keyName, 0, KEY_READ, &key); status = RegOpenKeyEx(HKEY_LOCAL_MACHINE, keyName, 0, KEY_READ, &key);
@ -363,41 +412,25 @@ vboxLookupVersionInRegistry(void)
} }
} }
status = RegQueryValueEx(key, "Version", NULL, &type, NULL, &length); /* The registry key layout changed around version 4.0.8. Before the version
* number was in the Version key, now the Version key can contain %VER% and
* the actual version number is in the VersionExt key then. */
value = vboxLookupRegistryValue(key, keyName, "Version");
if (status != ERROR_SUCCESS) { if (value == NULL) {
VIR_ERROR(_("Could not query registry value '%s\\Version'"), keyName);
goto cleanup; goto cleanup;
} }
if (type != REG_SZ) { if (STREQ(value, "%VER%")) {
VIR_ERROR(_("Registry value '%s\\Version' has unexpected type"), keyName); VIR_FREE(value);
goto cleanup; value = vboxLookupRegistryValue(key, keyName, "VersionExt");
if (value == NULL) {
goto cleanup;
}
} }
if (length < 2) { if (virParseVersionString(value, &vboxVersion) < 0) {
VIR_ERROR(_("Registry value '%s\\Version' is too short"), keyName);
goto cleanup;
}
/* +1 for the null-terminator if it's missing */
if (VIR_ALLOC_N(value, length + 1) < 0) {
virReportOOMError();
goto cleanup;
}
status = RegQueryValueEx(key, "Version", NULL, NULL, (LPBYTE)value, &length);
if (status != ERROR_SUCCESS) {
VIR_ERROR(_("Could not query registry value '%s\\Version'"), keyName);
goto cleanup;
}
if (value[length - 1] != '\0') {
value[length] = '\0';
}
if (virParseVersionString(value, &vboxVersion)) {
VIR_ERROR(_("Could not parse version number from '%s'"), value); VIR_ERROR(_("Could not parse version number from '%s'"), value);
goto cleanup; goto cleanup;
} }