Hans Leidekker : wbemprox: Add a partial implementation of Win32_DiskPartition.
Alexandre Julliard
julliard at winehq.org
Mon Feb 25 14:33:47 CST 2013
Module: wine
Branch: master
Commit: 30630b4da29b20da647ce161fa3ade3765b2a329
URL: http://source.winehq.org/git/wine.git/?a=commit;h=30630b4da29b20da647ce161fa3ade3765b2a329
Author: Hans Leidekker <hans at codeweavers.com>
Date: Mon Feb 25 11:04:29 2013 +0100
wbemprox: Add a partial implementation of Win32_DiskPartition.
---
dlls/wbemprox/builtin.c | 85 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 83 insertions(+), 2 deletions(-)
diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c
index 92f3030..f48eaff 100644
--- a/dlls/wbemprox/builtin.c
+++ b/dlls/wbemprox/builtin.c
@@ -53,6 +53,8 @@ static const WCHAR class_compsysW[] =
{'W','i','n','3','2','_','C','o','m','p','u','t','e','r','S','y','s','t','e','m',0};
static const WCHAR class_diskdriveW[] =
{'W','i','n','3','2','_','D','i','s','k','D','r','i','v','e',0};
+static const WCHAR class_diskpartitionW[] =
+ {'W','i','n','3','2','_','D','i','s','k','P','a','r','t','i','t','i','o','n',0};
static const WCHAR class_logicaldiskW[] =
{'W','i','n','3','2','_','L','o','g','i','c','a','l','D','i','s','k',0};
static const WCHAR class_networkadapterW[] =
@@ -81,6 +83,8 @@ static const WCHAR prop_acceptstopW[] =
{'A','c','c','e','p','t','S','t','o','p',0};
static const WCHAR prop_adapterramW[] =
{'A','d','a','p','t','e','r','R','A','M',0};
+static const WCHAR prop_bootableW[] =
+ {'B','o','o','t','a','b','l','e',0};
static const WCHAR prop_captionW[] =
{'C','a','p','t','i','o','n',0};
static const WCHAR prop_classW[] =
@@ -107,12 +111,14 @@ static const WCHAR prop_directionW[] =
{'D','i','r','e','c','t','i','o','n',0};
static const WCHAR prop_displaynameW[] =
{'D','i','s','p','l','a','y','N','a','m','e',0};
-static const WCHAR prop_driveW[] =
- {'D','r','i','v','e',0};
+static const WCHAR prop_diskindexW[] =
+ {'D','i','s','k','I','n','d','e','x',0};
static const WCHAR prop_domainW[] =
{'D','o','m','a','i','n',0};
static const WCHAR prop_domainroleW[] =
{'D','o','m','a','i','n','R','o','l','e',0};
+static const WCHAR prop_driveW[] =
+ {'D','r','i','v','e',0};
static const WCHAR prop_drivetypeW[] =
{'D','r','i','v','e','T','y','p','e',0};
static const WCHAR prop_filesystemW[] =
@@ -125,6 +131,8 @@ static const WCHAR prop_handleW[] =
{'H','a','n','d','l','e',0};
static const WCHAR prop_idW[] =
{'I','D',0};
+static const WCHAR prop_indexW[] =
+ {'I','n','d','e','x',0};
static const WCHAR prop_interfaceindexW[] =
{'I','n','t','e','r','f','a','c','e','I','n','d','e','x',0};
static const WCHAR prop_intvalueW[] =
@@ -177,6 +185,8 @@ static const WCHAR prop_sizeW[] =
{'S','i','z','e',0};
static const WCHAR prop_speedW[] =
{'S','p','e','e','d',0};
+static const WCHAR prop_startingoffsetW[] =
+ {'S','t','a','r','t','i','n','g','O','f','f','s','e','t',0};
static const WCHAR prop_stateW[] =
{'S','t','a','t','e',0};
static const WCHAR prop_strvalueW[] =
@@ -240,6 +250,17 @@ static const struct column col_diskdrive[] =
{ prop_modelW, CIM_STRING },
{ prop_serialnumberW, CIM_STRING }
};
+static const struct column col_diskpartition[] =
+{
+ { prop_bootableW, CIM_BOOLEAN },
+ { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY },
+ { prop_diskindexW, CIM_UINT32, VT_I4 },
+ { prop_indexW, CIM_UINT32, VT_I4 },
+ { prop_pnpdeviceidW, CIM_STRING|COL_FLAG_DYNAMIC },
+ { prop_sizeW, CIM_UINT64 },
+ { prop_startingoffsetW, CIM_UINT64 },
+ { prop_typeW, CIM_STRING|COL_FLAG_DYNAMIC }
+};
static const struct column col_logicaldisk[] =
{
{ prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY },
@@ -446,6 +467,17 @@ struct record_diskdrive
const WCHAR *name;
const WCHAR *serialnumber;
};
+struct record_diskpartition
+{
+ int bootable;
+ const WCHAR *device_id;
+ UINT32 diskindex;
+ UINT32 index;
+ const WCHAR *pnpdevice_id;
+ UINT64 size;
+ UINT64 startingoffset;
+ const WCHAR *type;
+};
struct record_logicaldisk
{
const WCHAR *device_id;
@@ -745,6 +777,54 @@ static UINT64 get_freespace( const WCHAR *dir, UINT64 *disksize )
return free.QuadPart;
}
+static void fill_diskpartition( struct table *table )
+{
+ static const WCHAR fmtW[] =
+ {'D','i','s','k',' ','#','%','u',',',' ','P','a','r','t','i','t','i','o','n',' ','#','0',0};
+ WCHAR device_id[32], root[] = {'A',':','\\',0};
+ struct record_diskpartition *rec;
+ UINT i, num_rows = 0, offset = 0, count = 4, type, index = 0;
+ UINT64 size = 1024 * 1024 * 1024;
+ DWORD drives = GetLogicalDrives();
+
+ if (!(table->data = heap_alloc( count * sizeof(*rec) ))) return;
+
+ for (i = 0; i < sizeof(drives); i++)
+ {
+ if (drives & (1 << i))
+ {
+ root[0] = 'A' + i;
+ type = GetDriveTypeW( root );
+ if (type != DRIVE_FIXED && type != DRIVE_REMOVABLE)
+ continue;
+
+ if (num_rows > count)
+ {
+ BYTE *data;
+ count *= 2;
+ if (!(data = heap_realloc( table->data, count * sizeof(*rec) ))) return;
+ table->data = data;
+ }
+ rec = (struct record_diskpartition *)(table->data + offset);
+ rec->bootable = (i == 2) ? -1 : 0;
+ sprintfW( device_id, fmtW, index );
+ rec->device_id = heap_strdupW( device_id );
+ rec->diskindex = index;
+ rec->index = 0;
+ rec->pnpdevice_id = heap_strdupW( device_id );
+ get_freespace( root, &size );
+ rec->size = size;
+ rec->startingoffset = 0;
+ rec->type = get_filesystem( root );
+ offset += sizeof(*rec);
+ num_rows++;
+ index++;
+ }
+ }
+ TRACE("created %u rows\n", num_rows);
+ table->num_rows = num_rows;
+}
+
static void fill_logicaldisk( struct table *table )
{
static const WCHAR fmtW[] = {'%','c',':',0};
@@ -1314,6 +1394,7 @@ static struct table builtin_classes[] =
{ class_cdromdriveW, SIZEOF(col_cdromdrive), col_cdromdrive, 0, NULL, fill_cdromdrive },
{ class_compsysW, SIZEOF(col_compsys), col_compsys, 0, NULL, fill_compsys },
{ class_diskdriveW, SIZEOF(col_diskdrive), col_diskdrive, SIZEOF(data_diskdrive), (BYTE *)data_diskdrive },
+ { class_diskpartitionW, SIZEOF(col_diskpartition), col_diskpartition, 0, NULL, fill_diskpartition },
{ class_logicaldiskW, SIZEOF(col_logicaldisk), col_logicaldisk, 0, NULL, fill_logicaldisk },
{ class_networkadapterW, SIZEOF(col_networkadapter), col_networkadapter, 0, NULL, fill_networkadapter },
{ class_osW, SIZEOF(col_os), col_os, 0, NULL, fill_os },
More information about the wine-cvs
mailing list