| ntquery.h (6.1.7601.17514-Windows_7.0) | | ntquery.h (6.3.9600.17415-Windows_8.1) |
|---|
| | |
| skipping to change at line 18 | | skipping to change at line 18 |
|---|
| // 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 <winapifamily.h> |
| | |
| | #pragma region Desktop Family |
| | #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) |
| | |
| #include "stgprop.h" | | #include "stgprop.h" |
| | |
| #if defined(__cplusplus) | | #if defined(__cplusplus) |
| extern "C" | | extern "C" |
| { | | { |
| #endif | | #endif |
| | |
| #define CI_VERSION_WDS30 0x102 // 258 | | #define CI_VERSION_WDS30 0x102 // 258 |
| #define CI_VERSION_WDS40 0x109 // 265 | | #define CI_VERSION_WDS40 0x109 // 265 |
| | |
| skipping to change at line 49 | | skipping to change at line 53 |
|---|
| // (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( PCWSTR pwcsPath, | | STDAPI LoadIFilter( PCWSTR pwcsPath, |
|
| __in IUnknown * pUnkOuter, | | _In_ IUnknown * pUnkOuter, |
| __deref_out void ** ppIUnk ); | | _Outptr_ 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( PCWSTR pwcsPath, | | STDAPI LoadIFilterEx( PCWSTR pwcsPath, |
| DWORD dwFlags, | | DWORD dwFlags, |
| REFIID riid, | | REFIID riid, |
|
| __deref_out void ** ppIUnk ); | | _Outptr_ void ** ppIUnk ); |
| | |
|
| STDAPI BindIFilterFromStorage(__in IStorage * pStg, | | STDAPI BindIFilterFromStorage(_In_ IStorage * pStg, |
| __in IUnknown * pUnkOuter, | | _In_ IUnknown * pUnkOuter, |
| __deref_out void ** ppIUnk ); | | _Outptr_ void ** ppIUnk ); |
| | |
|
| STDAPI BindIFilterFromStream(__in IStream * pStm, | | STDAPI BindIFilterFromStream(_In_ IStream * pStm, |
| __in IUnknown * pUnkOuter, | | _In_ IUnknown * pUnkOuter, |
| __deref_out void ** ppIUnk ); | | _Outptr_ void ** ppIUnk ); |
| | |
|
| STDAPI LocateCatalogsW(__in WCHAR const * pwszScope, | | _Success_((return == S_OK) && (*pccMachine <= _Old_(*pccMachine)) && (*pccCat <= |
| | _Old_(*pccCat))) |
| | STDAPI LocateCatalogsW(_In_ PCWSTR pwszScope, |
| ULONG iBmk, | | ULONG iBmk, |
|
| __out_ecount_part(*pccMachine, *pccMachine) LPWSTR pws | | _Out_writes_(*pccMachine) PWSTR pwszMachine, |
| zMachine, | | _Inout_ ULONG * pccMachine, |
| __inout ULONG * pccMachine, | | _Out_writes_(*pccCat) PWSTR pwszCat, |
| __out_ecount_part(*pccCat, *pccCat) WCHAR * | | _Inout_ ULONG * pccCat); |
| pwszCat, | | |
| __inout ULONG * pccCat); | | |
| | |
| // | | // |
| // For calling from VB | | // For calling from VB |
| // | | // |
| | |
|
| STDAPI LocateCatalogsA( PCSTR pwszScope, | | _Success_((return == S_OK) && (*pccMachine <= _Old_(*pccMachine)) && (*pccCat <= |
| | _Old_(*pccCat))) |
| | STDAPI LocateCatalogsA( _In_ PCSTR pwszScope, |
| ULONG iBmk, | | ULONG iBmk, |
|
| __out_ecount_part(*pccMachine, *pccMachine) char * pwszM | | _Out_writes_(*pccMachine) PSTR pwszMachine, |
| achine, | | _Inout_ ULONG * pccMachine, |
| __inout ULONG * pccMachine, | | _Out_writes_(*pccCat) PSTR pwszCat, |
| __out_ecount_part(*pccCat, *pccCat) char * pwszCat, | | _Inout_ ULONG * pccCat ); |
| __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 \ |
| | |
| skipping to change at line 420 | | skipping to change at line 426 |
|---|
| | |
| #endif // __ICommandTree_INTERFACE_DEFINED__ | | #endif // __ICommandTree_INTERFACE_DEFINED__ |
| #endif // __ICommand_INTERFACE_DEFINED__ | | #endif // __ICommand_INTERFACE_DEFINED__ |
| | |
| STDAPI_(void) CIShutdown(); | | STDAPI_(void) CIShutdown(); |
| | |
| #if defined(__cplusplus) | | #if defined(__cplusplus) |
| } | | } |
| #endif | | #endif |
| | |
|
| | #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ |
| | #pragma endregion |
| | |
| #endif // __NTQUERY_H__ | | #endif // __NTQUERY_H__ |
| | |
| End of changes. 10 change blocks. |
|---|
| 22 lines changed or deleted | | 30 lines changed or added |
|---|
|