Re: Re: wbemprox: Add a Win32_LogicalDisk class stub.
Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://winetestbot.dolphin/JobDetails.pl?Key=116 Your paranoid android. === debiantesting (build) === Patch failed to apply
Re: wbemprox: Add a Win32_LogicalDisk class stub.
So, is this patch good?
Re: wbemprox: Add a Win32_LogicalDisk class stub.
On 28 June 2012 22:17, Hans Leidekker h...@codeweavers.com wrote: On Thu, 2012-06-28 at 21:53 +0300, John Yani wrote: +static void fill_logicaldisk( struct table *table ) +{ + static const WCHAR caption[] = + {'C',':',0}; + static const WCHAR description[] = + {'L','o','c','a','l',' ','F','i','x','e','d',' ','D','i','s','k',0}; + static const WCHAR device_id[] = + {'C',':',0}; + struct record_logicaldisk *rec; + FIXME(returns a fake logical disks table\n); + if (!(table-data = heap_alloc( sizeof(*rec) ))) + { + return; + } + rec = (struct record_logicaldisk *)(table-data); + rec-caption = caption; + rec-description = description; + rec-device_id = device_id; + table-num_rows = 1; + TRACE(created %u row(s)\n, table-num_rows); That's better. Does NFS actually query the Caption and Description properties? Well, no. I just thought the output should be similar to the one on winetestbot: https://testbot.winehq.org/JobDetails.pl?Key=19642log_201=1#k201
Re: wbemprox: Add a Win32_LogicalDisk class stub.
NFS requests Size and FreeSpace fields. Not sure if it require them to be set.
Re: wbemprox: Add a Win32_LogicalDisk class stub.
On Thu, 2012-06-28 at 21:53 +0300, John Yani wrote: +static void fill_logicaldisk( struct table *table ) +{ +static const WCHAR caption[] = +{'C',':',0}; +static const WCHAR description[] = +{'L','o','c','a','l',' ','F','i','x','e','d',' ','D','i','s','k',0}; +static const WCHAR device_id[] = +{'C',':',0}; +struct record_logicaldisk *rec; +FIXME(returns a fake logical disks table\n); +if (!(table-data = heap_alloc( sizeof(*rec) ))) +{ +return; +} +rec = (struct record_logicaldisk *)(table-data); +rec-caption= caption; +rec-description= description; +rec-device_id = device_id; +table-num_rows = 1; +TRACE(created %u row(s)\n, table-num_rows); That's better. Does NFS actually query the Caption and Description properties?
Re: wbemprox: Add a Win32_LogicalDisk class stub.
On Thu, 2012-06-28 at 22:22 +0300, John Yani wrote: On 28 June 2012 22:17, Hans Leidekker h...@codeweavers.com wrote: On Thu, 2012-06-28 at 21:53 +0300, John Yani wrote: That's better. Does NFS actually query the Caption and Description properties? Well, no. I just thought the output should be similar to the one on winetestbot: https://testbot.winehq.org/JobDetails.pl?Key=19642log_201=1#k201 No, that's just a test I wrote to investigate this stuff.
Re: wbemprox: Add a Win32_LogicalDisk class stub.
On Wed, 2012-06-27 at 11:34 +0300, John Yani wrote: +static void fill_logicaldisk( struct table *table ) +{ +static const WCHAR fmtW[] = {'%','u',0}; +WCHAR device_id[11]; +struct record_logicaldisk *rec; +UINT num_rows = 1; +FIXME(returns a fake logical disks table\n); +if (!(table-data = heap_alloc( sizeof(*rec) * num_rows ))) +{ +return; +} +rec = (struct record_networkadapter *)(table-data); This should be (struct record_logicaldisk *)(table-data); +sprintfW( device_id, fmtW, 0 ); +rec-device_id= heap_strdupW( device_id ); + +TRACE(created %u rows\n, num_rows); +table-num_rows = num_rows; +} You don't need the num_rows variable since it's a fixed value. You also don't need to build the device id, it can just be a static string.
Re: wbemprox: Add a Win32_LogicalDisk class stub.
On Wed, 2012-06-27 at 14:41 +0300, John Yani wrote: +static void fill_logicaldisk( struct table *table ) +{ +static const WCHAR device_id[] = {'0',0}; +struct record_logicaldisk *rec; +FIXME(returns a fake logical disks table\n); +if (!(table-data = heap_alloc( sizeof(*rec) ))) +{ +return; +} +rec = (struct record_logicaldisk *)(table-data); +rec-device_id= heap_strdupW( device_id ); +table-num_rows = 1; +TRACE(created %u rows\n, table-num_rows); +} There's no need to create a copy of device_id. Just assign it to rec-device_id and remove COL_FLAG_DYNAMIC from the column definition.