26 Apr
2014
26 Apr
'14
5:12 p.m.
Author: akhaldi
Date: Sat Apr 26 17:12:58 2014
New Revision: 62986
URL: http://svn.reactos.org/svn/reactos?rev=62986&view=rev
Log:
[WBEMPROX]
* Sync with Wine 1.7.17.
CORE-8080
Modified:
trunk/reactos/dll/win32/wbemprox/builtin.c
trunk/reactos/dll/win32/wbemprox/class.c
trunk/reactos/dll/win32/wbemprox/main.c
trunk/reactos/dll/win32/wbemprox/qualifier.c
trunk/reactos/dll/win32/wbemprox/query.c
trunk/reactos/dll/win32/wbemprox/services.c
trunk/reactos/dll/win32/wbemprox/wbemlocator.c
trunk/reactos/dll/win32/wbemprox/wbemprox.idl
trunk/reactos/dll/win32/wbemprox/wbemprox_private.h
trunk/reactos/dll/win32/wbemprox/wql.tab.c
trunk/reactos/dll/win32/wbemprox/wql.y
trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/wbemprox/builtin.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/builtin…
==============================================================================
--- trunk/reactos/dll/win32/wbemprox/builtin.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wbemprox/builtin.c [iso-8859-1] Sat Apr 26 17:12:58 2014
@@ -51,10 +51,17 @@
{'C','I','M','_','L','o','g','i','c','a','l','D','i','s','k',0};
static const WCHAR class_networkadapterW[] =
{'W','i','n','3','2','_','N','e','t','w','o','r','k','A','d','a','p','t','e','r',0};
+static const WCHAR class_networkadapterconfigW[] =
+
{'W','i','n','3','2','_','N','e','t','w','o','r','k','A','d','a','p','t','e','r',
+
'C','o','n','f','i','g','u','r','a','t','i','o','n',0};
static const WCHAR class_osW[] =
{'W','i','n','3','2','_','O','p','e','r','a','t','i','n','g','S','y','s','t','e','m',0};
static const WCHAR class_paramsW[] =
{'_','_','P','A','R','A','M','E','T','E','R','S',0};
+static const WCHAR class_physicalmediaW[] =
+
{'W','i','n','3','2','_','P','h','y','s','i','c','a','l','M','e','d','i','a',0};
+static const WCHAR class_physicalmemoryW[] =
+
{'W','i','n','3','2','_','P','h','y','s','i','c','a','l','M','e','m','o','r','y',0};
static const WCHAR class_qualifiersW[] =
{'_','_','Q','U','A','L','I','F','I','E','R','S',0};
static const WCHAR class_process_getowner_outW[] =
@@ -81,10 +88,16 @@
{'A','d','a','p','t','e','r','T','y','p','e',0};
static const WCHAR prop_addresswidthW[] =
{'A','d','d','r','e','s','s','W','i','d','t','h',0};
+static const WCHAR prop_availabilityW[] =
+
{'A','v','a','i','l','a','b','i','l','i','t','y',0};
static const WCHAR prop_bootableW[] =
{'B','o','o','t','a','b','l','e',0};
static const WCHAR prop_bootpartitionW[] =
{'B','o','o','t','P','a','r','t','i','t','i','o','n',0};
+static const WCHAR prop_buildnumberW[] =
+
{'B','u','i','l','d','N','u','m','b','e','r',0};
+static const WCHAR prop_capacityW[] =
+
{'C','a','p','a','c','i','t','y',0};
static const WCHAR prop_captionW[] =
{'C','a','p','t','i','o','n',0};
static const WCHAR prop_classW[] =
@@ -137,12 +150,22 @@
{'H','a','n','d','l','e',0};
static const WCHAR prop_idW[] =
{'I','D',0};
+static const WCHAR prop_identificationcodeW[] =
+
{'I','d','e','n','t','i','f','i','c','a','t','i','o','n','C','o','d','e',0};
static const WCHAR prop_indexW[] =
{'I','n','d','e','x',0};
+static const WCHAR prop_installdateW[] =
+
{'I','n','s','t','a','l','l','D','a','t','e',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_interfacetypeW[] =
+
{'I','n','t','e','r','f','a','c','e','T','y','p','e',0};
static const WCHAR prop_intvalueW[] =
{'I','n','t','e','g','e','r','V','a','l','u','e',0};
+static const WCHAR prop_ipconnectionmetricW[] =
+
{'I','P','C','o','n','n','e','c','t','i','o','n','M','e','t','r','i','c',0};
+static const WCHAR prop_ipenabledW[] =
+
{'I','P','E','n','a','b','l','e','d',0};
static const WCHAR prop_lastbootuptimeW[] =
{'L','a','s','t','B','o','o','t','U','p','T','i','m','e',0};
static const WCHAR prop_localdatetimeW[] =
@@ -155,6 +178,8 @@
{'M','a','n','u','f','a','c','t','u','r','e','r',0};
static const WCHAR prop_maxclockspeedW[] =
{'M','a','x','C','l','o','c','k','S','p','e','e','d',0};
+static const WCHAR prop_mediatypeW[] =
+
{'M','e','d','i','a','T','y','p','e',0};
static const WCHAR prop_memberW[] =
{'M','e','m','b','e','r',0};
static const WCHAR prop_methodW[] =
@@ -201,6 +226,8 @@
{'S','e','r','v','i','c','e','P','a','c','k','M','i','n','o','r','V','e','r','s','i','o','n',0};
static const WCHAR prop_servicetypeW[] =
{'S','e','r','v','i','c','e','T','y','p','e',0};
+static const WCHAR prop_smbiosbiosversionW[] =
+
{'S','M','B','I','O','S','B','I','O','S','V','e','r','s','i','o','n',0};
static const WCHAR prop_startmodeW[] =
{'S','t','a','r','t','M','o','d','e',0};
static const WCHAR prop_sizeW[] =
@@ -233,26 +260,33 @@
{'V','a','r','i','a','n','t','T','y','p','e',0};
static const WCHAR prop_versionW[] =
{'V','e','r','s','i','o','n',0};
+static const WCHAR prop_volumeserialnumberW[] =
+
{'V','o','l','u','m','e','S','e','r','i','a','l','N','u','m','b','e','r',0};
/* column definitions must be kept in sync with record structures below */
static const struct column col_baseboard[] =
{
{ prop_manufacturerW, CIM_STRING },
+ { prop_modelW, CIM_STRING },
+ { prop_nameW, CIM_STRING },
{ prop_serialnumberW, CIM_STRING },
{ prop_tagW, CIM_STRING|COL_FLAG_KEY }
};
static const struct column col_bios[] =
{
- { prop_descriptionW, CIM_STRING },
- { prop_manufacturerW, CIM_STRING },
- { prop_releasedateW, CIM_DATETIME },
- { prop_serialnumberW, CIM_STRING },
- { prop_versionW, CIM_STRING|COL_FLAG_KEY }
+ { prop_descriptionW, CIM_STRING },
+ { prop_identificationcodeW, CIM_STRING },
+ { prop_manufacturerW, CIM_STRING },
+ { prop_releasedateW, CIM_DATETIME },
+ { prop_serialnumberW, CIM_STRING },
+ { prop_smbiosbiosversionW, CIM_STRING },
+ { prop_versionW, CIM_STRING|COL_FLAG_KEY }
};
static const struct column col_cdromdrive[] =
{
{ prop_deviceidW, CIM_STRING|COL_FLAG_KEY },
{ prop_driveW, CIM_STRING|COL_FLAG_DYNAMIC },
+ { prop_mediatypeW, CIM_STRING },
{ prop_nameW, CIM_STRING },
{ prop_pnpdeviceidW, CIM_STRING }
};
@@ -280,11 +314,14 @@
};
static const struct column col_diskdrive[] =
{
- { prop_deviceidW, CIM_STRING|COL_FLAG_KEY },
- { prop_indexW, CIM_UINT32, VT_I4 },
- { prop_manufacturerW, CIM_STRING },
- { prop_modelW, CIM_STRING },
- { prop_serialnumberW, CIM_STRING }
+ { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY },
+ { prop_indexW, CIM_UINT32, VT_I4 },
+ { prop_interfacetypeW, CIM_STRING },
+ { prop_manufacturerW, CIM_STRING },
+ { prop_mediatypeW, CIM_STRING },
+ { prop_modelW, CIM_STRING },
+ { prop_serialnumberW, CIM_STRING },
+ { prop_sizeW, CIM_UINT64 }
};
static const struct column col_diskpartition[] =
{
@@ -300,38 +337,52 @@
};
static const struct column col_logicaldisk[] =
{
- { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY },
- { prop_drivetypeW, CIM_UINT32, VT_I4 },
- { prop_filesystemW, CIM_STRING|COL_FLAG_DYNAMIC },
- { prop_freespaceW, CIM_UINT64 },
- { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC },
- { prop_sizeW, CIM_UINT64 }
+ { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY },
+ { prop_drivetypeW, CIM_UINT32, VT_I4 },
+ { prop_filesystemW, CIM_STRING|COL_FLAG_DYNAMIC },
+ { prop_freespaceW, CIM_UINT64 },
+ { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC },
+ { prop_sizeW, CIM_UINT64 },
+ { prop_volumeserialnumberW, CIM_STRING|COL_FLAG_DYNAMIC }
};
static const struct column col_networkadapter[] =
{
{ prop_adaptertypeW, CIM_STRING },
{ prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY },
+ { prop_indexW, CIM_UINT32, VT_I4 },
{ prop_interfaceindexW, CIM_UINT32, VT_I4 },
{ prop_macaddressW, CIM_STRING|COL_FLAG_DYNAMIC },
{ prop_manufacturerW, CIM_STRING },
+ { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC },
{ prop_netconnectionstatusW, CIM_UINT16, VT_I4 },
{ prop_physicaladapterW, CIM_BOOLEAN },
{ prop_pnpdeviceidW, CIM_STRING },
{ prop_speedW, CIM_UINT64 }
};
+static const struct column col_networkadapterconfig[] =
+{
+ { prop_indexW, CIM_UINT32|COL_FLAG_KEY },
+ { prop_ipconnectionmetricW, CIM_UINT32 },
+ { prop_ipenabledW, CIM_BOOLEAN },
+ { prop_macaddressW, CIM_STRING|COL_FLAG_DYNAMIC }
+};
static const struct column col_os[] =
{
+ { prop_buildnumberW, CIM_STRING },
{ prop_captionW, CIM_STRING },
{ prop_codesetW, CIM_STRING|COL_FLAG_DYNAMIC },
{ prop_countrycodeW, CIM_STRING|COL_FLAG_DYNAMIC },
{ prop_csdversionW, CIM_STRING },
+ { prop_installdateW, CIM_DATETIME },
{ prop_lastbootuptimeW, CIM_DATETIME|COL_FLAG_DYNAMIC },
{ prop_localdatetimeW, CIM_DATETIME|COL_FLAG_DYNAMIC },
{ prop_localeW, CIM_STRING|COL_FLAG_DYNAMIC },
+ { prop_nameW, CIM_STRING },
{ prop_osarchitectureW, CIM_STRING },
{ prop_oslanguageW, CIM_UINT32, VT_I4 },
{ prop_osproductsuiteW, CIM_UINT32, VT_I4 },
{ prop_ostypeW, CIM_UINT16, VT_I4 },
+ { prop_serialnumberW, CIM_STRING },
{ prop_servicepackmajorW, CIM_UINT16, VT_I4 },
{ prop_servicepackminorW, CIM_UINT16, VT_I4 },
{ prop_suitemaskW, CIM_UINT32, VT_I4 },
@@ -347,6 +398,15 @@
{ prop_typeW, CIM_UINT32 },
{ prop_varianttypeW, CIM_UINT32 },
{ prop_defaultvalueW, CIM_UINT32 }
+};
+static const struct column col_physicalmedia[] =
+{
+ { prop_serialnumberW, CIM_STRING },
+ { prop_tagW, CIM_STRING }
+};
+static const struct column col_physicalmemory[] =
+{
+ { prop_capacityW, CIM_UINT64 }
};
static const struct column col_process[] =
{
@@ -417,6 +477,7 @@
{
{ prop_adapterdactypeW, CIM_STRING },
{ prop_adapterramW, CIM_UINT32, VT_I4 },
+ { prop_availabilityW, CIM_UINT16 },
{ prop_currentbitsperpixelW, CIM_UINT32 },
{ prop_currenthorizontalresW, CIM_UINT32 },
{ prop_currentverticalresW, CIM_UINT32 },
@@ -440,8 +501,12 @@
{'2','0','1','2','0','6','0','8','0','0','0','0','0','0','.','0','0','0','0','0','0','+','0','0','0',0};
static const WCHAR bios_serialnumberW[] =
{'0',0};
+static const WCHAR bios_smbiosbiosversionW[] =
+ {'W','i','n','e',0};
static const WCHAR bios_versionW[] =
{'W','I','N','E',' ',' ','
','-',' ','1',0};
+static const WCHAR cdromdrive_mediatypeW[] =
+ {'C','D','-','R','O','M',0};
static const WCHAR cdromdrive_nameW[] =
{'W','i','n','e','
','C','D','-','R','O','M','
','A','T','A','
','D','e','v','i','c','e',0};
static const WCHAR cdromdrive_pnpdeviceidW[]=
@@ -457,29 +522,46 @@
{'T','h','e','
','W','i','n','e','
','P','r','o','j','e','c','t',0};
static const WCHAR compsys_modelW[] =
{'W','i','n','e',0};
-static const WCHAR diskdrive_deviceidW[] =
-
{'\\','\\','\\','\\','.','\\','\\','P','H','Y','S','I','C','A','L','D','R','I','V','E','0',0};
+static const WCHAR diskdrive_interfacetypeW[] =
+ {'I','D','E',0};
+static const WCHAR diskdrive_manufacturerW[] =
+
{'(','S','t','a','n','d','a','r','d','
','d','i','s','k','
','d','r','i','v','e','s',')',0};
+static const WCHAR diskdrive_mediatype_fixedW[] =
+ {'F','i','x','e','d','
','h','a','r','d','
','d','i','s','k',0};
+static const WCHAR diskdrive_mediatype_removableW[] =
+
{'R','e','m','o','v','a','b','l','e','
','m','e','d','i','a',0};
static const WCHAR diskdrive_modelW[] =
{'W','i','n','e','
','D','i','s','k','
','D','r','i','v','e',0};
-static const WCHAR diskdrive_manufacturerW[] =
-
{'(','S','t','a','n','d','a','r','d','
','d','i','s','k','
','d','r','i','v','e','s',')',0};
static const WCHAR diskdrive_serialW[] =
{'W','I','N','E','H','D','I','S','K',0};
static const WCHAR networkadapter_pnpdeviceidW[]=
{'P','C','I','\\','V','E','N','_','8','0','8','6','&','D','E','V','_','1','0','0','E','&',
'S','U','B','S','Y','S','_','0','0','1','E','8','0','8','6','&','R','E','V','_','0','2','\\',
'3','&','2','6','7','A','6','1','6','A','&','1','&','1','8',0};
+static const WCHAR os_32bitW[] =
+ {'3','2','-','b','i','t',0};
+static const WCHAR os_64bitW[] =
+ {'6','4','-','b','i','t',0};
+static const WCHAR os_buildnumberW[] =
+ {'2','6','0','0',0};
static const WCHAR os_captionW[] =
{'M','i','c','r','o','s','o','f','t','
','W','i','n','d','o','w','s','
','X','P',' ',
'V','e','r','s','i','o','n','
','=','
','5','.','1','.','2','6','0','0',0};
static const WCHAR os_csdversionW[] =
{'S','e','r','v','i','c','e','
','P','a','c','k',' ','3',0};
-static const WCHAR os_32bitW[] =
- {'3','2','-','b','i','t',0};
-static const WCHAR os_64bitW[] =
- {'6','4','-','b','i','t',0};
+static const WCHAR os_installdateW[] =
+
{'2','0','1','4','0','1','0','1','0','0','0','0','0','0','.','0','0','0','0','0','0','+','0','0','0',0};
+static const WCHAR os_nameW[] =
+
{'M','i','c','r','o','s','o','f','t','
','W','i','n','d','o','w','s','
','X','P',' ',
+
'P','r','o','f','e','s','s','i','o','n','a','l','|','C',':','\\','W','I','N','D','O','W','S',
+
'|','\\','D','e','v','i','c','e','\\','H','a','r','d','d','i','s','k','0',
+
'\\','P','a','r','t','i','t','i','o','n','1',0};
+static const WCHAR os_serialnumberW[] =
+
{'1','2','3','4','5','-','O','E','M','-','1','2','3','4','5','6','7','-','1','2','3','4','5',0};
static const WCHAR os_versionW[] =
{'5','.','1','.','2','6','0','0',0};
+static const WCHAR physicalmedia_tagW[] =
+
{'\\','\\','.','\\','P','H','Y','S','I','C','A','L','D','R','I','V','E','0',0};
static const WCHAR sounddevice_productnameW[] =
{'W','i','n','e','
','A','u','d','i','o','
','D','e','v','i','c','e',0};
static const WCHAR videocontroller_dactypeW[] =
@@ -491,21 +573,26 @@
struct record_baseboard
{
const WCHAR *manufacturer;
+ const WCHAR *model;
+ const WCHAR *name;
const WCHAR *serialnumber;
const WCHAR *tag;
};
struct record_bios
{
const WCHAR *description;
+ const WCHAR *identificationcode;
const WCHAR *manufacturer;
const WCHAR *releasedate;
const WCHAR *serialnumber;
+ const WCHAR *smbiosbiosversion;
const WCHAR *version;
};
struct record_cdromdrive
{
const WCHAR *device_id;
const WCHAR *drive;
+ const WCHAR *mediatype;
const WCHAR *name;
const WCHAR *pnpdevice_id;
};
@@ -535,9 +622,12 @@
{
const WCHAR *device_id;
UINT32 index;
+ const WCHAR *interfacetype;
const WCHAR *manufacturer;
- const WCHAR *name;
+ const WCHAR *mediatype;
+ const WCHAR *model;
const WCHAR *serialnumber;
+ UINT64 size;
};
struct record_diskpartition
{
@@ -559,32 +649,46 @@
UINT64 freespace;
const WCHAR *name;
UINT64 size;
+ const WCHAR *volumeserialnumber;
};
struct record_networkadapter
{
const WCHAR *adaptertype;
const WCHAR *device_id;
- INT32 interface_index;
+ UINT32 index;
+ UINT32 interface_index;
const WCHAR *mac_address;
const WCHAR *manufacturer;
+ const WCHAR *name;
UINT16 netconnection_status;
int physicaladapter;
const WCHAR *pnpdevice_id;
UINT64 speed;
};
+struct record_networkadapterconfig
+{
+ UINT32 index;
+ UINT32 ipconnectionmetric;
+ int ipenabled;
+ const WCHAR *mac_address;
+};
struct record_operatingsystem
{
+ const WCHAR *buildnumber;
const WCHAR *caption;
const WCHAR *codeset;
const WCHAR *countrycode;
const WCHAR *csdversion;
+ const WCHAR *installdate;
const WCHAR *lastbootuptime;
const WCHAR *localdatetime;
const WCHAR *locale;
+ const WCHAR *name;
const WCHAR *osarchitecture;
UINT32 oslanguage;
UINT32 osproductsuite;
UINT16 ostype;
+ const WCHAR *serialnumber;
UINT16 servicepackmajor;
UINT16 servicepackminor;
UINT32 suitemask;
@@ -600,6 +704,15 @@
UINT32 type;
UINT32 varianttype;
UINT32 defaultvalue;
+};
+struct record_physicalmedia
+{
+ const WCHAR *serialnumber;
+ const WCHAR *tag;
+};
+struct record_physicalmemory
+{
+ UINT64 capacity;
};
struct record_process
{
@@ -670,6 +783,7 @@
{
const WCHAR *adapter_dactype;
UINT32 adapter_ram;
+ UINT16 availability;
UINT32 current_bitsperpixel;
UINT32 current_horizontalres;
UINT32 current_verticalres;
@@ -682,15 +796,12 @@
static const struct record_baseboard data_baseboard[] =
{
- { baseboard_manufacturerW, baseboard_serialnumberW, baseboard_tagW }
+ { baseboard_manufacturerW, baseboard_tagW, baseboard_tagW, baseboard_serialnumberW,
baseboard_tagW }
};
static const struct record_bios data_bios[] =
{
- { bios_descriptionW, bios_manufacturerW, bios_releasedateW, bios_serialnumberW,
bios_versionW }
-};
-static const struct record_diskdrive data_diskdrive[] =
-{
- { diskdrive_deviceidW, 0, diskdrive_manufacturerW, diskdrive_modelW,
diskdrive_serialW }
+ { bios_descriptionW, bios_descriptionW, bios_manufacturerW, bios_releasedateW,
bios_serialnumberW,
+ bios_smbiosbiosversionW, bios_versionW }
};
static const struct record_param data_param[] =
{
@@ -720,6 +831,10 @@
#define FLAVOR_ID (WBEM_FLAVOR_FLAG_PROPAGATE_TO_INSTANCE | WBEM_FLAVOR_NOT_OVERRIDABLE
|\
WBEM_FLAVOR_ORIGIN_PROPAGATED)
+static const struct record_physicalmedia data_physicalmedia[] =
+{
+ { diskdrive_serialW, physicalmedia_tagW }
+};
static const struct record_qualifier data_qualifier[] =
{
{ class_process_getowner_outW, param_userW, CIM_SINT32, FLAVOR_ID, prop_idW, 0 },
@@ -738,12 +853,14 @@
static BOOL match_row( const struct table *table, UINT row, const struct expr *cond, enum
fill_status *status )
{
LONGLONG val;
+ UINT type;
+
if (!cond)
{
*status = FILL_STATUS_UNFILTERED;
return TRUE;
}
- if (eval_cond( table, row, cond, &val ) != S_OK)
+ if (eval_cond( table, row, cond, &val, &type ) != S_OK)
{
*status = FILL_STATUS_FAILED;
return FALSE;
@@ -796,6 +913,7 @@
rec->device_id = cdromdrive_pnpdeviceidW;
sprintfW( drive, fmtW, 'A' + i );
rec->drive = heap_strdupW( drive );
+ rec->mediatype = cdromdrive_mediatypeW;
rec->name = cdromdrive_nameW;
rec->pnpdevice_id = cdromdrive_pnpdeviceidW;
if (!match_row( table, row, cond, &status ))
@@ -1177,10 +1295,12 @@
DWORD drives = GetLogicalDrives();
WIN32_FIND_DATAW data;
HANDLE handle;
- struct dirstack *dirstack = alloc_dirstack(2);
+ struct dirstack *dirstack;
enum fill_status status = FILL_STATUS_UNFILTERED;
if (!resize_table( table, 8, sizeof(*rec) )) return FILL_STATUS_FAILED;
+
+ dirstack = alloc_dirstack(2);
for (i = 0; i < sizeof(drives); i++)
{
@@ -1207,6 +1327,7 @@
if (!resize_table( table, row + 1, sizeof(*rec) ))
{
status = FILL_STATUS_FAILED;
+ FindClose( handle );
goto done;
}
if (!strcmpW( data.cFileName, dotW ) || !strcmpW( data.cFileName,
dotdotW )) continue;
@@ -1216,6 +1337,7 @@
{
if (push_dir( dirstack, new_path, len )) continue;
heap_free( new_path );
+ FindClose( handle );
status = FILL_STATUS_FAILED;
goto done;
}
@@ -1349,16 +1471,6 @@
return status;
}
-static WCHAR *get_filesystem( const WCHAR *root )
-{
- static const WCHAR ntfsW[] = {'N','T','F','S',0};
- WCHAR buffer[MAX_PATH + 1];
-
- if (GetVolumeInformationW( root, NULL, 0, NULL, NULL, NULL, buffer, MAX_PATH + 1 ))
- return heap_strdupW( buffer );
- return heap_strdupW( ntfsW );
-}
-
static UINT64 get_freespace( const WCHAR *dir, UINT64 *disksize )
{
WCHAR root[] =
{'\\','\\','.','\\','A',':',0};
@@ -1378,6 +1490,69 @@
CloseHandle( handle );
}
return free.QuadPart;
+}
+
+static enum fill_status fill_diskdrive( struct table *table, const struct expr *cond )
+{
+ static const WCHAR fmtW[] =
+
{'\\','\\','\\','\\','.','\\','\\','P','H','Y','S','I','C','A','L','D','R','I','V','E','%','u',0};
+ WCHAR device_id[sizeof(fmtW)/sizeof(fmtW[0]) + 10], root[] =
{'A',':','\\',0};
+ struct record_diskdrive *rec;
+ UINT i, row = 0, offset = 0, index = 0, type;
+ UINT64 size = 1024 * 1024 * 1024;
+ DWORD drives = GetLogicalDrives();
+ enum fill_status status = FILL_STATUS_UNFILTERED;
+
+ if (!resize_table( table, 2, sizeof(*rec) )) return FILL_STATUS_FAILED;
+
+ 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 (!resize_table( table, row + 1, sizeof(*rec) )) return
FILL_STATUS_FAILED;
+
+ rec = (struct record_diskdrive *)(table->data + offset);
+ sprintfW( device_id, fmtW, index );
+ rec->device_id = heap_strdupW( device_id );
+ rec->index = index;
+ rec->interfacetype = diskdrive_interfacetypeW;
+ rec->manufacturer = diskdrive_manufacturerW;
+ if (type == DRIVE_FIXED)
+ rec->mediatype = diskdrive_mediatype_fixedW;
+ else
+ rec->mediatype = diskdrive_mediatype_removableW;
+ rec->model = diskdrive_modelW;
+ rec->serialnumber = diskdrive_serialW;
+ get_freespace( root, &size );
+ rec->size = size;
+ if (!match_row( table, row, cond, &status ))
+ {
+ free_row_values( table, row );
+ continue;
+ }
+ offset += sizeof(*rec);
+ index++;
+ row++;
+ }
+ }
+ TRACE("created %u rows\n", row);
+ table->num_rows = row;
+ return status;
+}
+
+static WCHAR *get_filesystem( const WCHAR *root )
+{
+ static const WCHAR ntfsW[] = {'N','T','F','S',0};
+ WCHAR buffer[MAX_PATH + 1];
+
+ if (GetVolumeInformationW( root, NULL, 0, NULL, NULL, NULL, buffer, MAX_PATH + 1 ))
+ return heap_strdupW( buffer );
+ return heap_strdupW( ntfsW );
}
static enum fill_status fill_diskpartition( struct table *table, const struct expr *cond
)
@@ -1431,6 +1606,17 @@
return status;
}
+static WCHAR *get_volumeserialnumber( const WCHAR *root )
+{
+ static const WCHAR fmtW[] = {'%','0','8','X',0};
+ DWORD serial = 0;
+ WCHAR buffer[9];
+
+ GetVolumeInformationW( root, NULL, 0, &serial, NULL, NULL, NULL, 0 );
+ sprintfW( buffer, fmtW, serial );
+ return heap_strdupW( buffer );
+}
+
static enum fill_status fill_logicaldisk( struct table *table, const struct expr *cond )
{
static const WCHAR fmtW[] = {'%','c',':',0};
@@ -1456,12 +1642,13 @@
rec = (struct record_logicaldisk *)(table->data + offset);
sprintfW( device_id, fmtW, 'A' + i );
- rec->device_id = heap_strdupW( device_id );
- rec->drivetype = type;
- rec->filesystem = get_filesystem( root );
- rec->freespace = get_freespace( root, &size );
- rec->name = heap_strdupW( device_id );
- rec->size = size;
+ rec->device_id = heap_strdupW( device_id );
+ rec->drivetype = type;
+ rec->filesystem = get_filesystem( root );
+ rec->freespace = get_freespace( root, &size );
+ rec->name = heap_strdupW( device_id );
+ rec->size = size;
+ rec->volumeserialnumber = get_volumeserialnumber( root );
if (!match_row( table, row, cond, &status ))
{
free_row_values( table, row );
@@ -1538,7 +1725,10 @@
heap_free( buffer );
return FILL_STATUS_FAILED;
}
- for (aa = buffer; aa; aa = aa->Next) count++;
+ for (aa = buffer; aa; aa = aa->Next)
+ {
+ if (aa->IfType != IF_TYPE_SOFTWARE_LOOPBACK) count++;
+ }
if (!resize_table( table, count, sizeof(*rec) ))
{
heap_free( buffer );
@@ -1546,13 +1736,17 @@
}
for (aa = buffer; aa; aa = aa->Next)
{
+ if (aa->IfType == IF_TYPE_SOFTWARE_LOOPBACK) continue;
+
rec = (struct record_networkadapter *)(table->data + offset);
sprintfW( device_id, fmtW, aa->u.s.IfIndex );
rec->adaptertype = get_adaptertype( aa->IfType, &physical );
rec->device_id = heap_strdupW( device_id );
+ rec->index = aa->u.s.IfIndex;
rec->interface_index = aa->u.s.IfIndex;
rec->mac_address = get_mac_address( aa->PhysicalAddress,
aa->PhysicalAddressLength );
rec->manufacturer = compsys_manufacturerW;
+ rec->name = heap_strdupW( aa->FriendlyName );
rec->netconnection_status = get_connection_status( aa->OperStatus );
rec->physicaladapter = physical;
rec->pnpdevice_id = networkadapter_pnpdeviceidW;
@@ -1569,6 +1763,74 @@
table->num_rows = row;
heap_free( buffer );
+ return status;
+}
+
+static enum fill_status fill_networkadapterconfig( struct table *table, const struct expr
*cond )
+{
+ struct record_networkadapterconfig *rec;
+ IP_ADAPTER_ADDRESSES *aa, *buffer;
+ UINT row = 0, offset = 0, count = 0;
+ DWORD size = 0, ret;
+ enum fill_status status = FILL_STATUS_UNFILTERED;
+
+ ret = GetAdaptersAddresses( AF_UNSPEC, 0, NULL, NULL, &size );
+ if (ret != ERROR_BUFFER_OVERFLOW) return FILL_STATUS_FAILED;
+
+ if (!(buffer = heap_alloc( size ))) return FILL_STATUS_FAILED;
+ if (GetAdaptersAddresses( AF_UNSPEC, 0, NULL, buffer, &size ))
+ {
+ heap_free( buffer );
+ return FILL_STATUS_FAILED;
+ }
+ for (aa = buffer; aa; aa = aa->Next)
+ {
+ if (aa->IfType != IF_TYPE_SOFTWARE_LOOPBACK) count++;
+ }
+ if (!resize_table( table, count, sizeof(*rec) ))
+ {
+ heap_free( buffer );
+ return FILL_STATUS_FAILED;
+ }
+ for (aa = buffer; aa; aa = aa->Next)
+ {
+ if (aa->IfType == IF_TYPE_SOFTWARE_LOOPBACK) continue;
+
+ rec = (struct record_networkadapterconfig *)(table->data + offset);
+ rec->index = aa->u.s.IfIndex;
+ rec->ipconnectionmetric = 20;
+ rec->ipenabled = -1;
+ rec->mac_address = get_mac_address( aa->PhysicalAddress,
aa->PhysicalAddressLength );
+ if (!match_row( table, row, cond, &status ))
+ {
+ free_row_values( table, row );
+ continue;
+ }
+ offset += sizeof(*rec);
+ row++;
+ }
+ TRACE("created %u rows\n", row);
+ table->num_rows = row;
+
+ heap_free( buffer );
+ return status;
+}
+
+static enum fill_status fill_physicalmemory( struct table *table, const struct expr *cond
)
+{
+ struct record_physicalmemory *rec;
+ enum fill_status status = FILL_STATUS_UNFILTERED;
+ UINT row = 0;
+
+ if (!resize_table( table, 1, sizeof(*rec) )) return FILL_STATUS_FAILED;
+
+ rec = (struct record_physicalmemory *)table->data;
+ rec->capacity = get_total_physical_memory();
+ if (!match_row( table, row, cond, &status )) free_row_values( table, row );
+ else row++;
+
+ TRACE("created %u rows\n", row);
+ table->num_rows = row;
return status;
}
@@ -1835,17 +2097,21 @@
if (!resize_table( table, 1, sizeof(*rec) )) return FILL_STATUS_FAILED;
rec = (struct record_operatingsystem *)table->data;
+ rec->buildnumber = os_buildnumberW;
rec->caption = os_captionW;
rec->codeset = get_codeset();
rec->countrycode = get_countrycode();
rec->csdversion = os_csdversionW;
+ rec->installdate = os_installdateW;
rec->lastbootuptime = get_lastbootuptime();
rec->localdatetime = get_localdatetime();
rec->locale = get_locale();
+ rec->name = os_nameW;
rec->osarchitecture = get_osarchitecture();
rec->oslanguage = GetSystemDefaultLangID();
rec->osproductsuite = 2461140; /* Windows XP Professional */
rec->ostype = 18; /* WINNT */
+ rec->serialnumber = os_serialnumberW;
rec->servicepackmajor = 3;
rec->servicepackminor = 0;
rec->suitemask = 272; /* Single User + Terminal */
@@ -2073,6 +2339,7 @@
rec = (struct record_videocontroller *)table->data;
rec->adapter_dactype = videocontroller_dactypeW;
rec->adapter_ram = vidmem;
+ rec->availability = 3; /* Running or Full Power */
rec->current_bitsperpixel = get_bits_per_pixel( &hres, &vres );
rec->current_horizontalres = hres;
rec->current_verticalres = vres;
@@ -2099,13 +2366,17 @@
{ class_compsysW, SIZEOF(col_compsys), col_compsys, 0, 0, NULL, fill_compsys },
{ class_datafileW, SIZEOF(col_datafile), col_datafile, 0, 0, NULL, fill_datafile },
{ class_directoryW, SIZEOF(col_directory), col_directory, 0, 0, NULL, fill_directory
},
- { class_diskdriveW, SIZEOF(col_diskdrive), col_diskdrive, SIZEOF(data_diskdrive), 0,
(BYTE *)data_diskdrive },
+ { class_diskdriveW, SIZEOF(col_diskdrive), col_diskdrive, 0, 0, NULL, fill_diskdrive
},
{ class_diskpartitionW, SIZEOF(col_diskpartition), col_diskpartition, 0, 0, NULL,
fill_diskpartition },
{ class_logicaldiskW, SIZEOF(col_logicaldisk), col_logicaldisk, 0, 0, NULL,
fill_logicaldisk },
{ class_logicaldisk2W, SIZEOF(col_logicaldisk), col_logicaldisk, 0, 0, NULL,
fill_logicaldisk },
{ class_networkadapterW, SIZEOF(col_networkadapter), col_networkadapter, 0, 0, NULL,
fill_networkadapter },
+ { class_networkadapterconfigW, SIZEOF(col_networkadapterconfig),
col_networkadapterconfig, 0, 0, NULL,
+ fill_networkadapterconfig },
{ class_osW, SIZEOF(col_os), col_os, 0, 0, NULL, fill_os },
{ class_paramsW, SIZEOF(col_param), col_param, SIZEOF(data_param), 0, (BYTE
*)data_param },
+ { class_physicalmediaW, SIZEOF(col_physicalmedia), col_physicalmedia,
SIZEOF(data_physicalmedia), 0, (BYTE *)data_physicalmedia },
+ { class_physicalmemoryW, SIZEOF(col_physicalmemory), col_physicalmemory, 0, 0, NULL,
fill_physicalmemory },
{ class_processW, SIZEOF(col_process), col_process, 0, 0, NULL, fill_process },
{ class_processorW, SIZEOF(col_processor), col_processor, 0, 0, NULL, fill_processor
},
{ class_qualifiersW, SIZEOF(col_qualifier), col_qualifier, SIZEOF(data_qualifier), 0,
(BYTE *)data_qualifier },
Modified: trunk/reactos/dll/win32/wbemprox/class.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/class.c…
==============================================================================
--- trunk/reactos/dll/win32/wbemprox/class.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wbemprox/class.c [iso-8859-1] Sat Apr 26 17:12:58 2014
@@ -139,7 +139,7 @@
TRACE("%p, %p\n", iface, ppEnum);
- return EnumWbemClassObject_create( NULL, ec->query, (void **)ppEnum );
+ return EnumWbemClassObject_create( ec->query, (void **)ppEnum );
}
static HRESULT WINAPI enum_class_object_Skip(
@@ -177,12 +177,11 @@
enum_class_object_Skip
};
-HRESULT EnumWbemClassObject_create(
- IUnknown *pUnkOuter, struct query *query, LPVOID *ppObj )
+HRESULT EnumWbemClassObject_create( struct query *query, LPVOID *ppObj )
{
struct enum_class_object *ec;
- TRACE("%p, %p\n", pUnkOuter, ppObj);
+ TRACE("%p\n", ppObj);
ec = heap_alloc( sizeof(*ec) );
if (!ec) return E_OUTOFMEMORY;
@@ -464,17 +463,17 @@
TRACE("%p, %s, %08x, %s, %p\n", iface, debugstr_w(wszQualifierName),
lFlags,
debugstr_variant(pQualifierVal), pNames);
- if (wszQualifierName || pQualifierVal)
- {
- FIXME("qualifier not supported\n");
- return E_NOTIMPL;
- }
- if (lFlags != WBEM_FLAG_ALWAYS)
+ if (lFlags != WBEM_FLAG_ALWAYS &&
+ lFlags != WBEM_FLAG_NONSYSTEM_ONLY &&
+ lFlags != WBEM_FLAG_SYSTEM_ONLY)
{
FIXME("flags %08x not supported\n", lFlags);
return E_NOTIMPL;
}
- return get_properties( ec->query->view, pNames );
+ if (wszQualifierName || pQualifierVal)
+ FIXME("qualifier not supported\n");
+
+ return get_properties( ec->query->view, lFlags, pNames );
}
static HRESULT WINAPI class_object_BeginEnumeration(
@@ -538,7 +537,7 @@
TRACE("%p, %s, %p\n", iface, debugstr_w(wszProperty), ppQualSet);
- return WbemQualifierSet_create( NULL, co->name, wszProperty, (void **)ppQualSet
);
+ return WbemQualifierSet_create( co->name, wszProperty, (void **)ppQualSet );
}
static HRESULT WINAPI class_object_Clone(
Modified: trunk/reactos/dll/win32/wbemprox/main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/main.c?…
==============================================================================
--- trunk/reactos/dll/win32/wbemprox/main.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wbemprox/main.c [iso-8859-1] Sat Apr 26 17:12:58 2014
@@ -24,7 +24,7 @@
static HINSTANCE instance;
-typedef HRESULT (*fnCreateInstance)( IUnknown *pUnkOuter, LPVOID *ppObj );
+typedef HRESULT (*fnCreateInstance)( LPVOID *ppObj );
typedef struct
{
@@ -74,14 +74,11 @@
if (pOuter)
return CLASS_E_NOAGGREGATION;
- r = This->pfnCreateInstance( pOuter, (LPVOID *)&punk );
+ r = This->pfnCreateInstance( (LPVOID *)&punk );
if (FAILED(r))
return r;
r = IUnknown_QueryInterface( punk, riid, ppobj );
- if (FAILED(r))
- return r;
-
IUnknown_Release( punk );
return r;
}
Modified: trunk/reactos/dll/win32/wbemprox/qualifier.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/qualifi…
==============================================================================
--- trunk/reactos/dll/win32/wbemprox/qualifier.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wbemprox/qualifier.c [iso-8859-1] Sat Apr 26 17:12:58 2014
@@ -234,12 +234,11 @@
qualifier_set_EndEnumeration
};
-HRESULT WbemQualifierSet_create(
- IUnknown *pUnkOuter, const WCHAR *class, const WCHAR *member, LPVOID *ppObj )
+HRESULT WbemQualifierSet_create( const WCHAR *class, const WCHAR *member, LPVOID *ppObj
)
{
struct qualifier_set *set;
- TRACE("%p, %p\n", pUnkOuter, ppObj);
+ TRACE("%p\n", ppObj);
if (!(set = heap_alloc( sizeof(*set) ))) return E_OUTOFMEMORY;
Modified: trunk/reactos/dll/win32/wbemprox/query.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/query.c…
==============================================================================
--- trunk/reactos/dll/win32/wbemprox/query.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wbemprox/query.c [iso-8859-1] Sat Apr 26 17:12:58 2014
@@ -102,15 +102,93 @@
(expr->left->type == EXPR_SVAL && expr->right->type ==
EXPR_PROPVAL));
}
+static inline BOOL is_boolcmp( const struct complex_expr *expr, UINT ltype, UINT rtype )
+{
+ if (ltype == CIM_BOOLEAN && expr->left->type == EXPR_PROPVAL
&&
+ (expr->right->type == EXPR_SVAL || expr->right->type == EXPR_BVAL))
return TRUE;
+ else if (rtype == CIM_BOOLEAN && expr->right->type == EXPR_PROPVAL
&&
+ (expr->left->type == EXPR_SVAL || expr->left->type ==
EXPR_BVAL)) return TRUE;
+ return FALSE;
+}
+
+static HRESULT eval_boolcmp( UINT op, LONGLONG lval, LONGLONG rval, UINT ltype, UINT
rtype, LONGLONG *val )
+{
+ static const WCHAR trueW[] = {'T','r','u','e',0};
+
+ if (ltype == CIM_STRING) lval = !strcmpiW( (const WCHAR *)(INT_PTR)lval, trueW ) ? -1
: 0;
+ else if (rtype == CIM_STRING) rval = !strcmpiW( (const WCHAR *)(INT_PTR)rval, trueW )
? -1 : 0;
+
+ switch (op)
+ {
+ case OP_EQ:
+ *val = (lval == rval);
+ break;
+ case OP_NE:
+ *val = (lval != rval);
+ break;
+ default:
+ ERR("unhandled operator %u\n", op);
+ return WBEM_E_INVALID_QUERY;
+ }
+ return S_OK;
+}
+
+static UINT resolve_type( UINT left, UINT right )
+{
+ switch (left)
+ {
+ case CIM_SINT8:
+ case CIM_SINT16:
+ case CIM_SINT32:
+ case CIM_SINT64:
+ case CIM_UINT8:
+ case CIM_UINT16:
+ case CIM_UINT32:
+ case CIM_UINT64:
+ switch (right)
+ {
+ case CIM_SINT8:
+ case CIM_SINT16:
+ case CIM_SINT32:
+ case CIM_SINT64:
+ case CIM_UINT8:
+ case CIM_UINT16:
+ case CIM_UINT32:
+ case CIM_UINT64:
+ return CIM_UINT64;
+ default: break;
+ }
+ break;
+
+ case CIM_STRING:
+ if (right == CIM_STRING) return CIM_STRING;
+ break;
+
+ case CIM_BOOLEAN:
+ if (right == CIM_BOOLEAN) return CIM_BOOLEAN;
+ break;
+
+ default:
+ break;
+ }
+ return CIM_ILLEGAL;
+}
+
static HRESULT eval_binary( const struct table *table, UINT row, const struct
complex_expr *expr,
- LONGLONG *val )
+ LONGLONG *val, UINT *type )
{
HRESULT lret, rret;
LONGLONG lval, rval;
-
- lret = eval_cond( table, row, expr->left, &lval );
- rret = eval_cond( table, row, expr->right, &rval );
+ UINT ltype, rtype;
+
+ lret = eval_cond( table, row, expr->left, &lval, <ype );
+ rret = eval_cond( table, row, expr->right, &rval, &rtype );
if (lret != S_OK || rret != S_OK) return WBEM_E_INVALID_QUERY;
+
+ *type = resolve_type( ltype, rtype );
+
+ if (is_boolcmp( expr, ltype, rtype ))
+ return eval_boolcmp( expr->op, lval, rval, ltype, rtype, val );
if (is_strcmp( expr ))
{
@@ -153,13 +231,22 @@
}
static HRESULT eval_unary( const struct table *table, UINT row, const struct complex_expr
*expr,
- LONGLONG *val )
+ LONGLONG *val, UINT *type )
{
HRESULT hr;
UINT column;
LONGLONG lval;
+ if (expr->op == OP_NOT)
+ {
+ hr = eval_cond( table, row, expr->left, &lval, type );
+ if (hr != S_OK)
+ return hr;
+ *val = !lval;
+ return S_OK;
+ }
+
hr = get_column_index( table, expr->left->u.propval->name, &column );
if (hr != S_OK)
return hr;
@@ -180,11 +267,13 @@
ERR("unknown operator %u\n", expr->op);
return WBEM_E_INVALID_QUERY;
}
+
+ *type = table->columns[column].type & CIM_TYPE_MASK;
return S_OK;
}
static HRESULT eval_propval( const struct table *table, UINT row, const struct property
*propval,
- LONGLONG *val )
+ LONGLONG *val, UINT *type )
{
HRESULT hr;
@@ -194,31 +283,44 @@
if (hr != S_OK)
return hr;
+ *type = table->columns[column].type & CIM_TYPE_MASK;
return get_value( table, row, column, val );
}
-HRESULT eval_cond( const struct table *table, UINT row, const struct expr *cond, LONGLONG
*val )
+HRESULT eval_cond( const struct table *table, UINT row, const struct expr *cond, LONGLONG
*val, UINT *type )
{
if (!cond)
{
*val = 1;
+ *type = CIM_UINT64;
return S_OK;
}
switch (cond->type)
{
case EXPR_COMPLEX:
- return eval_binary( table, row, &cond->u.expr, val );
+ return eval_binary( table, row, &cond->u.expr, val, type );
+
case EXPR_UNARY:
- return eval_unary( table, row, &cond->u.expr, val );
+ return eval_unary( table, row, &cond->u.expr, val, type );
+
case EXPR_PROPVAL:
- return eval_propval( table, row, cond->u.propval, val );
+ return eval_propval( table, row, cond->u.propval, val, type );
+
case EXPR_SVAL:
*val = (INT_PTR)cond->u.sval;
- return S_OK;
+ *type = CIM_STRING;
+ return S_OK;
+
case EXPR_IVAL:
+ *val = cond->u.ival;
+ *type = CIM_UINT64;
+ return S_OK;
+
case EXPR_BVAL:
*val = cond->u.ival;
- return S_OK;
+ *type = CIM_BOOLEAN;
+ return S_OK;
+
default:
ERR("invalid expression type\n");
break;
@@ -245,6 +347,7 @@
{
HRESULT hr;
LONGLONG val = 0;
+ UINT type;
if (j >= len)
{
@@ -253,7 +356,7 @@
if (!(tmp = heap_realloc( view->result, len * sizeof(UINT) ))) return
E_OUTOFMEMORY;
view->result = tmp;
}
- if ((hr = eval_cond( view->table, i, view->cond, &val )) != S_OK)
return hr;
+ if ((hr = eval_cond( view->table, i, view->cond, &val, &type )) !=
S_OK) return hr;
if (val) view->result[j++] = i;
}
view->count = j;
@@ -302,7 +405,7 @@
if (hr != S_OK) goto done;
hr = execute_view( query->view );
if (hr != S_OK) goto done;
- hr = EnumWbemClassObject_create( NULL, query, (void **)result );
+ hr = EnumWbemClassObject_create( query, (void **)result );
done:
release_query( query );
@@ -844,7 +947,7 @@
return set_value( view->table, row, column, val, type );
}
-HRESULT get_properties( const struct view *view, SAFEARRAY **props )
+HRESULT get_properties( const struct view *view, LONG flags, SAFEARRAY **props )
{
SAFEARRAY *sa;
BSTR str;
@@ -855,7 +958,13 @@
for (i = 0; i < view->table->num_cols; i++)
{
+ BOOL is_system;
+
if (is_method( view->table, i )) continue;
+
+ is_system = is_system_prop( view->table->columns[i].name );
+ if ((flags & WBEM_FLAG_NONSYSTEM_ONLY) && is_system) continue;
+ else if ((flags & WBEM_FLAG_SYSTEM_ONLY) && !is_system) continue;
str = SysAllocString( view->table->columns[i].name );
if (!str || SafeArrayPutElement( sa, &i, str ) != S_OK)
Modified: trunk/reactos/dll/win32/wbemprox/services.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/service…
==============================================================================
--- trunk/reactos/dll/win32/wbemprox/services.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wbemprox/services.c [iso-8859-1] Sat Apr 26 17:12:58 2014
@@ -268,7 +268,7 @@
if ((strcmpiW( strNamespace, cimv2W ) && strcmpiW( strNamespace, defaultW ))
|| ws->namespace)
return WBEM_E_INVALID_NAMESPACE;
- return WbemServices_create( NULL, cimv2W, (void **)ppWorkingNamespace );
+ return WbemServices_create( cimv2W, (void **)ppWorkingNamespace );
}
static HRESULT WINAPI wbem_services_CancelAsyncCall(
@@ -802,7 +802,7 @@
hr = execute_view( query->view );
if (hr != S_OK) goto done;
- hr = EnumWbemClassObject_create( NULL, query, (void **)&result );
+ hr = EnumWbemClassObject_create( query, (void **)&result );
if (hr != S_OK) goto done;
hr = create_class_object( query->view->table->name, result, 0, NULL,
&obj );
@@ -865,11 +865,11 @@
wbem_services_ExecMethodAsync
};
-HRESULT WbemServices_create( IUnknown *pUnkOuter, const WCHAR *namespace, LPVOID *ppObj
)
+HRESULT WbemServices_create( const WCHAR *namespace, LPVOID *ppObj )
{
struct wbem_services *ws;
- TRACE("(%p,%p)\n", pUnkOuter, ppObj);
+ TRACE("(%p)\n", ppObj);
ws = heap_alloc( sizeof(*ws) );
if (!ws) return E_OUTOFMEMORY;
Modified: trunk/reactos/dll/win32/wbemprox/wbemlocator.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/wbemloc…
==============================================================================
--- trunk/reactos/dll/win32/wbemprox/wbemlocator.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wbemprox/wbemlocator.c [iso-8859-1] Sat Apr 26 17:12:58 2014
@@ -180,7 +180,7 @@
if (SecurityFlags)
FIXME("unsupported flags\n");
- hr = WbemServices_create( NULL, namespace, (void **)ppNamespace );
+ hr = WbemServices_create( namespace, (void **)ppNamespace );
heap_free( namespace );
heap_free( server );
if (SUCCEEDED( hr ))
@@ -197,11 +197,11 @@
wbem_locator_ConnectServer
};
-HRESULT WbemLocator_create( IUnknown *pUnkOuter, LPVOID *ppObj )
+HRESULT WbemLocator_create( LPVOID *ppObj )
{
wbem_locator *wl;
- TRACE("(%p,%p)\n", pUnkOuter, ppObj);
+ TRACE("(%p)\n", ppObj);
wl = heap_alloc( sizeof(*wl) );
if (!wl) return E_OUTOFMEMORY;
Modified: trunk/reactos/dll/win32/wbemprox/wbemprox.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/wbempro…
==============================================================================
--- trunk/reactos/dll/win32/wbemprox/wbemprox.idl [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wbemprox/wbemprox.idl [iso-8859-1] Sat Apr 26 17:12:58 2014
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#pragma makedep register
+
[
helpstring("WBEM Locator"),
threading(both),
Modified: trunk/reactos/dll/win32/wbemprox/wbemprox_private.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/wbempro…
==============================================================================
--- trunk/reactos/dll/win32/wbemprox/wbemprox_private.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wbemprox/wbemprox_private.h [iso-8859-1] Sat Apr 26 17:12:58
2014
@@ -78,7 +78,8 @@
OP_NE = 8,
OP_ISNULL = 9,
OP_NOTNULL = 10,
- OP_LIKE = 11
+ OP_LIKE = 11,
+ OP_NOT = 12
};
struct expr;
@@ -211,7 +212,7 @@
void clear_table( struct table * ) DECLSPEC_HIDDEN;
void free_table( struct table * ) DECLSPEC_HIDDEN;
UINT get_type_size( CIMTYPE ) DECLSPEC_HIDDEN;
-HRESULT eval_cond( const struct table *, UINT, const struct expr *, LONGLONG * )
DECLSPEC_HIDDEN;
+HRESULT eval_cond( const struct table *, UINT, const struct expr *, LONGLONG *, UINT * )
DECLSPEC_HIDDEN;
HRESULT get_column_index( const struct table *, const WCHAR *, UINT * ) DECLSPEC_HIDDEN;
HRESULT get_value( const struct table *, UINT, UINT, LONGLONG * ) DECLSPEC_HIDDEN;
BSTR get_value_bstr( const struct table *, UINT, UINT ) DECLSPEC_HIDDEN;
@@ -224,7 +225,7 @@
SAFEARRAY *to_safearray( const struct array *, CIMTYPE ) DECLSPEC_HIDDEN;
VARTYPE to_vartype( CIMTYPE ) DECLSPEC_HIDDEN;
void destroy_array( struct array *, CIMTYPE ) DECLSPEC_HIDDEN;
-HRESULT get_properties( const struct view *, SAFEARRAY ** ) DECLSPEC_HIDDEN;
+HRESULT get_properties( const struct view *, LONG, SAFEARRAY ** ) DECLSPEC_HIDDEN;
HRESULT get_object( const WCHAR *, IWbemClassObject ** ) DECLSPEC_HIDDEN;
BSTR get_method_name( const WCHAR *, UINT ) DECLSPEC_HIDDEN;
BSTR get_property_name( const WCHAR *, UINT ) DECLSPEC_HIDDEN;
@@ -232,12 +233,12 @@
HRESULT create_signature( const WCHAR *, const WCHAR *, enum param_direction,
IWbemClassObject ** ) DECLSPEC_HIDDEN;
-HRESULT WbemLocator_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN;
-HRESULT WbemServices_create(IUnknown *, const WCHAR *, LPVOID *) DECLSPEC_HIDDEN;
+HRESULT WbemLocator_create(LPVOID *) DECLSPEC_HIDDEN;
+HRESULT WbemServices_create(const WCHAR *, LPVOID *) DECLSPEC_HIDDEN;
HRESULT create_class_object(const WCHAR *, IEnumWbemClassObject *, UINT,
struct record *, IWbemClassObject **) DECLSPEC_HIDDEN;
-HRESULT EnumWbemClassObject_create(IUnknown *, struct query *, LPVOID *)
DECLSPEC_HIDDEN;
-HRESULT WbemQualifierSet_create(IUnknown *, const WCHAR *, const WCHAR *, LPVOID *)
DECLSPEC_HIDDEN;
+HRESULT EnumWbemClassObject_create(struct query *, LPVOID *) DECLSPEC_HIDDEN;
+HRESULT WbemQualifierSet_create(const WCHAR *, const WCHAR *, LPVOID *) DECLSPEC_HIDDEN;
HRESULT process_get_owner(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **)
DECLSPEC_HIDDEN;
HRESULT reg_enum_key(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **)
DECLSPEC_HIDDEN;
Modified: trunk/reactos/dll/win32/wbemprox/wql.tab.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/wql.tab…
==============================================================================
--- trunk/reactos/dll/win32/wbemprox/wql.tab.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wbemprox/wql.tab.c [iso-8859-1] Sat Apr 26 17:12:58 2014
@@ -560,16 +560,16 @@
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 9
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 67
+#define YYLAST 68
/* YYNTOKENS -- Number of terminals. */
#define YYNTOKENS 32
/* YYNNTS -- Number of nonterminals. */
#define YYNNTS 10
/* YYNRULES -- Number of rules. */
-#define YYNRULES 35
+#define YYNRULES 36
/* YYNRULES -- Number of states. */
-#define YYNSTATES 65
+#define YYNSTATES 67
/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
#define YYUNDEFTOK 2
@@ -618,9 +618,9 @@
static const yytype_uint8 yyprhs[] =
{
0, 0, 3, 7, 12, 19, 21, 25, 27, 31,
- 33, 35, 37, 41, 45, 49, 53, 57, 61, 65,
- 69, 73, 77, 81, 85, 89, 93, 97, 101, 105,
- 110, 112, 114, 116, 118, 120
+ 33, 35, 37, 41, 45, 49, 52, 56, 60, 64,
+ 68, 72, 76, 80, 84, 88, 92, 96, 100, 104,
+ 108, 113, 115, 117, 119, 121, 123
};
/* YYRHS -- A `-1'-separated list of the rules' RHS. */
@@ -630,15 +630,15 @@
36, -1, 3, 34, 4, 36, 15, 38, -1, 35,
-1, 35, 6, 34, -1, 5, -1, 36, 7, 36,
-1, 36, -1, 21, -1, 14, -1, 9, 38, 10,
- -1, 38, 23, 38, -1, 38, 22, 38, -1, 40,
- 31, 41, -1, 40, 28, 41, -1, 40, 29, 41,
- -1, 40, 27, 41, -1, 40, 26, 41, -1, 40,
- 30, 41, -1, 41, 31, 40, -1, 41, 28, 40,
- -1, 41, 29, 40, -1, 41, 27, 40, -1, 41,
- 26, 40, -1, 41, 30, 40, -1, 40, 25, 39,
- -1, 40, 8, 11, -1, 40, 8, 24, 11, -1,
- 20, -1, 35, -1, 37, -1, 20, -1, 13, -1,
- 12, -1
+ -1, 38, 23, 38, -1, 38, 22, 38, -1, 24,
+ 38, -1, 40, 31, 41, -1, 40, 28, 41, -1,
+ 40, 29, 41, -1, 40, 27, 41, -1, 40, 26,
+ 41, -1, 40, 30, 41, -1, 41, 31, 40, -1,
+ 41, 28, 40, -1, 41, 29, 40, -1, 41, 27,
+ 40, -1, 41, 26, 40, -1, 41, 30, 40, -1,
+ 40, 25, 39, -1, 40, 8, 11, -1, 40, 8,
+ 24, 11, -1, 20, -1, 35, -1, 37, -1, 20,
+ -1, 13, -1, 12, -1
};
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
@@ -647,7 +647,7 @@
0, 221, 221, 233, 245, 260, 261, 265, 272, 278,
287, 296, 303, 309, 315, 321, 327, 333, 339, 345,
351, 357, 363, 369, 375, 381, 387, 393, 399, 405,
- 414, 423, 432, 438, 444, 450
+ 411, 420, 429, 438, 444, 450, 456
};
#endif
@@ -684,16 +684,16 @@
0, 32, 33, 33, 33, 34, 34, 34, 35, 35,
36, 37, 38, 38, 38, 38, 38, 38, 38, 38,
38, 38, 38, 38, 38, 38, 38, 38, 38, 38,
- 39, 40, 41, 41, 41, 41
+ 38, 39, 40, 41, 41, 41, 41
};
/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
static const yytype_uint8 yyr2[] =
{
0, 2, 3, 4, 6, 1, 3, 1, 3, 1,
- 1, 1, 3, 3, 3, 3, 3, 3, 3, 3,
- 3, 3, 3, 3, 3, 3, 3, 3, 3, 4,
- 1, 1, 1, 1, 1, 1
+ 1, 1, 3, 3, 3, 2, 3, 3, 3, 3,
+ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+ 4, 1, 1, 1, 1, 1, 1
};
/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
@@ -702,38 +702,38 @@
static const yytype_uint8 yydefact[] =
{
0, 0, 0, 0, 7, 10, 0, 5, 9, 1,
- 2, 0, 0, 0, 3, 6, 8, 0, 0, 35,
- 34, 11, 33, 31, 32, 4, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 12, 14, 13, 28, 0,
- 30, 27, 19, 18, 16, 17, 20, 15, 25, 24,
- 22, 23, 26, 21, 29
+ 2, 0, 0, 0, 3, 6, 8, 0, 0, 36,
+ 35, 11, 34, 0, 32, 33, 4, 0, 0, 0,
+ 15, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 12, 14, 13,
+ 29, 0, 31, 28, 20, 19, 17, 18, 21, 16,
+ 26, 25, 23, 24, 27, 22, 30
};
/* YYDEFGOTO[NTERM-NUM]. */
static const yytype_int8 yydefgoto[] =
{
- -1, 2, 6, 23, 8, 24, 25, 51, 26, 27
+ -1, 2, 6, 24, 8, 25, 26, 53, 27, 28
};
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
STATE-NUM. */
-#define YYPACT_NINF -20
+#define YYPACT_NINF -18
static const yytype_int8 yypact[] =
{
- 2, 3, 6, -10, -20, -20, 24, 31, 33, -20,
- -20, -10, 4, -10, 26, -20, -20, 18, 18, -20,
- -20, -20, -20, -20, -20, -19, -8, 20, -9, 18,
- 18, 5, 23, 22, 22, 22, 22, 22, 22, -10,
- -10, -10, -10, -10, -10, -20, 41, -20, -20, 54,
- -20, -20, -20, -20, -20, -20, -20, -20, -20, -20,
- -20, -20, -20, -20, -20
+ 7, 3, 12, -5, -18, -18, 31, 30, 21, -18,
+ -18, -5, 4, -5, 28, -18, -18, 17, 17, -18,
+ -18, -18, -18, 17, -18, -18, 11, -8, 24, 22,
+ -18, 17, 17, 16, 26, -9, -9, -9, -9, -9,
+ -9, -5, -5, -5, -5, -5, -5, -18, 19, -18,
+ -18, 37, -18, -18, -18, -18, -18, -18, -18, -18,
+ -18, -18, -18, -18, -18, -18, -18
};
/* YYPGOTO[NTERM-NUM]. */
static const yytype_int8 yypgoto[] =
{
- -20, -20, 55, 14, -1, -20, 15, -20, 13, 25
+ -18, -18, 56, 1, 36, -18, -17, -18, 15, 27
};
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
@@ -742,30 +742,30 @@
#define YYTABLE_NINF -1
static const yytype_uint8 yytable[] =
{
- 31, 45, 10, 29, 30, 1, 9, 3, 4, 4,
- 14, 5, 16, 29, 30, 7, 48, 32, 33, 34,
- 35, 36, 37, 38, 5, 5, 7, 18, 11, 49,
- 19, 20, 21, 28, 19, 20, 21, 12, 22, 5,
- 13, 17, 22, 50, 46, 47, 39, 40, 41, 42,
- 43, 44, 58, 59, 60, 61, 62, 63, 52, 53,
- 54, 55, 56, 57, 30, 64, 0, 15
+ 33, 29, 7, 19, 20, 21, 30, 3, 4, 4,
+ 1, 22, 9, 7, 48, 49, 5, 34, 35, 36,
+ 37, 38, 39, 40, 5, 5, 18, 50, 13, 19,
+ 20, 21, 47, 31, 32, 11, 12, 22, 5, 10,
+ 51, 23, 32, 17, 31, 32, 52, 14, 66, 16,
+ 41, 42, 43, 44, 45, 46, 60, 61, 62, 63,
+ 64, 65, 54, 55, 56, 57, 58, 59, 15
};
#define yypact_value_is_default(yystate) \
- ((yystate) == (-20))
+ ((yystate) == (-18))
#define yytable_value_is_error(yytable_value) \
YYID (0)
-static const yytype_int8 yycheck[] =
-{
- 8, 10, 3, 22, 23, 3, 0, 4, 5, 5,
- 11, 21, 13, 22, 23, 1, 11, 25, 26, 27,
- 28, 29, 30, 31, 21, 21, 12, 9, 4, 24,
- 12, 13, 14, 18, 12, 13, 14, 6, 20, 21,
- 7, 15, 20, 20, 29, 30, 26, 27, 28, 29,
- 30, 31, 39, 40, 41, 42, 43, 44, 33, 34,
- 35, 36, 37, 38, 23, 11, -1, 12
+static const yytype_uint8 yycheck[] =
+{
+ 8, 18, 1, 12, 13, 14, 23, 4, 5, 5,
+ 3, 20, 0, 12, 31, 32, 21, 25, 26, 27,
+ 28, 29, 30, 31, 21, 21, 9, 11, 7, 12,
+ 13, 14, 10, 22, 23, 4, 6, 20, 21, 3,
+ 24, 24, 23, 15, 22, 23, 20, 11, 11, 13,
+ 26, 27, 28, 29, 30, 31, 41, 42, 43, 44,
+ 45, 46, 35, 36, 37, 38, 39, 40, 12
};
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -774,11 +774,11 @@
{
0, 3, 33, 4, 5, 21, 34, 35, 36, 0,
36, 4, 6, 7, 36, 34, 36, 15, 9, 12,
- 13, 14, 20, 35, 37, 38, 40, 41, 38, 22,
- 23, 8, 25, 26, 27, 28, 29, 30, 31, 26,
- 27, 28, 29, 30, 31, 10, 38, 38, 11, 24,
- 20, 39, 41, 41, 41, 41, 41, 41, 40, 40,
- 40, 40, 40, 40, 11
+ 13, 14, 20, 24, 35, 37, 38, 40, 41, 38,
+ 38, 22, 23, 8, 25, 26, 27, 28, 29, 30,
+ 31, 26, 27, 28, 29, 30, 31, 10, 38, 38,
+ 11, 24, 20, 39, 41, 41, 41, 41, 41, 41,
+ 40, 40, 40, 40, 40, 40, 11
};
#define yyerrok (yyerrstatus = 0)
@@ -1766,16 +1766,27 @@
/* Line 1806 of yacc.c */
#line 322 "wql.y"
{
+ (yyval.expr) = expr_unary( ctx, (yyvsp[(2) - (2)].expr), OP_NOT );
+ if (!(yyval.expr))
+ YYABORT;
+ }
+ break;
+
+ case 16:
+
+/* Line 1806 of yacc.c */
+#line 328 "wql.y"
+ {
(yyval.expr) = expr_complex( ctx, (yyvsp[(1) - (3)].expr), OP_EQ, (yyvsp[(3)
- (3)].expr) );
if (!(yyval.expr))
YYABORT;
}
break;
- case 16:
-
-/* Line 1806 of yacc.c */
-#line 328 "wql.y"
+ case 17:
+
+/* Line 1806 of yacc.c */
+#line 334 "wql.y"
{
(yyval.expr) = expr_complex( ctx, (yyvsp[(1) - (3)].expr), OP_GT, (yyvsp[(3)
- (3)].expr) );
if (!(yyval.expr))
@@ -1783,10 +1794,10 @@
}
break;
- case 17:
-
-/* Line 1806 of yacc.c */
-#line 334 "wql.y"
+ case 18:
+
+/* Line 1806 of yacc.c */
+#line 340 "wql.y"
{
(yyval.expr) = expr_complex( ctx, (yyvsp[(1) - (3)].expr), OP_LT, (yyvsp[(3)
- (3)].expr) );
if (!(yyval.expr))
@@ -1794,10 +1805,10 @@
}
break;
- case 18:
-
-/* Line 1806 of yacc.c */
-#line 340 "wql.y"
+ case 19:
+
+/* Line 1806 of yacc.c */
+#line 346 "wql.y"
{
(yyval.expr) = expr_complex( ctx, (yyvsp[(1) - (3)].expr), OP_LE, (yyvsp[(3)
- (3)].expr) );
if (!(yyval.expr))
@@ -1805,10 +1816,10 @@
}
break;
- case 19:
-
-/* Line 1806 of yacc.c */
-#line 346 "wql.y"
+ case 20:
+
+/* Line 1806 of yacc.c */
+#line 352 "wql.y"
{
(yyval.expr) = expr_complex( ctx, (yyvsp[(1) - (3)].expr), OP_GE, (yyvsp[(3)
- (3)].expr) );
if (!(yyval.expr))
@@ -1816,10 +1827,10 @@
}
break;
- case 20:
-
-/* Line 1806 of yacc.c */
-#line 352 "wql.y"
+ case 21:
+
+/* Line 1806 of yacc.c */
+#line 358 "wql.y"
{
(yyval.expr) = expr_complex( ctx, (yyvsp[(1) - (3)].expr), OP_NE, (yyvsp[(3)
- (3)].expr) );
if (!(yyval.expr))
@@ -1827,10 +1838,10 @@
}
break;
- case 21:
-
-/* Line 1806 of yacc.c */
-#line 358 "wql.y"
+ case 22:
+
+/* Line 1806 of yacc.c */
+#line 364 "wql.y"
{
(yyval.expr) = expr_complex( ctx, (yyvsp[(1) - (3)].expr), OP_EQ, (yyvsp[(3)
- (3)].expr) );
if (!(yyval.expr))
@@ -1838,10 +1849,10 @@
}
break;
- case 22:
-
-/* Line 1806 of yacc.c */
-#line 364 "wql.y"
+ case 23:
+
+/* Line 1806 of yacc.c */
+#line 370 "wql.y"
{
(yyval.expr) = expr_complex( ctx, (yyvsp[(1) - (3)].expr), OP_GT, (yyvsp[(3)
- (3)].expr) );
if (!(yyval.expr))
@@ -1849,10 +1860,10 @@
}
break;
- case 23:
-
-/* Line 1806 of yacc.c */
-#line 370 "wql.y"
+ case 24:
+
+/* Line 1806 of yacc.c */
+#line 376 "wql.y"
{
(yyval.expr) = expr_complex( ctx, (yyvsp[(1) - (3)].expr), OP_LT, (yyvsp[(3)
- (3)].expr) );
if (!(yyval.expr))
@@ -1860,10 +1871,10 @@
}
break;
- case 24:
-
-/* Line 1806 of yacc.c */
-#line 376 "wql.y"
+ case 25:
+
+/* Line 1806 of yacc.c */
+#line 382 "wql.y"
{
(yyval.expr) = expr_complex( ctx, (yyvsp[(1) - (3)].expr), OP_LE, (yyvsp[(3)
- (3)].expr) );
if (!(yyval.expr))
@@ -1871,10 +1882,10 @@
}
break;
- case 25:
-
-/* Line 1806 of yacc.c */
-#line 382 "wql.y"
+ case 26:
+
+/* Line 1806 of yacc.c */
+#line 388 "wql.y"
{
(yyval.expr) = expr_complex( ctx, (yyvsp[(1) - (3)].expr), OP_GE, (yyvsp[(3)
- (3)].expr) );
if (!(yyval.expr))
@@ -1882,10 +1893,10 @@
}
break;
- case 26:
-
-/* Line 1806 of yacc.c */
-#line 388 "wql.y"
+ case 27:
+
+/* Line 1806 of yacc.c */
+#line 394 "wql.y"
{
(yyval.expr) = expr_complex( ctx, (yyvsp[(1) - (3)].expr), OP_NE, (yyvsp[(3)
- (3)].expr) );
if (!(yyval.expr))
@@ -1893,10 +1904,10 @@
}
break;
- case 27:
-
-/* Line 1806 of yacc.c */
-#line 394 "wql.y"
+ case 28:
+
+/* Line 1806 of yacc.c */
+#line 400 "wql.y"
{
(yyval.expr) = expr_complex( ctx, (yyvsp[(1) - (3)].expr), OP_LIKE,
(yyvsp[(3) - (3)].expr) );
if (!(yyval.expr))
@@ -1904,10 +1915,10 @@
}
break;
- case 28:
-
-/* Line 1806 of yacc.c */
-#line 400 "wql.y"
+ case 29:
+
+/* Line 1806 of yacc.c */
+#line 406 "wql.y"
{
(yyval.expr) = expr_unary( ctx, (yyvsp[(1) - (3)].expr), OP_ISNULL );
if (!(yyval.expr))
@@ -1915,10 +1926,10 @@
}
break;
- case 29:
-
-/* Line 1806 of yacc.c */
-#line 406 "wql.y"
+ case 30:
+
+/* Line 1806 of yacc.c */
+#line 412 "wql.y"
{
(yyval.expr) = expr_unary( ctx, (yyvsp[(1) - (4)].expr), OP_NOTNULL );
if (!(yyval.expr))
@@ -1926,10 +1937,10 @@
}
break;
- case 30:
-
-/* Line 1806 of yacc.c */
-#line 415 "wql.y"
+ case 31:
+
+/* Line 1806 of yacc.c */
+#line 421 "wql.y"
{
(yyval.expr) = expr_sval( ctx, &(yyvsp[(1) - (1)].str) );
if (!(yyval.expr))
@@ -1937,10 +1948,10 @@
}
break;
- case 31:
-
-/* Line 1806 of yacc.c */
-#line 424 "wql.y"
+ case 32:
+
+/* Line 1806 of yacc.c */
+#line 430 "wql.y"
{
(yyval.expr) = expr_propval( ctx, (yyvsp[(1) - (1)].proplist) );
if (!(yyval.expr))
@@ -1948,10 +1959,10 @@
}
break;
- case 32:
-
-/* Line 1806 of yacc.c */
-#line 433 "wql.y"
+ case 33:
+
+/* Line 1806 of yacc.c */
+#line 439 "wql.y"
{
(yyval.expr) = expr_ival( ctx, (yyvsp[(1) - (1)].integer) );
if (!(yyval.expr))
@@ -1959,10 +1970,10 @@
}
break;
- case 33:
-
-/* Line 1806 of yacc.c */
-#line 439 "wql.y"
+ case 34:
+
+/* Line 1806 of yacc.c */
+#line 445 "wql.y"
{
(yyval.expr) = expr_sval( ctx, &(yyvsp[(1) - (1)].str) );
if (!(yyval.expr))
@@ -1970,10 +1981,10 @@
}
break;
- case 34:
-
-/* Line 1806 of yacc.c */
-#line 445 "wql.y"
+ case 35:
+
+/* Line 1806 of yacc.c */
+#line 451 "wql.y"
{
(yyval.expr) = expr_bval( ctx, -1 );
if (!(yyval.expr))
@@ -1981,10 +1992,10 @@
}
break;
- case 35:
-
-/* Line 1806 of yacc.c */
-#line 451 "wql.y"
+ case 36:
+
+/* Line 1806 of yacc.c */
+#line 457 "wql.y"
{
(yyval.expr) = expr_bval( ctx, 0 );
if (!(yyval.expr))
@@ -1995,7 +2006,7 @@
/* Line 1806 of yacc.c */
-#line 2011 "wql.tab.c"
+#line 2022 "wql.tab.c"
default: break;
}
/* User semantic actions sometimes alter yychar, and that requires
@@ -2226,7 +2237,7 @@
/* Line 2067 of yacc.c */
-#line 458 "wql.y"
+#line 464 "wql.y"
HRESULT parse_query( const WCHAR *str, struct view **view, struct list *mem )
Modified: trunk/reactos/dll/win32/wbemprox/wql.y
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/wql.y?r…
==============================================================================
--- trunk/reactos/dll/win32/wbemprox/wql.y [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wbemprox/wql.y [iso-8859-1] Sat Apr 26 17:12:58 2014
@@ -315,6 +315,12 @@
| expr TK_OR expr
{
$$ = expr_complex( ctx, $1, OP_OR, $3 );
+ if (!$$)
+ YYABORT;
+ }
+ | TK_NOT expr
+ {
+ $$ = expr_unary( ctx, $2, OP_NOT );
if (!$$)
YYABORT;
}
Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Apr 26 17:12:58 2014
@@ -201,7 +201,7 @@
reactos/dll/win32/vbscript # Synced to Wine-1.7.17
reactos/dll/win32/version # Synced to Wine-1.7.1
reactos/dll/win32/wbemdisp # Synced to Wine-1.7.17
-reactos/dll/win32/wbemprox # Synced to Wine-1.7.2
+reactos/dll/win32/wbemprox # Synced to Wine-1.7.17
reactos/dll/win32/wer # Autosync
reactos/dll/win32/windowscodecs # Synced to Wine-1.7.17
reactos/dll/win32/windowscodecsext # Synced to Wine-1.7.1