| mi.h (6.3.9600.17415-Windows 8.1) | | mi.h (10.0.10586.0-Windows 10 1511 10586.494) |
| | |
| skipping to change at line 18 | | skipping to change at line 18 |
| ** | | ** |
| ** Management Interface (MI) | | ** Management Interface (MI) |
| ** | | ** |
| ** This file defines the management interface. | | ** This file defines the management interface. |
| ** | | ** |
| **============================================================================== | | **============================================================================== |
| */ | | */ |
| | |
| #include <winapifamily.h> | | #include <winapifamily.h> |
| | |
|
| #pragma region Desktop Family | | #pragma region Desktop Family or WinMgmt Package |
| #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) | | #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_PKG_WINM |
| | GMT) |
| | |
| #ifndef _MI_h | | #ifndef _MI_h |
| #define _MI_h | | #define _MI_h |
| | |
| #include <sal.h> | | #include <sal.h> |
| #include <stddef.h> | | #include <stddef.h> |
| #include <stdio.h> | | #include <stdio.h> |
| #include <string.h> | | #include <string.h> |
| | |
| #ifdef _PREFAST_ | | #ifdef _PREFAST_ |
| #pragma prefast(push) | | #pragma prefast(push) |
| #pragma prefast(disable:6001) | | #pragma prefast(disable:6001) |
| #pragma prefast(disable:6101) | | #pragma prefast(disable:6101) |
|
| | #pragma prefast(disable:28922) |
| #endif | | #endif |
| | |
| /* | | /* |
| **============================================================================== | | **============================================================================== |
| ** | | ** |
| ** Use eight-byte packing for structures (on Windows) | | ** Use eight-byte packing for structures (on Windows) |
| ** | | ** |
| **============================================================================== | | **============================================================================== |
| */ | | */ |
| | |
| | |
| skipping to change at line 179 | | skipping to change at line 180 |
| #endif | | #endif |
| | |
| #if !defined(_In_reads_opt_) | | #if !defined(_In_reads_opt_) |
| # define _In_reads_opt_(expr) | | # define _In_reads_opt_(expr) |
| #endif | | #endif |
| | |
| #if !defined(_Out_writes_to_opt_) | | #if !defined(_Out_writes_to_opt_) |
| # define _Out_writes_to_opt_(length, lengthwritten) | | # define _Out_writes_to_opt_(length, lengthwritten) |
| #endif | | #endif |
| | |
|
| | #if !defined(_Always_) |
| | # define _Always_(annotation) |
| | #endif |
| | |
| /* | | /* |
| **============================================================================== | | **============================================================================== |
| ** | | ** |
| ** MI_EXPORT | | ** MI_EXPORT |
| ** | | ** |
| ** This macro exports the MI_Main() entry point. For example: | | ** This macro exports the MI_Main() entry point. For example: |
| ** | | ** |
| ** MI_EXPORT MI_Module* MI_MAIN_CALL MI_Main(MI_Server* server) | | ** MI_EXPORT MI_Module* MI_MAIN_CALL MI_Main(MI_Server* server) |
| ** { | | ** { |
| ** } | | ** } |
| | |
| skipping to change at line 3784 | | skipping to change at line 3789 |
| /* Defines the channel numbers for WriteMessage PS semantic callback */ | | /* Defines the channel numbers for WriteMessage PS semantic callback */ |
| #define MI_WRITEMESSAGE_CHANNEL_WARNING 0 | | #define MI_WRITEMESSAGE_CHANNEL_WARNING 0 |
| #define MI_WRITEMESSAGE_CHANNEL_VERBOSE 1 | | #define MI_WRITEMESSAGE_CHANNEL_VERBOSE 1 |
| #define MI_WRITEMESSAGE_CHANNEL_DEBUG 2 | | #define MI_WRITEMESSAGE_CHANNEL_DEBUG 2 |
| | |
| /* Defines the resultType for the result code */ | | /* Defines the resultType for the result code */ |
| | |
| #define MI_RESULT_TYPE_MI MI_T("MI") /* MI Result type*/ | | #define MI_RESULT_TYPE_MI MI_T("MI") /* MI Result type*/ |
| #define MI_RESULT_TYPE_HRESULT MI_T("HRESULT") /* HRESULT Result type */ | | #define MI_RESULT_TYPE_HRESULT MI_T("HRESULT") /* HRESULT Result type */ |
| #define MI_RESULT_TYPE_WIN32 MI_T("WIN32") /* WIN32 Result type*/ | | #define MI_RESULT_TYPE_WIN32 MI_T("WIN32") /* WIN32 Result type*/ |
|
| | #define MI_RESULT_TYPE_ERRNO MI_T("ERRNO") /* CRT ERRNO Result type*/ |
| | |
| /** Defines the function table used by MI_Context */ | | /** Defines the function table used by MI_Context */ |
| struct _MI_ContextFT | | struct _MI_ContextFT |
| { | | { |
| /* | | /* |
| **-------------------------------------------------------------------------- | | **-------------------------------------------------------------------------- |
| ** | | ** |
| ** Post Methods | | ** Post Methods |
| ** | | ** |
| **-------------------------------------------------------------------------- | | **-------------------------------------------------------------------------- |
| | |
| skipping to change at line 6066 | | skipping to change at line 6072 |
| _Inout_ MI_Application *application, | | _Inout_ MI_Application *application, |
| MI_Uint32 flags, | | MI_Uint32 flags, |
| _In_z_ MI_Char *format, | | _In_z_ MI_Char *format, |
| _Out_ MI_Deserializer *deserializer); | | _Out_ MI_Deserializer *deserializer); |
| | |
| MI_Result (MI_CALL *NewInstanceFromClass)( | | MI_Result (MI_CALL *NewInstanceFromClass)( |
| _In_ MI_Application *application, | | _In_ MI_Application *application, |
| _In_z_ const MI_Char *className, | | _In_z_ const MI_Char *className, |
| _In_opt_ const MI_Class *classObject, | | _In_opt_ const MI_Class *classObject, |
| _Outptr_ MI_Instance **instance); | | _Outptr_ MI_Instance **instance); |
|
| | |
| | MI_Result (MI_CALL *NewClass) ( |
| | _In_ MI_Application *application, |
| | _In_ const MI_ClassDecl* classDecl, |
| | __in_z_opt const MI_Char *namespaceName, |
| | __in_z_opt const MI_Char *serverName, |
| | _Outptr_ MI_Class** classObject); |
| | |
| } | | } |
| MI_ApplicationFT; | | MI_ApplicationFT; |
| | |
| /* | | /* |
| **============================================================================= | | **============================================================================= |
| ** | | ** |
| ** typedef const _MI_HostedProviderFT MI_HostedProviderFT | | ** typedef const _MI_HostedProviderFT MI_HostedProviderFT |
| ** | | ** |
| ** Function table for all actions on a hosted provider object. | | ** Function table for all actions on a hosted provider object. |
| ** | | ** |
| | |
| skipping to change at line 6760 | | skipping to change at line 6774 |
| else | | else |
| { | | { |
| if (instance) | | if (instance) |
| { | | { |
| *instance = NULL; | | *instance = NULL; |
| } | | } |
| return MI_RESULT_INVALID_PARAMETER; | | return MI_RESULT_INVALID_PARAMETER; |
| } | | } |
| } | | } |
| | |
|
| | /* |
| | **============================================================================= |
| | ** |
| | ** MI_Application_NewClass() |
| | ** |
| | ** Creates an MI_Class from an MI_ClassDecl |
| | ** The MI_Class must be closed through MI_Class_Delete. |
| | ** |
| | ** application : Handle returned from MI_Application_Initialize. |
| | ** classDecl : The MI_ClassDecl for the class to create. |
| | ** namespaceName: The optional namespace name. |
| | ** serverName : The optional server name |
| | ** classObject : The resultant MI_Class |
| | ** |
| | ** Return: MI_RESULT_OK success, other errors indicate specific failure |
| | **============================================================================= |
| | */ |
| | MI_INLINE MI_Result MI_Application_NewClass( |
| | _In_ MI_Application *application, |
| | _In_ const MI_ClassDecl* classDecl, |
| | __in_z_opt const MI_Char *namespaceName, |
| | __in_z_opt const MI_Char *serverName, |
| | _Outptr_ MI_Class** classObject) |
| | { |
| | if (application && application->ft) |
| | { |
| | return application->ft->NewClass(application, classDecl, namespaceName, |
| | serverName, classObject); |
| | } |
| | else |
| | { |
| | if (classObject) |
| | { |
| | *classObject = NULL; |
| | } |
| | return MI_RESULT_INVALID_PARAMETER; |
| | } |
| | } |
| | |
| MI_INLINE MI_Result MI_Application_NewParameterSet( | | MI_INLINE MI_Result MI_Application_NewParameterSet( |
| _In_ MI_Application *application, | | _In_ MI_Application *application, |
| _In_opt_ const MI_ClassDecl *classRTTI, | | _In_opt_ const MI_ClassDecl *classRTTI, |
| _Outptr_ MI_Instance **instance) | | _Outptr_ MI_Instance **instance) |
| { | | { |
| if (application && application->ft) | | if (application && application->ft) |
| { | | { |
| return application->ft->NewInstance(application, MI_T("Parameters"), cla
ssRTTI, instance); | | return application->ft->NewInstance(application, MI_T("Parameters"), cla
ssRTTI, instance); |
| } | | } |
| else | | else |
| | |
| skipping to change at line 10552 | | skipping to change at line 10604 |
| #ifdef __cplusplus | | #ifdef __cplusplus |
| } // end of extern C | | } // end of extern C |
| #endif // __cplusplus | | #endif // __cplusplus |
| | |
| #ifdef _PREFAST_ | | #ifdef _PREFAST_ |
| #pragma prefast(pop) | | #pragma prefast(pop) |
| #endif | | #endif |
| | |
| #endif /* __MI_C_API_H */ | | #endif /* __MI_C_API_H */ |
| | |
|
| #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ | | #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_PK
G_WINMGMT) */ |
| #pragma endregion | | #pragma endregion |
| | |
| End of changes. 7 change blocks. |
| 3 lines changed or deleted | | 57 lines changed or added |
|