ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wbemprox: Fix index in fill_diskdrive and fill_diskpartition. 

Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Hans Leidekker 2019-09-10 17:09:13 +02:00 committed by Alexandre Julliard
parent 08d0449e41
commit c69813bcd0
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/wbemprox/builtin.c
View File

@ -2424,7 +2424,7 @@ static enum fill_status fill_diskdrive( struct table *table, const struct expr *
rec = (struct record_diskdrive *)(table->data + offset); rec = (struct record_diskdrive *)(table->data + offset);
swprintf( device_id, ARRAY_SIZE( device_id ), fmtW, index ); swprintf( device_id, ARRAY_SIZE( device_id ), fmtW, index );
rec->device_id = heap_strdupW( device_id ); rec->device_id = heap_strdupW( device_id );
rec->index = index; rec->index = index++;
rec->interfacetype = diskdrive_interfacetypeW; rec->interfacetype = diskdrive_interfacetypeW;
rec->manufacturer = diskdrive_manufacturerW; rec->manufacturer = diskdrive_manufacturerW;
rec->mediatype = (type == DRIVE_FIXED) ? diskdrive_mediatype_fixedW : diskdrive_mediatype_removableW; rec->mediatype = (type == DRIVE_FIXED) ? diskdrive_mediatype_fixedW : diskdrive_mediatype_removableW;
@ -2439,7 +2439,6 @@ static enum fill_status fill_diskdrive( struct table *table, const struct expr *
continue; continue;
} }
offset += sizeof(*rec); offset += sizeof(*rec);
index++;
row++; row++;
} }
} }
@ -2591,7 +2590,7 @@ static enum fill_status fill_diskpartition( struct table *table, const struct ex
rec->bootpartition = (i == 2) ? -1 : 0; rec->bootpartition = (i == 2) ? -1 : 0;
swprintf( device_id, ARRAY_SIZE( device_id ), fmtW, index ); swprintf( device_id, ARRAY_SIZE( device_id ), fmtW, index );
rec->device_id = heap_strdupW( device_id ); rec->device_id = heap_strdupW( device_id );
rec->diskindex = index; rec->diskindex = index++;
rec->index = 0; rec->index = 0;
rec->pnpdevice_id = heap_strdupW( device_id ); rec->pnpdevice_id = heap_strdupW( device_id );
get_freespace( root, &size ); get_freespace( root, &size );
@ -2605,7 +2604,6 @@ static enum fill_status fill_diskpartition( struct table *table, const struct ex
} }
offset += sizeof(*rec); offset += sizeof(*rec);
row++; row++;
index++;
} }
} }
TRACE("created %u rows\n", row); TRACE("created %u rows\n", row);