Headers diff for oleaut32.dll between 6.3.9600.17415-Windows 8.1 and 10.0.10586.0-Windows 10 1511 10586.494 versions



 activscp.h (6.3.9600.17415-Windows 8.1)   activscp.h (10.0.10586.0-Windows 10 1511 10586.494) 
/* this ALWAYS GENERATED file contains the definitions for the interfaces */ /* this ALWAYS GENERATED file contains the definitions for the interfaces */
/* File created by MIDL compiler version 8.00.0603 */ /* File created by MIDL compiler version 8.00.0613 */
/* @@MIDL_FILE_HEADING( ) */ /* @@MIDL_FILE_HEADING( ) */
#pragma warning( disable: 4049 ) /* more than 64k source lines */
/* verify that the <rpcndr.h> version is high enough to compile this file*/ /* verify that the <rpcndr.h> version is high enough to compile this file*/
#ifndef __REQUIRED_RPCNDR_H_VERSION__ #ifndef __REQUIRED_RPCNDR_H_VERSION__
#define __REQUIRED_RPCNDR_H_VERSION__ 500 #define __REQUIRED_RPCNDR_H_VERSION__ 500
#endif #endif
/* verify that the <rpcsal.h> version is high enough to compile this file*/ /* verify that the <rpcsal.h> version is high enough to compile this file*/
#ifndef __REQUIRED_RPCSAL_H_VERSION__ #ifndef __REQUIRED_RPCSAL_H_VERSION__
#define __REQUIRED_RPCSAL_H_VERSION__ 100 #define __REQUIRED_RPCSAL_H_VERSION__ 100
#endif #endif
#include "rpc.h" #include "rpc.h"
#include "rpcndr.h" #include "rpcndr.h"
#ifndef __RPCNDR_H_VERSION__ #ifndef __RPCNDR_H_VERSION__
#error this stub requires an updated version of <rpcndr.h> #error this stub requires an updated version of <rpcndr.h>
#endif // __RPCNDR_H_VERSION__ #endif /* __RPCNDR_H_VERSION__ */
#ifndef COM_NO_WINDOWS_H #ifndef COM_NO_WINDOWS_H
#include "windows.h" #include "windows.h"
#include "ole2.h" #include "ole2.h"
#endif /*COM_NO_WINDOWS_H*/ #endif /*COM_NO_WINDOWS_H*/
#ifndef __activscp_h__ #ifndef __activscp_h__
#define __activscp_h__ #define __activscp_h__
#if defined(_MSC_VER) && (_MSC_VER >= 1020) #if defined(_MSC_VER) && (_MSC_VER >= 1020)
skipping to change at line 359 skipping to change at line 357
#define SCRIPTTYPELIB_ALL_FLAGS (SCRIPTTYPELIB_ISCONTROL | SCRIPTTYPELIB _ISPERSISTENT) #define SCRIPTTYPELIB_ALL_FLAGS (SCRIPTTYPELIB_ISCONTROL | SCRIPTTYPELIB _ISPERSISTENT)
/* IActiveScriptParse::AddScriptlet() and IActiveScriptParse::ParseScriptText() input flags */ /* IActiveScriptParse::AddScriptlet() and IActiveScriptParse::ParseScriptText() input flags */
#define SCRIPTTEXT_DELAYEXECUTION 0x00000001 #define SCRIPTTEXT_DELAYEXECUTION 0x00000001
#define SCRIPTTEXT_ISVISIBLE 0x00000002 #define SCRIPTTEXT_ISVISIBLE 0x00000002
#define SCRIPTTEXT_ISEXPRESSION 0x00000020 #define SCRIPTTEXT_ISEXPRESSION 0x00000020
#define SCRIPTTEXT_ISPERSISTENT 0x00000040 #define SCRIPTTEXT_ISPERSISTENT 0x00000040
#define SCRIPTTEXT_HOSTMANAGESSOURCE 0x00000080 #define SCRIPTTEXT_HOSTMANAGESSOURCE 0x00000080
#define SCRIPTTEXT_ISXDOMAIN 0x00000100 #define SCRIPTTEXT_ISXDOMAIN 0x00000100
#define SCRIPTTEXT_ISNONUSERCODE 0x00000200
#define SCRIPTTEXT_ALL_FLAGS (SCRIPTTEXT_DELAYEXECUTION | \ #define SCRIPTTEXT_ALL_FLAGS (SCRIPTTEXT_DELAYEXECUTION | \
SCRIPTTEXT_ISVISIBLE | \ SCRIPTTEXT_ISVISIBLE | \
SCRIPTTEXT_ISEXPRESSION | \ SCRIPTTEXT_ISEXPRESSION | \
SCRIPTTEXT_ISPERSISTENT | \ SCRIPTTEXT_ISPERSISTENT | \
SCRIPTTEXT_HOSTMANAGESSOURCE | \ SCRIPTTEXT_HOSTMANAGESSOURCE | \
SCRIPTTEXT_ISXDOMAIN) SCRIPTTEXT_ISXDOMAIN | \
SCRIPTTEXT_ISNONUSERCODE)
/* IActiveScriptParseProcedure::ParseProcedureText() input flags */ /* IActiveScriptParseProcedure::ParseProcedureText() input flags */
#define SCRIPTPROC_ISEXPRESSION 0x00000020 #define SCRIPTPROC_ISEXPRESSION 0x00000020
#define SCRIPTPROC_HOSTMANAGESSOURCE 0x00000080 #define SCRIPTPROC_HOSTMANAGESSOURCE 0x00000080
#define SCRIPTPROC_IMPLICIT_THIS 0x00000100 #define SCRIPTPROC_IMPLICIT_THIS 0x00000100
#define SCRIPTPROC_IMPLICIT_PARENTS 0x00000200 #define SCRIPTPROC_IMPLICIT_PARENTS 0x00000200
#define SCRIPTPROC_ISXDOMAIN 0x00000400 #define SCRIPTPROC_ISXDOMAIN 0x00000400
#define SCRIPTPROC_ALL_FLAGS (SCRIPTPROC_HOSTMANAGESSOURCE | \ #define SCRIPTPROC_ALL_FLAGS (SCRIPTPROC_HOSTMANAGESSOURCE | \
SCRIPTPROC_ISEXPRESSION | \ SCRIPTPROC_ISEXPRESSION | \
 End of changes. 5 change blocks. 
5 lines changed or deleted 5 lines changed or added


 oleauto.h (6.3.9600.17415-Windows 8.1)   oleauto.h (10.0.10586.0-Windows 10 1511 10586.494) 
#include <winapifamily.h> #include <winapifamily.h>
#if _MSC_VER >= 1200
#pragma warning(push)
#pragma warning(disable:4001) /* nonstandard extension : single line comment */
#pragma warning(disable:4820) // padding added after data member
#endif
//+--------------------------------------------------------------------------- //+---------------------------------------------------------------------------
// //
// Microsoft Windows // Microsoft Windows
// Copyright (c) Microsoft Corporation. All rights reserved. // Copyright (c) Microsoft Corporation. All rights reserved.
// //
// File: oleauto.h // File: oleauto.h
// //
// Contents: Defines Ole Automation support function prototypes, constants // Contents: Defines Ole Automation support function prototypes, constants
// //
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
skipping to change at line 65 skipping to change at line 71
#define END_INTERFACE #define END_INTERFACE
#endif #endif
/* pull in the MIDL generated header */ /* pull in the MIDL generated header */
#include <oaidl.h> #include <oaidl.h>
/*---------------------------------------------------------------------*/ /*---------------------------------------------------------------------*/
/* BSTR API */ /* BSTR API */
/*---------------------------------------------------------------------*/ /*---------------------------------------------------------------------*/
#pragma region Application Family #pragma region Application Family or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM)
WINOLEAUTAPI_(BSTR) SysAllocString(_In_opt_z_ const OLECHAR * psz); WINOLEAUTAPI_(BSTR) SysAllocString(_In_opt_z_ const OLECHAR * psz);
WINOLEAUTAPI_(INT) SysReAllocString(_Inout_ _At_(*pbstr, _Pre_z_ _Post_z_ _Post _readable_size_(_String_length_(psz)+1)) BSTR* pbstr, _In_opt_z_ const OLECHAR* psz); WINOLEAUTAPI_(INT) SysReAllocString(_Inout_ _At_(*pbstr, _Pre_z_ _Post_z_ _Post _readable_size_(_String_length_(psz)+1)) BSTR* pbstr, _In_opt_z_ const OLECHAR* psz);
WINOLEAUTAPI_(_Ret_writes_maybenull_z_(ui+1) BSTR) SysAllocStringLen(_In_reads_o pt_(ui) const OLECHAR * strIn, UINT ui); WINOLEAUTAPI_(_Ret_writes_maybenull_z_(ui+1) BSTR) SysAllocStringLen(_In_reads_o pt_(ui) const OLECHAR * strIn, UINT ui);
_Check_return_ WINOLEAUTAPI_(INT) SysReAllocStringLen(_Inout_ _At_(*pbstr, _Pre _z_ _Post_z_ _Post_readable_size_(len+1)) BSTR* pbstr, _In_opt_z_ const OLECHAR* psz, _In_ unsigned int len); _Check_return_ WINOLEAUTAPI_(INT) SysReAllocStringLen(_Inout_ _At_(*pbstr, _Pre _z_ _Post_z_ _Post_readable_size_(len+1)) BSTR* pbstr, _In_opt_z_ const OLECHAR* psz, _In_ unsigned int len);
WINOLEAUTAPI_(void) SysFreeString(_In_opt_ BSTR bstrString); WINOLEAUTAPI_(void) SysFreeString(_In_opt_ BSTR bstrString);
WINOLEAUTAPI_(_Post_equal_to_(pbstr == NULL ? 0 : _String_length_(pbstr)) UINT) SysStringLen(_In_opt_ BSTR pbstr); WINOLEAUTAPI_(_Post_equal_to_(pbstr == NULL ? 0 : _String_length_(pbstr)) UINT) SysStringLen(_In_opt_ BSTR pbstr);
#if (defined (_WIN32) || defined (_WIN64)) #if (defined (_WIN32) || defined (_WIN64))
WINOLEAUTAPI_(_Post_equal_to_(_String_length_(bstr) * sizeof(OLECHAR)) UINT) Sys StringByteLen(_In_opt_ BSTR bstr); WINOLEAUTAPI_(_Post_equal_to_(_String_length_(bstr) * sizeof(OLECHAR)) UINT) Sys StringByteLen(_In_opt_ BSTR bstr);
WINOLEAUTAPI_(BSTR) SysAllocStringByteLen(_In_opt_z_ LPCSTR psz, _In_ UINT len); WINOLEAUTAPI_(BSTR) SysAllocStringByteLen(_In_opt_z_ LPCSTR psz, _In_ UINT len);
#endif /* (defined (_WIN32) || defined (_WIN64)) */ #endif /* (defined (_WIN32) || defined (_WIN64)) */
#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */ #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTE M) */
#pragma endregion #pragma endregion
/*---------------------------------------------------------------------*/ /*---------------------------------------------------------------------*/
/* Time API */ /* Time API */
/*---------------------------------------------------------------------*/ /*---------------------------------------------------------------------*/
#pragma region Desktop Family #pragma region Desktop Family or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM)
WINOLEAUTAPI_(INT) DosDateTimeToVariantTime(_In_ USHORT wDosDate, _In_ USHORT wD osTime, _Out_ DOUBLE * pvtime); WINOLEAUTAPI_(INT) DosDateTimeToVariantTime(_In_ USHORT wDosDate, _In_ USHORT wD osTime, _Out_ DOUBLE * pvtime);
WINOLEAUTAPI_(INT) VariantTimeToDosDateTime(_In_ DOUBLE vtime, _Out_ USHORT * pw DosDate, _Out_ USHORT * pwDosTime); WINOLEAUTAPI_(INT) VariantTimeToDosDateTime(_In_ DOUBLE vtime, _Out_ USHORT * pw DosDate, _Out_ USHORT * pwDosTime);
#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SY STEM) */
#pragma endregion #pragma endregion
#if (defined (_WIN32) || defined (_WIN64)) #if (defined (_WIN32) || defined (_WIN64))
#pragma region Application Family #pragma region Application Family or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM)
WINOLEAUTAPI_(INT) SystemTimeToVariantTime(_In_ LPSYSTEMTIME lpSystemTime, _Out_ DOUBLE *pvtime); WINOLEAUTAPI_(INT) SystemTimeToVariantTime(_In_ LPSYSTEMTIME lpSystemTime, _Out_ DOUBLE *pvtime);
WINOLEAUTAPI_(INT) VariantTimeToSystemTime(_In_ DOUBLE vtime, _Out_ LPSYSTEMTIME lpSystemTime); WINOLEAUTAPI_(INT) VariantTimeToSystemTime(_In_ DOUBLE vtime, _Out_ LPSYSTEMTIME lpSystemTime);
#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */ #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM ) */
#pragma endregion #pragma endregion
#endif /* (defined (_WIN32) || defined (_WIN64)) */ #endif /* (defined (_WIN32) || defined (_WIN64)) */
/*---------------------------------------------------------------------*/ /*---------------------------------------------------------------------*/
/* SafeArray API */ /* SafeArray API */
/*---------------------------------------------------------------------*/ /*---------------------------------------------------------------------*/
#pragma region Application Family #pragma region Application Family or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM)
WINOLEAUTAPI SafeArrayAllocDescriptor(_In_ UINT cDims, _Outptr_ SAFEARRAY ** pps aOut); WINOLEAUTAPI SafeArrayAllocDescriptor(_In_ UINT cDims, _Outptr_ SAFEARRAY ** pps aOut);
WINOLEAUTAPI SafeArrayAllocDescriptorEx(_In_ VARTYPE vt, _In_ UINT cDims, _Outpt r_ SAFEARRAY ** ppsaOut); WINOLEAUTAPI SafeArrayAllocDescriptorEx(_In_ VARTYPE vt, _In_ UINT cDims, _Outpt r_ SAFEARRAY ** ppsaOut);
WINOLEAUTAPI SafeArrayAllocData(_In_ SAFEARRAY * psa); WINOLEAUTAPI SafeArrayAllocData(_In_ SAFEARRAY * psa);
WINOLEAUTAPI_(SAFEARRAY *) SafeArrayCreate(_In_ VARTYPE vt, _In_ UINT cDims, _In _ SAFEARRAYBOUND * rgsabound); WINOLEAUTAPI_(SAFEARRAY *) SafeArrayCreate(_In_ VARTYPE vt, _In_ UINT cDims, _In _ SAFEARRAYBOUND * rgsabound);
WINOLEAUTAPI_(SAFEARRAY *) SafeArrayCreateEx(_In_ VARTYPE vt, _In_ UINT cDims, _ In_ SAFEARRAYBOUND * rgsabound, _In_ PVOID pvExtra); WINOLEAUTAPI_(SAFEARRAY *) SafeArrayCreateEx(_In_ VARTYPE vt, _In_ UINT cDims, _ In_ SAFEARRAYBOUND * rgsabound, _In_ PVOID pvExtra);
_Check_return_ _Check_return_
WINOLEAUTAPI SafeArrayCopyData(_In_ SAFEARRAY *psaSource, _In_ SAFEARRAY *psaTar get); WINOLEAUTAPI SafeArrayCopyData(_In_ SAFEARRAY *psaSource, _In_ SAFEARRAY *psaTar get);
WINOLEAUTAPI SafeArrayDestroyDescriptor(_In_ SAFEARRAY * psa); WINOLEAUTAPI SafeArrayDestroyDescriptor(_In_ SAFEARRAY * psa);
WINOLEAUTAPI SafeArrayDestroyData(_In_ SAFEARRAY * psa); WINOLEAUTAPI SafeArrayDestroyData(_In_ SAFEARRAY * psa);
skipping to change at line 151 skipping to change at line 157
WINOLEAUTAPI SafeArrayCopy(_In_ SAFEARRAY * psa, _Outptr_ SAFEARRAY ** ppsaOut); WINOLEAUTAPI SafeArrayCopy(_In_ SAFEARRAY * psa, _Outptr_ SAFEARRAY ** ppsaOut);
WINOLEAUTAPI SafeArrayPtrOfIndex(_In_ SAFEARRAY * psa, _In_reads_(psa->cDims) LO NG * rgIndices, _Outptr_result_bytebuffer_(psa->cbElements) void ** ppvData); WINOLEAUTAPI SafeArrayPtrOfIndex(_In_ SAFEARRAY * psa, _In_reads_(psa->cDims) LO NG * rgIndices, _Outptr_result_bytebuffer_(psa->cbElements) void ** ppvData);
WINOLEAUTAPI SafeArraySetRecordInfo(_In_ SAFEARRAY * psa, _In_ IRecordInfo * pri nfo); WINOLEAUTAPI SafeArraySetRecordInfo(_In_ SAFEARRAY * psa, _In_ IRecordInfo * pri nfo);
WINOLEAUTAPI SafeArrayGetRecordInfo(_In_ SAFEARRAY * psa, _Outptr_ IRecordInfo * * prinfo); WINOLEAUTAPI SafeArrayGetRecordInfo(_In_ SAFEARRAY * psa, _Outptr_ IRecordInfo * * prinfo);
WINOLEAUTAPI SafeArraySetIID(_In_ SAFEARRAY * psa, _In_ REFGUID guid); WINOLEAUTAPI SafeArraySetIID(_In_ SAFEARRAY * psa, _In_ REFGUID guid);
WINOLEAUTAPI SafeArrayGetIID(_In_ SAFEARRAY * psa, _Out_ GUID * pguid); WINOLEAUTAPI SafeArrayGetIID(_In_ SAFEARRAY * psa, _Out_ GUID * pguid);
WINOLEAUTAPI SafeArrayGetVartype(_In_ SAFEARRAY * psa, _Out_ VARTYPE * pvt); WINOLEAUTAPI SafeArrayGetVartype(_In_ SAFEARRAY * psa, _Out_ VARTYPE * pvt);
WINOLEAUTAPI_(SAFEARRAY *) SafeArrayCreateVector(_In_ VARTYPE vt, _In_ LONG lLbo und, _In_ ULONG cElements); WINOLEAUTAPI_(SAFEARRAY *) SafeArrayCreateVector(_In_ VARTYPE vt, _In_ LONG lLbo und, _In_ ULONG cElements);
WINOLEAUTAPI_(SAFEARRAY *) SafeArrayCreateVectorEx(_In_ VARTYPE vt, _In_ LONG lL bound, _In_ ULONG cElements, _In_ PVOID pvExtra); WINOLEAUTAPI_(SAFEARRAY *) SafeArrayCreateVectorEx(_In_ VARTYPE vt, _In_ LONG lL bound, _In_ ULONG cElements, _In_ PVOID pvExtra);
#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */ #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM ) */
#pragma endregion #pragma endregion
/*---------------------------------------------------------------------*/ /*---------------------------------------------------------------------*/
/* VARIANT API */ /* VARIANT API */
/*---------------------------------------------------------------------*/ /*---------------------------------------------------------------------*/
#pragma region Application Family #pragma region Application Family or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM)
WINOLEAUTAPI_(void) VariantInit(_Out_ VARIANTARG * pvarg); WINOLEAUTAPI_(void) VariantInit(_Out_ VARIANTARG * pvarg);
WINOLEAUTAPI VariantClear(_Inout_ VARIANTARG * pvarg); WINOLEAUTAPI VariantClear(_Inout_ VARIANTARG * pvarg);
_Check_return_ _Check_return_
WINOLEAUTAPI VariantCopy(_Inout_ VARIANTARG * pvargDest, _In_ const VARIANTARG * pvargSrc); WINOLEAUTAPI VariantCopy(_Inout_ VARIANTARG * pvargDest, _In_ const VARIANTARG * pvargSrc);
_Check_return_ _Check_return_
WINOLEAUTAPI VariantCopyInd(_Inout_ VARIANT * pvarDest, _In_ const VARIANTARG * pvargSrc); WINOLEAUTAPI VariantCopyInd(_Inout_ VARIANT * pvarDest, _In_ const VARIANTARG * pvargSrc);
_Check_return_ _Check_return_
WINOLEAUTAPI VariantChangeType(_Inout_ VARIANTARG * pvargDest, WINOLEAUTAPI VariantChangeType(_Inout_ VARIANTARG * pvargDest,
_In_ const VARIANTARG * pvarSrc, _In_ USHORT wFlags, _In_ VARTYPE vt); _In_ const VARIANTARG * pvarSrc, _In_ USHORT wFlags, _In_ VARTYPE vt);
_Check_return_ _Check_return_
WINOLEAUTAPI VariantChangeTypeEx(_Inout_ VARIANTARG * pvargDest, WINOLEAUTAPI VariantChangeTypeEx(_Inout_ VARIANTARG * pvargDest,
_In_ const VARIANTARG * pvarSrc, _In_ LCID lcid, _In_ USHORT wFla gs, _In_ VARTYPE vt); _In_ const VARIANTARG * pvarSrc, _In_ LCID lcid, _In_ USHORT wFla gs, _In_ VARTYPE vt);
#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */ #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM ) */
#pragma endregion #pragma endregion
// Flags for VariantChangeType/VariantChangeTypeEx // Flags for VariantChangeType/VariantChangeTypeEx
#define VARIANT_NOVALUEPROP 0x01 #define VARIANT_NOVALUEPROP 0x01
#define VARIANT_ALPHABOOL 0x02 // For VT_BOOL to VT_BSTR conversions, #define VARIANT_ALPHABOOL 0x02 // For VT_BOOL to VT_BSTR conversions,
// convert to "True"/"False" instead of // convert to "True"/"False" instead of
// "-1"/"0" // "-1"/"0"
#define VARIANT_NOUSEROVERRIDE 0x04 // For conversions to/from VT_BSTR, #define VARIANT_NOUSEROVERRIDE 0x04 // For conversions to/from VT_BSTR,
// passes LOCALE_NOUSEROVERRIDE // passes LOCALE_NOUSEROVERRIDE
// to core coercion routines // to core coercion routines
skipping to change at line 196 skipping to change at line 202
#define VARIANT_LOCALBOOL 0x10 // For VT_BOOL to VT_BSTR and back, #define VARIANT_LOCALBOOL 0x10 // For VT_BOOL to VT_BSTR and back,
// convert to local language rather than // convert to local language rather than
// English // English
#define VARIANT_CALENDAR_THAI 0x20 // SOUTHASIA calendar support #define VARIANT_CALENDAR_THAI 0x20 // SOUTHASIA calendar support
#define VARIANT_CALENDAR_GREGORIAN 0x40 // SOUTHASIA calendar support #define VARIANT_CALENDAR_GREGORIAN 0x40 // SOUTHASIA calendar support
#define VARIANT_USE_NLS 0x80 // NLS function call support #define VARIANT_USE_NLS 0x80 // NLS function call support
/*---------------------------------------------------------------------*/ /*---------------------------------------------------------------------*/
/* Vector <-> Bstr conversion APIs */ /* Vector <-> Bstr conversion APIs */
/*---------------------------------------------------------------------*/ /*---------------------------------------------------------------------*/
#pragma region Desktop Family #pragma region Desktop Family or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM)
_Check_return_ _Check_return_
WINOLEAUTAPI VectorFromBstr (_In_ BSTR bstr, _Outptr_ SAFEARRAY ** ppsa); WINOLEAUTAPI VectorFromBstr (_In_ BSTR bstr, _Outptr_ SAFEARRAY ** ppsa);
_Check_return_ _Check_return_
WINOLEAUTAPI BstrFromVector (_In_ SAFEARRAY *psa, _Out_ BSTR *pbstr); WINOLEAUTAPI BstrFromVector (_In_ SAFEARRAY *psa, _Out_ BSTR *pbstr);
#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SY STEM) */
#pragma endregion #pragma endregion
/*---------------------------------------------------------------------*/ /*---------------------------------------------------------------------*/
/* Variant API Flags */ /* Variant API Flags */
/*---------------------------------------------------------------------*/ /*---------------------------------------------------------------------*/
/* Any of the coersion functions that converts either from or to a string /* Any of the coersion functions that converts either from or to a string
* takes an additional lcid and dwFlags arguments. The lcid argument allows * takes an additional lcid and dwFlags arguments. The lcid argument allows
* locale specific parsing to occur. The dwFlags allow additional function * locale specific parsing to occur. The dwFlags allow additional function
* specific condition to occur. All function that accept the dwFlags argument * specific condition to occur. All function that accept the dwFlags argument
skipping to change at line 275 skipping to change at line 281
/*---------------------------------------------------------------------*/ /*---------------------------------------------------------------------*/
/* VARTYPE Coercion API */ /* VARTYPE Coercion API */
/*---------------------------------------------------------------------*/ /*---------------------------------------------------------------------*/
/* Note: The routines that convert *from* a string are defined /* Note: The routines that convert *from* a string are defined
* to take a OLECHAR* rather than a BSTR because no allocation is * to take a OLECHAR* rather than a BSTR because no allocation is
* required, and this makes the routines a bit more generic. * required, and this makes the routines a bit more generic.
* They may of course still be passed a BSTR as the strIn param. * They may of course still be passed a BSTR as the strIn param.
*/ */
#pragma region Application Family #pragma region Application Family or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM)
WINOLEAUTAPI VarUI1FromI2(SHORT sIn, _Out_ BYTE * pbOut); WINOLEAUTAPI VarUI1FromI2(SHORT sIn, _Out_ BYTE * pbOut);
WINOLEAUTAPI VarUI1FromI4(LONG lIn, _Out_ BYTE * pbOut); WINOLEAUTAPI VarUI1FromI4(LONG lIn, _Out_ BYTE * pbOut);
WINOLEAUTAPI VarUI1FromI8(LONG64 i64In, _Out_ BYTE FAR* pbOut); WINOLEAUTAPI VarUI1FromI8(LONG64 i64In, _Out_ BYTE FAR* pbOut);
WINOLEAUTAPI VarUI1FromR4(FLOAT fltIn, _Out_ BYTE * pbOut); WINOLEAUTAPI VarUI1FromR4(FLOAT fltIn, _Out_ BYTE * pbOut);
WINOLEAUTAPI VarUI1FromR8(DOUBLE dblIn, _Out_ BYTE * pbOut); WINOLEAUTAPI VarUI1FromR8(DOUBLE dblIn, _Out_ BYTE * pbOut);
WINOLEAUTAPI VarUI1FromCy(CY cyIn, _Out_ BYTE * pbOut); WINOLEAUTAPI VarUI1FromCy(CY cyIn, _Out_ BYTE * pbOut);
WINOLEAUTAPI VarUI1FromDate(DATE dateIn, _Out_ BYTE * pbOut); WINOLEAUTAPI VarUI1FromDate(DATE dateIn, _Out_ BYTE * pbOut);
WINOLEAUTAPI VarUI1FromStr(_In_ LPCOLESTR strIn, LCID lcid, ULONG dwFlags, _Out_ BYTE * pbOut); WINOLEAUTAPI VarUI1FromStr(_In_ LPCOLESTR strIn, LCID lcid, ULONG dwFlags, _Out_ BYTE * pbOut);
WINOLEAUTAPI VarUI1FromDisp(IDispatch * pdispIn, LCID lcid, _Out_ BYTE * pbOut); WINOLEAUTAPI VarUI1FromDisp(IDispatch * pdispIn, LCID lcid, _Out_ BYTE * pbOut);
skipping to change at line 571 skipping to change at line 577
WINOLEAUTAPI VarUI4FromI1(CHAR cIn, _Out_ ULONG *pulOut); WINOLEAUTAPI VarUI4FromI1(CHAR cIn, _Out_ ULONG *pulOut);
WINOLEAUTAPI VarUI4FromUI2(USHORT uiIn, _Out_ ULONG *pulOut); WINOLEAUTAPI VarUI4FromUI2(USHORT uiIn, _Out_ ULONG *pulOut);
WINOLEAUTAPI VarUI4FromUI8(ULONG64 ui64In, _Out_ ULONG *plOut); WINOLEAUTAPI VarUI4FromUI8(ULONG64 ui64In, _Out_ ULONG *plOut);
WINOLEAUTAPI VarUI4FromDec(_In_ const DECIMAL *pdecIn, _Out_ ULONG *pulOut); WINOLEAUTAPI VarUI4FromDec(_In_ const DECIMAL *pdecIn, _Out_ ULONG *pulOut);
/******************************************/ /******************************************/
WINOLEAUTAPI VarUI8FromUI1(BYTE bIn, _Out_ ULONG64 FAR* pi64Out); WINOLEAUTAPI VarUI8FromUI1(BYTE bIn, _Out_ ULONG64 FAR* pi64Out);
WINOLEAUTAPI VarUI8FromI2(SHORT sIn, _Out_ ULONG64 FAR* pi64Out); WINOLEAUTAPI VarUI8FromI2(SHORT sIn, _Out_ ULONG64 FAR* pi64Out);
#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */ #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM ) */
#pragma endregion #pragma endregion
#pragma region Desktop Family #pragma region Desktop Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
WINOLEAUTAPI VarUI8FromI4(LONG lIn, _Out_ ULONG64 FAR* pi64Out); WINOLEAUTAPI VarUI8FromI4(LONG lIn, _Out_ ULONG64 FAR* pi64Out);
#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */
#pragma endregion #pragma endregion
#pragma region Application Family #pragma region Application Family or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM)
WINOLEAUTAPI VarUI8FromI8(LONG64 ui64In, _Out_ ULONG64 FAR* pi64Out); WINOLEAUTAPI VarUI8FromI8(LONG64 ui64In, _Out_ ULONG64 FAR* pi64Out);
WINOLEAUTAPI VarUI8FromR4(FLOAT fltIn, _Out_ ULONG64 FAR* pi64Out); WINOLEAUTAPI VarUI8FromR4(FLOAT fltIn, _Out_ ULONG64 FAR* pi64Out);
WINOLEAUTAPI VarUI8FromR8(DOUBLE dblIn, _Out_ ULONG64 FAR* pi64Out); WINOLEAUTAPI VarUI8FromR8(DOUBLE dblIn, _Out_ ULONG64 FAR* pi64Out);
WINOLEAUTAPI VarUI8FromCy(CY cyIn, _Out_ ULONG64 FAR* pi64Out); WINOLEAUTAPI VarUI8FromCy(CY cyIn, _Out_ ULONG64 FAR* pi64Out);
WINOLEAUTAPI VarUI8FromDate(DATE dateIn, _Out_ ULONG64 FAR* pi64Out); WINOLEAUTAPI VarUI8FromDate(DATE dateIn, _Out_ ULONG64 FAR* pi64Out);
WINOLEAUTAPI VarUI8FromStr(_In_ LPCOLESTR strIn, _In_ LCID lcid, _In_ ULONG dwFl ags, _Out_ ULONG64 FAR* pi64Out); WINOLEAUTAPI VarUI8FromStr(_In_ LPCOLESTR strIn, _In_ LCID lcid, _In_ ULONG dwFl ags, _Out_ ULONG64 FAR* pi64Out);
WINOLEAUTAPI VarUI8FromDisp(_In_ IDispatch FAR* pdispIn, LCID lcid, _Out_ ULONG6 4 FAR* pi64Out); WINOLEAUTAPI VarUI8FromDisp(_In_ IDispatch FAR* pdispIn, LCID lcid, _Out_ ULONG6 4 FAR* pi64Out);
WINOLEAUTAPI VarUI8FromBool(VARIANT_BOOL boolIn, _Out_ ULONG64 FAR* pi64Out); WINOLEAUTAPI VarUI8FromBool(VARIANT_BOOL boolIn, _Out_ ULONG64 FAR* pi64Out);
WINOLEAUTAPI VarUI8FromI1(CHAR cIn, _Out_ ULONG64 FAR* pi64Out); WINOLEAUTAPI VarUI8FromI1(CHAR cIn, _Out_ ULONG64 FAR* pi64Out);
skipping to change at line 616 skipping to change at line 622
WINOLEAUTAPI VarDecFromDate(_In_ DATE dateIn, _Out_ DECIMAL *pdecOut); WINOLEAUTAPI VarDecFromDate(_In_ DATE dateIn, _Out_ DECIMAL *pdecOut);
WINOLEAUTAPI VarDecFromCy(_In_ CY cyIn, _Out_ DECIMAL *pdecOut); WINOLEAUTAPI VarDecFromCy(_In_ CY cyIn, _Out_ DECIMAL *pdecOut);
WINOLEAUTAPI VarDecFromStr(_In_ LPCOLESTR strIn, _In_ LCID lcid, _In_ ULONG dwFl ags, _Out_ DECIMAL *pdecOut); WINOLEAUTAPI VarDecFromStr(_In_ LPCOLESTR strIn, _In_ LCID lcid, _In_ ULONG dwFl ags, _Out_ DECIMAL *pdecOut);
WINOLEAUTAPI VarDecFromDisp(_In_ IDispatch *pdispIn, _In_ LCID lcid, _Out_ DECIM AL *pdecOut); WINOLEAUTAPI VarDecFromDisp(_In_ IDispatch *pdispIn, _In_ LCID lcid, _Out_ DECIM AL *pdecOut);
WINOLEAUTAPI VarDecFromBool(_In_ VARIANT_BOOL boolIn, _Out_ DECIMAL *pdecOut); WINOLEAUTAPI VarDecFromBool(_In_ VARIANT_BOOL boolIn, _Out_ DECIMAL *pdecOut);
WINOLEAUTAPI VarDecFromI1(_In_ CHAR cIn, _Out_ DECIMAL *pdecOut); WINOLEAUTAPI VarDecFromI1(_In_ CHAR cIn, _Out_ DECIMAL *pdecOut);
WINOLEAUTAPI VarDecFromUI2(_In_ USHORT uiIn, _Out_ DECIMAL *pdecOut); WINOLEAUTAPI VarDecFromUI2(_In_ USHORT uiIn, _Out_ DECIMAL *pdecOut);
WINOLEAUTAPI VarDecFromUI4(_In_ ULONG ulIn, _Out_ DECIMAL *pdecOut); WINOLEAUTAPI VarDecFromUI4(_In_ ULONG ulIn, _Out_ DECIMAL *pdecOut);
WINOLEAUTAPI VarDecFromUI8(ULONG64 ui64In, _Out_ DECIMAL *pdecOut); WINOLEAUTAPI VarDecFromUI8(ULONG64 ui64In, _Out_ DECIMAL *pdecOut);
#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */ #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM ) */
#pragma endregion #pragma endregion
#define VarUI4FromUI4(in, pOut) (*(pOut) = (in)) #define VarUI4FromUI4(in, pOut) (*(pOut) = (in))
#define VarI4FromI4(in, pOut) (*(pOut) = (in)) #define VarI4FromI4(in, pOut) (*(pOut) = (in))
#pragma region Application Family #pragma region Application Family or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM)
WINOLEAUTAPI VarI4FromI8(LONG64 i64In, _Out_ LONG *plOut); WINOLEAUTAPI VarI4FromI8(LONG64 i64In, _Out_ LONG *plOut);
WINOLEAUTAPI VarI4FromUI8(ULONG64 ui64In, _Out_ LONG *plOut); WINOLEAUTAPI VarI4FromUI8(ULONG64 ui64In, _Out_ LONG *plOut);
#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */ #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM ) */
#pragma endregion #pragma endregion
#define VarUI8FromUI8(in, pOut) (*(pOut) = (in)) #define VarUI8FromUI8(in, pOut) (*(pOut) = (in))
#define VarI8FromI8(in, pOut) (*(pOut) = (in)) #define VarI8FromI8(in, pOut) (*(pOut) = (in))
#define VarUI1FromInt VarUI1FromI4 #define VarUI1FromInt VarUI1FromI4
#define VarUI1FromUint VarUI1FromUI4 #define VarUI1FromUint VarUI1FromUI4
#define VarI2FromInt VarI2FromI4 #define VarI2FromInt VarI2FromI4
#define VarI2FromUint VarI2FromUI4 #define VarI2FromUint VarI2FromUI4
skipping to change at line 761 skipping to change at line 767
#define VTBIT_UI2 (1 << VT_UI2) #define VTBIT_UI2 (1 << VT_UI2)
#define VTBIT_I4 (1 << VT_I4) #define VTBIT_I4 (1 << VT_I4)
#define VTBIT_UI4 (1 << VT_UI4) #define VTBIT_UI4 (1 << VT_UI4)
#define VTBIT_I8 (1 << VT_I8) #define VTBIT_I8 (1 << VT_I8)
#define VTBIT_UI8 (1 << VT_UI8) #define VTBIT_UI8 (1 << VT_UI8)
#define VTBIT_R4 (1 << VT_R4) #define VTBIT_R4 (1 << VT_R4)
#define VTBIT_R8 (1 << VT_R8) #define VTBIT_R8 (1 << VT_R8)
#define VTBIT_CY (1 << VT_CY) #define VTBIT_CY (1 << VT_CY)
#define VTBIT_DECIMAL (1 << VT_DECIMAL) #define VTBIT_DECIMAL (1 << VT_DECIMAL)
#pragma region Application Family #pragma region Application Family or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM)
_Check_return_ _Check_return_
WINOLEAUTAPI VarParseNumFromStr(_In_ LPCOLESTR strIn, _In_ LCID lcid, _In_ ULONG dwFlags, WINOLEAUTAPI VarParseNumFromStr(_In_ LPCOLESTR strIn, _In_ LCID lcid, _In_ ULONG dwFlags,
_Out_ NUMPARSE * pnumprs, _Out_ BYTE * rgbDig); _Out_ NUMPARSE * pnumprs, _Out_ BYTE * rgbDig);
_Check_return_ _Check_return_
WINOLEAUTAPI VarNumFromParseNum(_In_ NUMPARSE * pnumprs, _In_ BYTE * rgbDig, WINOLEAUTAPI VarNumFromParseNum(_In_ NUMPARSE * pnumprs, _In_reads_(pnumprs->cDi g) BYTE * rgbDig,
_In_ ULONG dwVtBits, _Out_ VARIANT * pvar); _In_ ULONG dwVtBits, _Out_ VARIANT * pvar);
#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */ #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM ) */
#pragma endregion #pragma endregion
/*---------------------------------------------------------------------*/ /*---------------------------------------------------------------------*/
/* VARTYPE Math API */ /* VARTYPE Math API */
/*---------------------------------------------------------------------*/ /*---------------------------------------------------------------------*/
#pragma region Application Family #pragma region Application Family or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM)
STDAPI VarAdd(_In_ LPVARIANT pvarLeft, _In_ LPVARIANT pvarRight, _Out_ LPVARIANT pvarResult); STDAPI VarAdd(_In_ LPVARIANT pvarLeft, _In_ LPVARIANT pvarRight, _Out_ LPVARIANT pvarResult);
STDAPI VarAnd(_In_ LPVARIANT pvarLeft, _In_ LPVARIANT pvarRight, _Out_ LPVARIANT pvarResult); STDAPI VarAnd(_In_ LPVARIANT pvarLeft, _In_ LPVARIANT pvarRight, _Out_ LPVARIANT pvarResult);
STDAPI VarCat(_In_ LPVARIANT pvarLeft, _In_ LPVARIANT pvarRight, _Out_ LPVARIANT pvarResult); STDAPI VarCat(_In_ LPVARIANT pvarLeft, _In_ LPVARIANT pvarRight, _Out_ LPVARIANT pvarResult);
STDAPI VarDiv(_In_ LPVARIANT pvarLeft, _In_ LPVARIANT pvarRight, _Out_ LPVARIANT pvarResult); STDAPI VarDiv(_In_ LPVARIANT pvarLeft, _In_ LPVARIANT pvarRight, _Out_ LPVARIANT pvarResult);
STDAPI VarEqv(_In_ LPVARIANT pvarLeft, _In_ LPVARIANT pvarRight, _Out_ LPVARIANT pvarResult); STDAPI VarEqv(_In_ LPVARIANT pvarLeft, _In_ LPVARIANT pvarRight, _Out_ LPVARIANT pvarResult);
STDAPI VarIdiv(_In_ LPVARIANT pvarLeft, _In_ LPVARIANT pvarRight, _Out_ LPVARIAN T pvarResult); STDAPI VarIdiv(_In_ LPVARIANT pvarLeft, _In_ LPVARIANT pvarRight, _Out_ LPVARIAN T pvarResult);
STDAPI VarImp(_In_ LPVARIANT pvarLeft, _In_ LPVARIANT pvarRight, _Out_ LPVARIANT pvarResult); STDAPI VarImp(_In_ LPVARIANT pvarLeft, _In_ LPVARIANT pvarRight, _Out_ LPVARIANT pvarResult);
STDAPI VarMod(_In_ LPVARIANT pvarLeft, _In_ LPVARIANT pvarRight, _Out_ LPVARIANT pvarResult); STDAPI VarMod(_In_ LPVARIANT pvarLeft, _In_ LPVARIANT pvarRight, _Out_ LPVARIANT pvarResult);
STDAPI VarMul(_In_ LPVARIANT pvarLeft, _In_ LPVARIANT pvarRight, _Out_ LPVARIANT pvarResult); STDAPI VarMul(_In_ LPVARIANT pvarLeft, _In_ LPVARIANT pvarRight, _Out_ LPVARIANT pvarResult);
skipping to change at line 807 skipping to change at line 813
STDAPI VarFix(_In_ LPVARIANT pvarIn, _Out_ LPVARIANT pvarResult); STDAPI VarFix(_In_ LPVARIANT pvarIn, _Out_ LPVARIANT pvarResult);
STDAPI VarInt(_In_ LPVARIANT pvarIn, _Out_ LPVARIANT pvarResult); STDAPI VarInt(_In_ LPVARIANT pvarIn, _Out_ LPVARIANT pvarResult);
STDAPI VarNeg(_In_ LPVARIANT pvarIn, _Out_ LPVARIANT pvarResult); STDAPI VarNeg(_In_ LPVARIANT pvarIn, _Out_ LPVARIANT pvarResult);
STDAPI VarNot(_In_ LPVARIANT pvarIn, _Out_ LPVARIANT pvarResult); STDAPI VarNot(_In_ LPVARIANT pvarIn, _Out_ LPVARIANT pvarResult);
STDAPI VarRound(_In_ LPVARIANT pvarIn, _In_ int cDecimals, _Out_ LPVARIANT pvarR esult); STDAPI VarRound(_In_ LPVARIANT pvarIn, _In_ int cDecimals, _Out_ LPVARIANT pvarR esult);
// dwFlags passed to CompareString if a string compare // dwFlags passed to CompareString if a string compare
STDAPI VarCmp(_In_ LPVARIANT pvarLeft, _In_ LPVARIANT pvarRight, _In_ LCID lcid, _In_ ULONG dwFlags); STDAPI VarCmp(_In_ LPVARIANT pvarLeft, _In_ LPVARIANT pvarRight, _In_ LCID lcid, _In_ ULONG dwFlags);
#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */ #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM ) */
#pragma endregion #pragma endregion
#ifdef __cplusplus #ifdef __cplusplus
extern "C++" { extern "C++" {
#pragma region Application Family #pragma region Application Family or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM)
// Add wrapper for old ATL headers to call // Add wrapper for old ATL headers to call
__inline __inline
HRESULT HRESULT
#if !defined(_M_CEE_PURE) #if !defined(_M_CEE_PURE)
STDAPICALLTYPE STDAPICALLTYPE
#endif #endif
VarCmp(LPVARIANT pvarLeft, LPVARIANT pvarRight, LCID lcid) { VarCmp(LPVARIANT pvarLeft, LPVARIANT pvarRight, LCID lcid) {
return VarCmp(pvarLeft, pvarRight, lcid, 0); return VarCmp(pvarLeft, pvarRight, lcid, 0);
} }
#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */ #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM ) */
#pragma endregion #pragma endregion
} // extern "C++" } // extern "C++"
#endif /* __cplusplus */ #endif /* __cplusplus */
// Decimal math // Decimal math
// //
#pragma region Application Family #pragma region Application Family or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM)
STDAPI VarDecAdd(_In_ LPDECIMAL pdecLeft, _In_ LPDECIMAL pdecRight, _Out_ LPDECI MAL pdecResult); STDAPI VarDecAdd(_In_ LPDECIMAL pdecLeft, _In_ LPDECIMAL pdecRight, _Out_ LPDECI MAL pdecResult);
STDAPI VarDecDiv(_In_ LPDECIMAL pdecLeft, _In_ LPDECIMAL pdecRight, _Out_ LPDECI MAL pdecResult); STDAPI VarDecDiv(_In_ LPDECIMAL pdecLeft, _In_ LPDECIMAL pdecRight, _Out_ LPDECI MAL pdecResult);
STDAPI VarDecMul(_In_ LPDECIMAL pdecLeft, _In_ LPDECIMAL pdecRight, _Out_ LPDECI MAL pdecResult); STDAPI VarDecMul(_In_ LPDECIMAL pdecLeft, _In_ LPDECIMAL pdecRight, _Out_ LPDECI MAL pdecResult);
STDAPI VarDecSub(_In_ LPDECIMAL pdecLeft, _In_ LPDECIMAL pdecRight, _Out_ LPDECI MAL pdecResult); STDAPI VarDecSub(_In_ LPDECIMAL pdecLeft, _In_ LPDECIMAL pdecRight, _Out_ LPDECI MAL pdecResult);
STDAPI VarDecAbs(_In_ LPDECIMAL pdecIn, _Out_ LPDECIMAL pdecResult); STDAPI VarDecAbs(_In_ LPDECIMAL pdecIn, _Out_ LPDECIMAL pdecResult);
STDAPI VarDecFix(_In_ LPDECIMAL pdecIn, _Out_ LPDECIMAL pdecResult); STDAPI VarDecFix(_In_ LPDECIMAL pdecIn, _Out_ LPDECIMAL pdecResult);
STDAPI VarDecInt(_In_ LPDECIMAL pdecIn, _Out_ LPDECIMAL pdecResult); STDAPI VarDecInt(_In_ LPDECIMAL pdecIn, _Out_ LPDECIMAL pdecResult);
STDAPI VarDecNeg(_In_ LPDECIMAL pdecIn, _Out_ LPDECIMAL pdecResult); STDAPI VarDecNeg(_In_ LPDECIMAL pdecIn, _Out_ LPDECIMAL pdecResult);
skipping to change at line 879 skipping to change at line 885
STDAPI VarCyCmpR8(_In_ CY cyLeft, _In_ double dblRight); STDAPI VarCyCmpR8(_In_ CY cyLeft, _In_ double dblRight);
// Misc support functions // Misc support functions
// //
STDAPI VarBstrCat(_In_ BSTR bstrLeft, _In_ BSTR bstrRight, _Out_ LPBSTR pbstrRes ult); STDAPI VarBstrCat(_In_ BSTR bstrLeft, _In_ BSTR bstrRight, _Out_ LPBSTR pbstrRes ult);
STDAPI VarBstrCmp(_In_ BSTR bstrLeft, _In_ BSTR bstrRight, _In_ LCID lcid, _In_ ULONG dwFlags); // dwFlags passed to CompareString STDAPI VarBstrCmp(_In_ BSTR bstrLeft, _In_ BSTR bstrRight, _In_ LCID lcid, _In_ ULONG dwFlags); // dwFlags passed to CompareString
STDAPI VarR8Pow(_In_ double dblLeft, _In_ double dblRight, _Out_ double *pdblRes ult); STDAPI VarR8Pow(_In_ double dblLeft, _In_ double dblRight, _Out_ double *pdblRes ult);
STDAPI VarR4CmpR8(_In_ float fltLeft, _In_ double dblRight); STDAPI VarR4CmpR8(_In_ float fltLeft, _In_ double dblRight);
STDAPI VarR8Round(_In_ double dblIn, _In_ int cDecimals, _Out_ double *pdblResul t); STDAPI VarR8Round(_In_ double dblIn, _In_ int cDecimals, _Out_ double *pdblResul t);
#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */ #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM ) */
#pragma endregion #pragma endregion
// Compare results. These are returned as a SUCCESS HResult. Subtracting // Compare results. These are returned as a SUCCESS HResult. Subtracting
// one gives the usual values of -1 for Less Than, 0 for Equal To, +1 for // one gives the usual values of -1 for Less Than, 0 for Equal To, +1 for
// Greater Than. // Greater Than.
// //
#define VARCMP_LT 0 #define VARCMP_LT 0
#define VARCMP_EQ 1 #define VARCMP_EQ 1
#define VARCMP_GT 2 #define VARCMP_GT 2
#define VARCMP_NULL 3 #define VARCMP_NULL 3
skipping to change at line 916 skipping to change at line 922
typedef struct { typedef struct {
SYSTEMTIME st; SYSTEMTIME st;
USHORT wDayOfYear; USHORT wDayOfYear;
} UDATE; } UDATE;
/* APIs to "pack" and "unpack" dates. /* APIs to "pack" and "unpack" dates.
* NOTE: Ex version of VarDateFromUdate obeys 2 digit year setting in * NOTE: Ex version of VarDateFromUdate obeys 2 digit year setting in
* control panel. * control panel.
*/ */
#pragma region Application Family #pragma region Application Family or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM)
_Check_return_ _Check_return_
WINOLEAUTAPI VarDateFromUdate(_In_ UDATE *pudateIn, _In_ ULONG dwFlags, _Out_ DA TE *pdateOut); WINOLEAUTAPI VarDateFromUdate(_In_ UDATE *pudateIn, _In_ ULONG dwFlags, _Out_ DA TE *pdateOut);
WINOLEAUTAPI VarDateFromUdateEx(_In_ UDATE *pudateIn, _In_ LCID lcid, _In_ ULONG dwFlags, _Out_ DATE *pdateOut); WINOLEAUTAPI VarDateFromUdateEx(_In_ UDATE *pudateIn, _In_ LCID lcid, _In_ ULONG dwFlags, _Out_ DATE *pdateOut);
_Check_return_ _Check_return_
WINOLEAUTAPI VarUdateFromDate(_In_ DATE dateIn, _In_ ULONG dwFlags, _Out_ UDATE *pudateOut); WINOLEAUTAPI VarUdateFromDate(_In_ DATE dateIn, _In_ ULONG dwFlags, _Out_ UDATE *pudateOut);
#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */ #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM ) */
#pragma endregion #pragma endregion
#pragma region Desktop Family #pragma region Desktop Family or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM)
/* API to retrieve the secondary(altername) month names /* API to retrieve the secondary(altername) month names
Useful for Hijri, Polish and Russian alternate month names Useful for Hijri, Polish and Russian alternate month names
*/ */
_Check_return_ _Check_return_
WINOLEAUTAPI GetAltMonthNames(LCID lcid, _Outptr_result_buffer_maybenull_(13) LP OLESTR * * prgp); WINOLEAUTAPI GetAltMonthNames(LCID lcid, _Outptr_result_buffer_maybenull_(13) LP OLESTR * * prgp);
/*---------------------------------------------------------------------*/ /*---------------------------------------------------------------------*/
/* Format */ /* Format */
/*---------------------------------------------------------------------*/ /*---------------------------------------------------------------------*/
#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SY STEM) */
#pragma endregion #pragma endregion
#pragma region Application Family #pragma region Application Family or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM)
WINOLEAUTAPI VarFormat( WINOLEAUTAPI VarFormat(
_In_ LPVARIANT pvarIn, _In_ LPVARIANT pvarIn,
_In_opt_ LPOLESTR pstrFormat, _In_opt_ LPOLESTR pstrFormat,
int iFirstDay, int iFirstDay,
int iFirstWeek, int iFirstWeek,
ULONG dwFlags, ULONG dwFlags,
_Out_ BSTR *pbstrOut _Out_ BSTR *pbstrOut
); );
skipping to change at line 1027 skipping to change at line 1033
WINOLEAUTAPI VarTokenizeFormatString( WINOLEAUTAPI VarTokenizeFormatString(
_In_opt_ LPOLESTR pstrFormat, _In_opt_ LPOLESTR pstrFormat,
_Inout_ LPBYTE rgbTok, _Inout_ LPBYTE rgbTok,
int cbTok, int cbTok,
int iFirstDay, int iFirstDay,
int iFirstWeek, int iFirstWeek,
LCID lcid, LCID lcid,
_In_opt_ int *pcbActual _In_opt_ int *pcbActual
); );
#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */ #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM ) */
#pragma endregion #pragma endregion
#pragma region Desktop Family #pragma region Desktop Family or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM)
/*---------------------------------------------------------------------*/ /*---------------------------------------------------------------------*/
/* ITypeLib */ /* ITypeLib */
/*---------------------------------------------------------------------*/ /*---------------------------------------------------------------------*/
typedef /* [unique] */ __RPC_unique_pointer ITypeLib *LPTYPELIB; typedef /* [unique] */ __RPC_unique_pointer ITypeLib *LPTYPELIB;
/*---------------------------------------------------------------------*/ /*---------------------------------------------------------------------*/
/* ITypeInfo */ /* ITypeInfo */
/*---------------------------------------------------------------------*/ /*---------------------------------------------------------------------*/
typedef LONG DISPID; typedef LONG DISPID;
typedef DISPID MEMBERID; typedef DISPID MEMBERID;
#define MEMBERID_NIL DISPID_UNKNOWN #define MEMBERID_NIL DISPID_UNKNOWN
#define ID_DEFAULTINST -2 #define ID_DEFAULTINST -2
#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SY STEM) */
#pragma endregion #pragma endregion
#pragma region Application Family #pragma region Application Family or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM)
/* Flags for IDispatch::Invoke */ /* Flags for IDispatch::Invoke */
#define DISPATCH_METHOD 0x1 #define DISPATCH_METHOD 0x1
#define DISPATCH_PROPERTYGET 0x2 #define DISPATCH_PROPERTYGET 0x2
#define DISPATCH_PROPERTYPUT 0x4 #define DISPATCH_PROPERTYPUT 0x4
#define DISPATCH_PROPERTYPUTREF 0x8 #define DISPATCH_PROPERTYPUTREF 0x8
#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */ #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM ) */
#pragma endregion #pragma endregion
#pragma region Desktop Family #pragma region Desktop Family or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM)
typedef /* [unique] */ __RPC_unique_pointer ITypeInfo *LPTYPEINFO; typedef /* [unique] */ __RPC_unique_pointer ITypeInfo *LPTYPEINFO;
/*---------------------------------------------------------------------*/ /*---------------------------------------------------------------------*/
/* ITypeComp */ /* ITypeComp */
/*---------------------------------------------------------------------*/ /*---------------------------------------------------------------------*/
typedef /* [unique] */ __RPC_unique_pointer ITypeComp *LPTYPECOMP; typedef /* [unique] */ __RPC_unique_pointer ITypeComp *LPTYPECOMP;
/*---------------------------------------------------------------------*/ /*---------------------------------------------------------------------*/
skipping to change at line 1225 skipping to change at line 1231
/* Automatic TypeInfo driven implementation of IDispatch::GetIDsOfNames() /* Automatic TypeInfo driven implementation of IDispatch::GetIDsOfNames()
*/ */
_Check_return_ WINOLEAUTAPI DispGetIDsOfNames(ITypeInfo * ptinfo, _In_reads_(cNa mes) OLECHAR ** rgszNames, _Check_return_ WINOLEAUTAPI DispGetIDsOfNames(ITypeInfo * ptinfo, _In_reads_(cNa mes) OLECHAR ** rgszNames,
UINT cNames, _Out_writes_(cNames) DISPID * rgdispid); UINT cNames, _Out_writes_(cNames) DISPID * rgdispid);
/* Automatic TypeInfo driven implementation of IDispatch::Invoke() /* Automatic TypeInfo driven implementation of IDispatch::Invoke()
*/ */
_Check_return_ _Check_return_
#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SY STEM) */
#pragma endregion #pragma endregion
#pragma region Application Family #pragma region Application Family or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM)
WINOLEAUTAPI DispInvoke(void * _this, ITypeInfo * ptinfo, DISPID dispidMember, WINOLEAUTAPI DispInvoke(void * _this, ITypeInfo * ptinfo, DISPID dispidMember,
WORD wFlags, DISPPARAMS * pparams, VARIANT * pvarResult, WORD wFlags, DISPPARAMS * pparams, VARIANT * pvarResult,
EXCEPINFO * pexcepinfo, UINT * puArgErr); EXCEPINFO * pexcepinfo, UINT * puArgErr);
#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */ #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM ) */
#pragma endregion #pragma endregion
#pragma region Desktop Family #pragma region Desktop Family or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM)
/* Construct a TypeInfo from an interface data description /* Construct a TypeInfo from an interface data description
*/ */
_Check_return_ _Check_return_
WINOLEAUTAPI CreateDispTypeInfo(INTERFACEDATA * pidata, LCID lcid, WINOLEAUTAPI CreateDispTypeInfo(INTERFACEDATA * pidata, LCID lcid,
ITypeInfo ** pptinfo); ITypeInfo ** pptinfo);
/* Create an instance of the standard TypeInfo driven IDispatch /* Create an instance of the standard TypeInfo driven IDispatch
* implementation. * implementation.
*/ */
skipping to change at line 1311 skipping to change at line 1317
/*---------------------------------------------------------------------*/ /*---------------------------------------------------------------------*/
WINOLEAUTAPI_(ULONG) OaBuildVersion(void); WINOLEAUTAPI_(ULONG) OaBuildVersion(void);
WINOLEAUTAPI_(void) ClearCustData(LPCUSTDATA pCustData); WINOLEAUTAPI_(void) ClearCustData(LPCUSTDATA pCustData);
#if (NTDDI_VERSION >= NTDDI_VISTASP1) #if (NTDDI_VERSION >= NTDDI_VISTASP1)
WINOLEAUTAPI_(void) OaEnablePerUserTLibRegistration(void); WINOLEAUTAPI_(void) OaEnablePerUserTLibRegistration(void);
#endif #endif
#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SY STEM) */
#pragma endregion #pragma endregion
// Declare variant access functions. // Declare variant access functions.
#if __STDC__ || defined(NONAMELESSUNION) #if __STDC__ || defined(NONAMELESSUNION)
#define V_UNION(X, Y) ((X)->n1.n2.n3.Y) #define V_UNION(X, Y) ((X)->n1.n2.n3.Y)
#define V_VT(X) ((X)->n1.n2.vt) #define V_VT(X) ((X)->n1.n2.vt)
#define V_RECORDINFO(X) ((X)->n1.n2.n3.brecVal.pRecInfo) #define V_RECORDINFO(X) ((X)->n1.n2.n3.brecVal.pRecInfo)
#define V_RECORD(X) ((X)->n1.n2.n3.brecVal.pvRecord) #define V_RECORD(X) ((X)->n1.n2.n3.brecVal.pvRecord)
#else #else
skipping to change at line 1399 skipping to change at line 1405
#define V_BYREF(X) V_UNION(X, byref) #define V_BYREF(X) V_UNION(X, byref)
#define V_DECIMAL(X) V_UNION(X, decVal) #define V_DECIMAL(X) V_UNION(X, decVal)
#define V_DECIMALREF(X) V_UNION(X, pdecVal) #define V_DECIMALREF(X) V_UNION(X, pdecVal)
#ifndef RC_INVOKED #ifndef RC_INVOKED
#include <poppack.h> #include <poppack.h>
#endif // RC_INVOKED #endif // RC_INVOKED
#endif // __OLEAUTO_H__ #endif // __OLEAUTO_H__
#if _MSC_VER >= 1200
#pragma warning(pop)
#endif
 End of changes. 45 change blocks. 
64 lines changed or deleted 70 lines changed or added

This html diff was produced by rfcdiff 1.41.