Headers diff for query.dll between 5.2.3790.3959-Windows 5.0 and 6.0.6002.18005-Windows 6.0 versions



 ntquery.h (5.2.3790.3959-Windows 5.0)   ntquery.h (6.0.6002.18005-Windows 6.0) 
//+--------------------------------------------------------------------------- //+---------------------------------------------------------------------------
// //
// Microsoft Windows // Microsoft Windows
// Copyright (C) Microsoft Corporation, 1996-1999. // Copyright (c) Microsoft Corporation. All rights reserved.
// //
// File: NtQuery.h // File: NtQuery.h
// //
// Contents: Main query header; Defines all exported query API // Contents: Main query header; Defines all exported query API
// //
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
#if !defined(__NTQUERY_H__) #if !defined(__NTQUERY_H__)
#define __NTQUERY_H__ #define __NTQUERY_H__
#if _MSC_VER > 1000 #if _MSC_VER > 1000
#pragma once #pragma once
#endif #endif
#include "stgprop.h"
#if defined(__cplusplus) #if defined(__cplusplus)
extern "C" extern "C"
{ {
#endif #endif
// //
// Use this path for the null catalog, one that doesn't have an index. // Use this path for the null catalog, one that doesn't have an index.
// Use it to search for properties of files that are not indexed. // Use it to search for properties of files that are not indexed.
// //
skipping to change at line 42 skipping to change at line 44
// Use this path to connect to the server for administration work // Use this path to connect to the server for administration work
// (i.e. DocStoreAdmin.) No catalog is associated with the connection // (i.e. DocStoreAdmin.) No catalog is associated with the connection
// //
#define CIADMIN L"::_nodocstore_::" #define CIADMIN L"::_nodocstore_::"
// //
// Minimal support for persistent handlers. // Minimal support for persistent handlers.
// //
STDAPI LoadIFilter( WCHAR const * pwcsPath, STDAPI LoadIFilter( PCWSTR pwcsPath,
IUnknown * pUnkOuter, __in IUnknown * pUnkOuter,
void ** ppIUnk ); __deref_out void ** ppIUnk );
#define LIFF_LOAD_DEFINED_FILTER 1 #define LIFF_LOAD_DEFINED_FILTER 1
#define LIFF_IMPLEMENT_TEXT_FILTER_FALLBACK_POLICY 2 #define LIFF_IMPLEMENT_TEXT_FILTER_FALLBACK_POLICY 2
#define LIFF_FORCE_TEXT_FILTER_FALLBACK 3 #define LIFF_FORCE_TEXT_FILTER_FALLBACK 3
STDAPI LoadIFilterEx( WCHAR const * pwcsPath, STDAPI LoadIFilterEx( PCWSTR pwcsPath,
DWORD dwFlags, DWORD dwFlags,
REFIID riid, REFIID riid,
void ** ppIUnk ); __deref_out void ** ppIUnk );
STDAPI BindIFilterFromStorage( IStorage * pStg, STDAPI BindIFilterFromStorage(__in IStorage * pStg,
IUnknown * pUnkOuter, __in IUnknown * pUnkOuter,
void ** ppIUnk ); __deref_out void ** ppIUnk );
STDAPI BindIFilterFromStream( IStream * pStm, STDAPI BindIFilterFromStream(__in IStream * pStm,
IUnknown * pUnkOuter, __in IUnknown * pUnkOuter,
void ** ppIUnk ); __deref_out void ** ppIUnk );
STDAPI LocateCatalogsW( WCHAR const * pwszScope, STDAPI LocateCatalogsW(__in WCHAR const * pwszScope,
ULONG iBmk, ULONG iBmk,
WCHAR * pwszMachine, __out_ecount_part(*pccMachine, *pccMachine) LPWSTR pws
ULONG * pccMachine, zMachine,
WCHAR * pwszCat, __inout ULONG * pccMachine,
ULONG * pccCat ); __out_ecount_part(*pccCat, *pccCat) WCHAR *
pwszCat,
__inout ULONG * pccCat);
// //
// For calling from VB // For calling from VB
// //
STDAPI LocateCatalogsA( char const * pwszScope, STDAPI LocateCatalogsA( PCSTR pwszScope,
ULONG iBmk, ULONG iBmk,
char * pwszMachine, __out_ecount_part(*pccMachine, *pccMachine) char * pwszM
ULONG * pccMachine, achine,
char * pwszCat, __inout ULONG * pccMachine,
ULONG * pccCat ); __out_ecount_part(*pccCat, *pccCat) char * pwszCat,
__inout ULONG * pccCat );
#ifdef UNICODE #ifdef UNICODE
#define LocateCatalogs LocateCatalogsW #define LocateCatalogs LocateCatalogsW
#else #else
#define LocateCatalogs LocateCatalogsA #define LocateCatalogs LocateCatalogsA
#endif // !UNICODE #endif // !UNICODE
// The Index Server Data Source Object CLSID // The Index Server Data Source Object CLSID
#define CLSID_INDEX_SERVER_DSO \ #define CLSID_INDEX_SERVER_DSO \
{ 0xF9AE8980, 0x7E52, 0x11d0, \ { 0xF9AE8980, 0x7E52, 0x11d0, \
{ 0x89, 0x64, 0x00, 0xC0, 0x4F, 0xD6, 0x11, 0xD7 } } { 0x89, 0x64, 0x00, 0xC0, 0x4F, 0xD6, 0x11, 0xD7 } }
// The storage property set // The filename PKEY_Filename property set
#define PSGUID_FILENAME \
#define PSGUID_STORAGE \ { 0x41CF5AE0, 0xF75A, 0x4806, \
{ 0xb725f130, 0x47ef, 0x101a, \ { 0xBD, 0x87, 0x59, 0xC7, 0xD9, 0x24, 0x8E, 0xB9} }
{ 0xa5, 0xf1, 0x02, 0x60, 0x8c, 0x9e, 0xeb, 0xac } } #define PID_FILENAME 100
//#define PID_STG_DICTIONARY ((PROPID) 0x00000000) //reserved
//#define PID_STG_CODEPAGE ((PROPID) 0x00000001) //reserved
#define PID_STG_DIRECTORY ((PROPID) 0x00000002)
#define PID_STG_CLASSID ((PROPID) 0x00000003)
#define PID_STG_STORAGETYPE ((PROPID) 0x00000004)
#define PID_STG_VOLUME_ID ((PROPID) 0x00000005)
#define PID_STG_PARENT_WORKID ((PROPID) 0x00000006)
#define PID_STG_SECONDARYSTORE ((PROPID) 0x00000007)
#define PID_STG_FILEINDEX ((PROPID) 0x00000008)
#define PID_STG_LASTCHANGEUSN ((PROPID) 0x00000009)
#define PID_STG_NAME ((PROPID) 0x0000000a)
#define PID_STG_PATH ((PROPID) 0x0000000b)
#define PID_STG_SIZE ((PROPID) 0x0000000c)
#define PID_STG_ATTRIBUTES ((PROPID) 0x0000000d)
#define PID_STG_WRITETIME ((PROPID) 0x0000000e)
#define PID_STG_CREATETIME ((PROPID) 0x0000000f)
#define PID_STG_ACCESSTIME ((PROPID) 0x00000010)
#define PID_STG_CHANGETIME ((PROPID) 0x00000011)
#define PID_STG_CONTENTS ((PROPID) 0x00000013)
#define PID_STG_SHORTNAME ((PROPID) 0x00000014)
#define PID_STG_MAX PID_STG_SHORTNAME
#define CSTORAGEPROPERTY 0x15
// File System Content Index Framework property set // File System Content Index Framework property set
#define DBPROPSET_FSCIFRMWRK_EXT \ #define DBPROPSET_FSCIFRMWRK_EXT \
{ 0xA9BD1526, 0x6A80, 0x11D0, \ { 0xA9BD1526, 0x6A80, 0x11D0, \
{ 0x8C, 0x9D, 0x00, 0x20, 0xAF, 0x1D, 0x74, 0x0E } } { 0x8C, 0x9D, 0x00, 0x20, 0xAF, 0x1D, 0x74, 0x0E } }
#define DBPROP_CI_CATALOG_NAME 2 #define DBPROP_CI_CATALOG_NAME 2
#define DBPROP_CI_INCLUDE_SCOPES 3 #define DBPROP_CI_INCLUDE_SCOPES 3
#define DBPROP_CI_DEPTHS 4 // obsolete #define DBPROP_CI_DEPTHS 4 // obsolete
#define DBPROP_CI_SCOPE_FLAGS 4 #define DBPROP_CI_SCOPE_FLAGS 4
#define DBPROP_CI_EXCLUDE_SCOPES 5 #define DBPROP_CI_EXCLUDE_SCOPES 5
#define DBPROP_CI_SECURITY_ID 6 #define DBPROP_CI_SECURITY_ID 6
#define DBPROP_CI_QUERY_TYPE 7 #define DBPROP_CI_QUERY_TYPE 7
#define DBPROP_CI_PROVIDER 8
// The VT_UI4 value of DBPROP_CI_PROVIDER
#define CI_PROVIDER_MSSEARCH 1 // Only try MSSearch
#define CI_PROVIDER_INDEXING_SERVICE 2 // Only try Indexing Service
#define CI_PROVIDER_ALL 0xffffffff // Try all -- the default
// Session level Query Extension property set
#define DBPROPSET_SESS_QUERYEXT \
{ 0x63623309, 0x2d8b, 0x4d17, \
{ 0xb1, 0x52, 0x6e, 0x29, 0x56, 0xc2, 0x6a, 0x70 } }
#define DBPROP_DEFAULT_EQUALS_BEHAVIOR 2
// Query Extension property set // Query Extension property set
#define DBPROPSET_QUERYEXT \ #define DBPROPSET_QUERYEXT \
{ 0xA7AC77ED, 0xF8D7, 0x11CE, \ { 0xA7AC77ED, 0xF8D7, 0x11CE, \
{ 0xA7, 0x98, 0x00, 0x20, 0xF8, 0x00, 0x80, 0x25 } } { 0xA7, 0x98, 0x00, 0x20, 0xF8, 0x00, 0x80, 0x25 } }
#define DBPROP_USECONTENTINDEX 2 #define DBPROP_USECONTENTINDEX 2
#define DBPROP_DEFERNONINDEXEDTRIMMING 3 #define DBPROP_DEFERNONINDEXEDTRIMMING 3
#define DBPROP_USEEXTENDEDDBTYPES 4 #define DBPROP_USEEXTENDEDDBTYPES 4
#define DBPROP_IGNORENOISEONLYCLAUSES 5
#define DBPROP_GENERICOPTIONS_STRING 6
#define DBPROP_FIRSTROWS 7 #define DBPROP_FIRSTROWS 7
#define DBPROP_DEFERCATALOGVERIFICATION 8
#define DBPROP_CATALOGLISTID 9
#define DBPROP_GENERATEPARSETREE 10
#define DBPROP_APPLICATION_NAME 11
#define DBPROP_FREETEXTANYTERM 12
#define DBPROP_FREETEXTUSESTEMMING 13
#define DBPROP_IGNORESBRI 14
// Content Index Framework Core property set // Content Index Framework Core property set
#define DBPROPSET_CIFRMWRKCORE_EXT \ #define DBPROPSET_CIFRMWRKCORE_EXT \
{ 0xafafaca5, 0xb5d1, 0x11d0, \ { 0xafafaca5, 0xb5d1, 0x11d0, \
{ 0x8c, 0x62, 0x00, 0xc0, 0x4f, 0xc2, 0xdb, 0x8d } } { 0x8c, 0x62, 0x00, 0xc0, 0x4f, 0xc2, 0xdb, 0x8d } }
#define DBPROP_MACHINE 2 #define DBPROP_MACHINE 2
#define DBPROP_CLIENT_CLSID 3 #define DBPROP_CLIENT_CLSID 3
// MSIDXS Rowset property set // MSIDXS Rowset property set
#define DBPROPSET_MSIDXS_ROWSETEXT \ #define DBPROPSET_MSIDXS_ROWSETEXT \
{ 0xaa6ee6b0, 0xe828, 0x11d0, \ { 0xaa6ee6b0, 0xe828, 0x11d0, \
{ 0xb2, 0x3e, 0x00, 0xaa, 0x00, 0x47, 0xfc, 0x01 } } { 0xb2, 0x3e, 0x00, 0xaa, 0x00, 0x47, 0xfc, 0x01 } }
#define MSIDXSPROP_ROWSETQUERYSTATUS 2 #define MSIDXSPROP_ROWSETQUERYSTATUS 2
#define MSIDXSPROP_COMMAND_LOCALE_STRING 3 #define MSIDXSPROP_COMMAND_LOCALE_STRING 3
#define MSIDXSPROP_QUERY_RESTRICTION 4 #define MSIDXSPROP_QUERY_RESTRICTION 4
#define MSIDXSPROP_PARSE_TREE 5
#define MSIDXSPROP_MAX_RANK 6
#define MSIDXSPROP_RESULTS_FOUND 7
// //
// Query status values returned by MSIDXSPROP_ROWSETQUERYSTATUS // Query status values returned by MSIDXSPROP_ROWSETQUERYSTATUS
// //
// Bits Effect // Bits Effect
// ----- ----------------------------------------------------- // ----- -----------------------------------------------------
// 00-02 Fill Status: How data is being updated, if at all. // 00-02 Fill Status: How data is being updated, if at all.
// 03-15 Bitfield query reliability: How accurate the result is // 03-15 Bitfield query reliability: How accurate the result is
#define STAT_BUSY ( 0 ) #define STAT_BUSY ( 0 )
skipping to change at line 187 skipping to change at line 193
#define STAT_REFRESH ( 0x3 ) #define STAT_REFRESH ( 0x3 )
#define QUERY_FILL_STATUS(x) ( ( x ) & 0x7 ) #define QUERY_FILL_STATUS(x) ( ( x ) & 0x7 )
#define STAT_PARTIAL_SCOPE ( 0x8 ) #define STAT_PARTIAL_SCOPE ( 0x8 )
#define STAT_NOISE_WORDS ( 0x10 ) #define STAT_NOISE_WORDS ( 0x10 )
#define STAT_CONTENT_OUT_OF_DATE ( 0x20 ) #define STAT_CONTENT_OUT_OF_DATE ( 0x20 )
#define STAT_REFRESH_INCOMPLETE ( 0x40 ) #define STAT_REFRESH_INCOMPLETE ( 0x40 )
#define STAT_CONTENT_QUERY_INCOMPLETE ( 0x80 ) #define STAT_CONTENT_QUERY_INCOMPLETE ( 0x80 )
#define STAT_TIME_LIMIT_EXCEEDED ( 0x100 ) #define STAT_TIME_LIMIT_EXCEEDED ( 0x100 )
#define STAT_SHARING_VIOLATION ( 0x200 ) #define STAT_SHARING_VIOLATION ( 0x200 )
#define STAT_MISSING_RELDOC ( 0x400 )
#define STAT_MISSING_PROP_IN_RELDOC ( 0x800 )
#define STAT_RELDOC_ACCESS_DENIED ( 0x1000 )
#define STAT_COALESCE_COMP_ALL_NOISE ( 0x2000 )
#define QUERY_RELIABILITY_STATUS(x) ( ( x ) & 0xFFF8 ) #define QUERY_RELIABILITY_STATUS(x) ( ( x ) & 0xFFF8 )
// Scope flags // Scope flags
#define QUERY_SHALLOW 0 #define QUERY_SHALLOW 0
#define QUERY_DEEP 1 #define QUERY_DEEP 1
#define QUERY_PHYSICAL_PATH 0 #define QUERY_PHYSICAL_PATH 0
#define QUERY_VIRTUAL_PATH 2 #define QUERY_VIRTUAL_PATH 2
// query property set (PSGUID_QUERY) properties not defined in oledb.h // query property set (PSGUID_QUERY) properties not defined in oledb.h
skipping to change at line 237 skipping to change at line 247
#define CI_STATE_RECOVERING 0x0020 // Index metadata is being reco vered #define CI_STATE_RECOVERING 0x0020 // Index metadata is being reco vered
#define CI_STATE_INDEX_MIGRATION_MERGE 0x0040 // Reserved for future use #define CI_STATE_INDEX_MIGRATION_MERGE 0x0040 // Reserved for future use
#define CI_STATE_LOW_MEMORY 0x0080 // Indexing is paused due to lo w memory availability #define CI_STATE_LOW_MEMORY 0x0080 // Indexing is paused due to lo w memory availability
#define CI_STATE_HIGH_IO 0x0100 // Indexing is paused due to a high rate of I/O #define CI_STATE_HIGH_IO 0x0100 // Indexing is paused due to a high rate of I/O
#define CI_STATE_MASTER_MERGE_PAUSED 0x0200 // Master merge is paused #define CI_STATE_MASTER_MERGE_PAUSED 0x0200 // Master merge is paused
#define CI_STATE_READ_ONLY 0x0400 // Indexing has been manually p aused (read-only) #define CI_STATE_READ_ONLY 0x0400 // Indexing has been manually p aused (read-only)
#define CI_STATE_BATTERY_POWER 0x0800 // Indexing is paused to conser ve battery life #define CI_STATE_BATTERY_POWER 0x0800 // Indexing is paused to conser ve battery life
#define CI_STATE_USER_ACTIVE 0x1000 // Indexing is paused due to hi gh user activity (keyboard/mouse) #define CI_STATE_USER_ACTIVE 0x1000 // Indexing is paused due to hi gh user activity (keyboard/mouse)
#define CI_STATE_STARTING 0x2000 // Index is still starting up #define CI_STATE_STARTING 0x2000 // Index is still starting up
#define CI_STATE_READING_USNS 0x4000 // USNs on NTFS volumes are bei ng processed #define CI_STATE_READING_USNS 0x4000 // USNs on NTFS volumes are bei ng processed
#define CI_STATE_DELETION_MERGE 0x8000 // Index is performing a deleti
on merge
#define CI_STATE_LOW_DISK 0x10000 // Index is paused due to low d
isk availability
#define CI_STATE_HIGH_CPU 0x20000 // Index is paused due to high
CPU
#ifndef CI_STATE_DEFINED #ifndef CI_STATE_DEFINED
#define CI_STATE_DEFINED #define CI_STATE_DEFINED
#include <pshpack4.h> #include <pshpack4.h>
typedef struct _CI_STATE typedef struct _CI_STATE
{ {
DWORD cbStruct; DWORD cbStruct;
DWORD cWordList; DWORD cWordList;
DWORD cPersistentIndex; DWORD cPersistentIndex;
DWORD cQueries; DWORD cQueries;
skipping to change at line 292 skipping to change at line 305
STDAPI CICreateCommand( IUnknown ** ppCommand, // New object STDAPI CICreateCommand( IUnknown ** ppCommand, // New object
IUnknown * pUnkOuter, // Outer unknown IUnknown * pUnkOuter, // Outer unknown
REFIID riid, // IID of returned object. REFIID riid, // IID of returned object.
// Must be IID_IUnknown unl ess pUnkOuter == 0 // Must be IID_IUnknown unl ess pUnkOuter == 0
WCHAR const * pwcsCatalog, // Catalog WCHAR const * pwcsCatalog, // Catalog
WCHAR const * pwcsMachine ); // Machine WCHAR const * pwcsMachine ); // Machine
#if defined __ICommandTree_INTERFACE_DEFINED__ #if defined __ICommandTree_INTERFACE_DEFINED__
#ifndef __propertydef_h__
typedef struct tagCIPROPERTYDEF typedef struct tagCIPROPERTYDEF
{ {
LPWSTR wcsFriendlyName; LPWSTR wcsFriendlyName;
DWORD dbType; DWORD dbType;
DBID dbCol; DBID dbCol;
} CIPROPERTYDEF; } CIPROPERTYDEF;
#endif //__propertydef_h__
// //
// Values for ulDialect in CITextToSelectTreeEx and CITextToFullTreeEx // Values for ulDialect in CITextToSelectTreeEx and CITextToFullTreeEx
// //
#define ISQLANG_V1 1 // Same as the non-Ex versions #define ISQLANG_V1 1 // Same as the non-Ex versions
#define ISQLANG_V2 2 #define ISQLANG_V2 2
// //
// Convert pwszRestriction in Triplish to a command tree. // Convert pwszRestriction in Triplish to a command tree.
// //
 End of changes. 17 change blocks. 
54 lines changed or deleted 77 lines changed or added

This html diff was produced by rfcdiff 1.41.