Headers diff for propsys.dll between 7.00.9600.17415-Windows 8.1 and 7.00.10586.494-Windows 10 1511 10586.494 versions



 propsys.h (7.00.9600.17415-Windows 8.1)   propsys.h (7.00.10586.494-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 __propsys_h__ #ifndef __propsys_h__
#define __propsys_h__ #define __propsys_h__
#if defined(_MSC_VER) && (_MSC_VER >= 1020) #if defined(_MSC_VER) && (_MSC_VER >= 1020)
skipping to change at line 201 skipping to change at line 199
#define __InMemoryPropertyStore_FWD_DEFINED__ #define __InMemoryPropertyStore_FWD_DEFINED__
#ifdef __cplusplus #ifdef __cplusplus
typedef class InMemoryPropertyStore InMemoryPropertyStore; typedef class InMemoryPropertyStore InMemoryPropertyStore;
#else #else
typedef struct InMemoryPropertyStore InMemoryPropertyStore; typedef struct InMemoryPropertyStore InMemoryPropertyStore;
#endif /* __cplusplus */ #endif /* __cplusplus */
#endif /* __InMemoryPropertyStore_FWD_DEFINED__ */ #endif /* __InMemoryPropertyStore_FWD_DEFINED__ */
#ifndef __InMemoryPropertyStoreMarshalByValue_FWD_DEFINED__
#define __InMemoryPropertyStoreMarshalByValue_FWD_DEFINED__
#ifdef __cplusplus
typedef class InMemoryPropertyStoreMarshalByValue InMemoryPropertyStoreMarshalBy
Value;
#else
typedef struct InMemoryPropertyStoreMarshalByValue InMemoryPropertyStoreMarshalB
yValue;
#endif /* __cplusplus */
#endif /* __InMemoryPropertyStoreMarshalByValue_FWD_DEFINED__ */
#ifndef __PropertySystem_FWD_DEFINED__ #ifndef __PropertySystem_FWD_DEFINED__
#define __PropertySystem_FWD_DEFINED__ #define __PropertySystem_FWD_DEFINED__
#ifdef __cplusplus #ifdef __cplusplus
typedef class PropertySystem PropertySystem; typedef class PropertySystem PropertySystem;
#else #else
typedef struct PropertySystem PropertySystem; typedef struct PropertySystem PropertySystem;
#endif /* __cplusplus */ #endif /* __cplusplus */
#endif /* __PropertySystem_FWD_DEFINED__ */ #endif /* __PropertySystem_FWD_DEFINED__ */
skipping to change at line 243 skipping to change at line 252
#define PSSTDAPI_(type) EXTERN_C DECLSPEC_IMPORT type STDAPICALLTYPE #define PSSTDAPI_(type) EXTERN_C DECLSPEC_IMPORT type STDAPICALLTYPE
#endif #endif
#endif // PSSTDAPI #endif // PSSTDAPI
#if 0 #if 0
typedef PROPERTYKEY *REFPROPERTYKEY; typedef PROPERTYKEY *REFPROPERTYKEY;
#endif // 0 #endif // 0
#include <propkeydef.h> #include <propkeydef.h>
#pragma region Desktop Family #pragma region Desktop Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
#if _MSC_VER >= 1200
#pragma warning(push)
#ifndef _MSC_EXTENSIONS
#pragma warning(disable:4309) /* truncation of constant value */
#endif
#endif
extern RPC_IF_HANDLE __MIDL_itf_propsys_0000_0000_v0_0_c_ifspec; extern RPC_IF_HANDLE __MIDL_itf_propsys_0000_0000_v0_0_c_ifspec;
extern RPC_IF_HANDLE __MIDL_itf_propsys_0000_0000_v0_0_s_ifspec; extern RPC_IF_HANDLE __MIDL_itf_propsys_0000_0000_v0_0_s_ifspec;
#ifndef __IInitializeWithFile_INTERFACE_DEFINED__ #ifndef __IInitializeWithFile_INTERFACE_DEFINED__
#define __IInitializeWithFile_INTERFACE_DEFINED__ #define __IInitializeWithFile_INTERFACE_DEFINED__
/* interface IInitializeWithFile */ /* interface IInitializeWithFile */
/* [unique][object][uuid] */ /* [unique][object][uuid] */
skipping to change at line 533 skipping to change at line 548
#endif /* C style interface */ #endif /* C style interface */
#endif /* __IPropertyStore_INTERFACE_DEFINED__ */ #endif /* __IPropertyStore_INTERFACE_DEFINED__ */
/* interface __MIDL_itf_propsys_0000_0003 */ /* interface __MIDL_itf_propsys_0000_0003 */
/* [local] */ /* [local] */
typedef /* [unique] */ __RPC_unique_pointer IPropertyStore *LPPROPERTYSTORE; typedef /* [unique] */ __RPC_unique_pointer IPropertyStore *LPPROPERTYSTORE;
PSSTDAPI PropVariantToWinRTPropertyValue(_In_ REFPROPVARIANT propvar, _In_ REFII
D riid, _COM_Outptr_result_maybenull_ void **ppv);
PSSTDAPI WinRTPropertyValueToPropVariant(_In_opt_ IUnknown *punkPropertyValue, _
Out_ PROPVARIANT *ppropvar);
#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */ #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */
#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)
extern RPC_IF_HANDLE __MIDL_itf_propsys_0000_0003_v0_0_c_ifspec; extern RPC_IF_HANDLE __MIDL_itf_propsys_0000_0003_v0_0_c_ifspec;
extern RPC_IF_HANDLE __MIDL_itf_propsys_0000_0003_v0_0_s_ifspec; extern RPC_IF_HANDLE __MIDL_itf_propsys_0000_0003_v0_0_s_ifspec;
#ifndef __INamedPropertyStore_INTERFACE_DEFINED__ #ifndef __INamedPropertyStore_INTERFACE_DEFINED__
#define __INamedPropertyStore_INTERFACE_DEFINED__ #define __INamedPropertyStore_INTERFACE_DEFINED__
skipping to change at line 4147 skipping to change at line 4164
_In_ LPCWSTR propName, _In_ LPCWSTR propName,
_In_ const GUID *value); _In_ const GUID *value);
PSSTDAPI PSPropertyBag_ReadPropertyKey( PSSTDAPI PSPropertyBag_ReadPropertyKey(
_In_ IPropertyBag *propBag, _In_ IPropertyBag *propBag,
_In_ LPCWSTR propName, _In_ LPCWSTR propName,
_Out_ PROPERTYKEY *value); _Out_ PROPERTYKEY *value);
PSSTDAPI PSPropertyBag_WritePropertyKey( PSSTDAPI PSPropertyBag_WritePropertyKey(
_In_ IPropertyBag *propBag, _In_ IPropertyBag *propBag,
_In_ LPCWSTR propName, _In_ LPCWSTR propName,
_In_ REFPROPERTYKEY value); _In_ REFPROPERTYKEY value);
PSSTDAPI PropVariantToWinRTPropertyValue(_In_ REFPROPVARIANT propvar, _In_ REFII
D riid, _COM_Outptr_result_maybenull_ void **ppv);
PSSTDAPI WinRTPropertyValueToPropVariant(_In_opt_ IUnknown *punkPropertyValue, _
Out_ PROPVARIANT *ppropvar);
extern RPC_IF_HANDLE __MIDL_itf_propsys_0000_0025_v0_0_c_ifspec; extern RPC_IF_HANDLE __MIDL_itf_propsys_0000_0025_v0_0_c_ifspec;
extern RPC_IF_HANDLE __MIDL_itf_propsys_0000_0025_v0_0_s_ifspec; extern RPC_IF_HANDLE __MIDL_itf_propsys_0000_0025_v0_0_s_ifspec;
#ifndef __PropSysObjects_LIBRARY_DEFINED__ #ifndef __PropSysObjects_LIBRARY_DEFINED__
#define __PropSysObjects_LIBRARY_DEFINED__ #define __PropSysObjects_LIBRARY_DEFINED__
/* library PropSysObjects */ /* library PropSysObjects */
/* [version][lcid][uuid] */ /* [version][lcid][uuid] */
EXTERN_C const IID LIBID_PropSysObjects; EXTERN_C const IID LIBID_PropSysObjects;
EXTERN_C const CLSID CLSID_InMemoryPropertyStore; EXTERN_C const CLSID CLSID_InMemoryPropertyStore;
#ifdef __cplusplus #ifdef __cplusplus
class DECLSPEC_UUID("9a02e012-6303-4e1e-b9a1-630f802592c5") class DECLSPEC_UUID("9a02e012-6303-4e1e-b9a1-630f802592c5")
InMemoryPropertyStore; InMemoryPropertyStore;
#endif #endif
EXTERN_C const CLSID CLSID_InMemoryPropertyStoreMarshalByValue;
#ifdef __cplusplus
class DECLSPEC_UUID("D4CA0E2D-6DA7-4b75-A97C-5F306F0EAEDC")
InMemoryPropertyStoreMarshalByValue;
#endif
EXTERN_C const CLSID CLSID_PropertySystem; EXTERN_C const CLSID CLSID_PropertySystem;
#ifdef __cplusplus #ifdef __cplusplus
class DECLSPEC_UUID("b8967f85-58ae-4f46-9fb2-5d7904798f4b") class DECLSPEC_UUID("b8967f85-58ae-4f46-9fb2-5d7904798f4b")
PropertySystem; PropertySystem;
#endif #endif
#endif /* __PropSysObjects_LIBRARY_DEFINED__ */ #endif /* __PropSysObjects_LIBRARY_DEFINED__ */
/* interface __MIDL_itf_propsys_0000_0026 */ /* interface __MIDL_itf_propsys_0000_0026 */
/* [local] */ /* [local] */
#if _MSC_VER >= 1200
#pragma warning(pop)
#endif
#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */
#pragma endregion #pragma endregion
extern RPC_IF_HANDLE __MIDL_itf_propsys_0000_0026_v0_0_c_ifspec; extern RPC_IF_HANDLE __MIDL_itf_propsys_0000_0026_v0_0_c_ifspec;
extern RPC_IF_HANDLE __MIDL_itf_propsys_0000_0026_v0_0_s_ifspec; extern RPC_IF_HANDLE __MIDL_itf_propsys_0000_0026_v0_0_s_ifspec;
/* Additional Prototypes for ALL interfaces */ /* Additional Prototypes for ALL interfaces */
unsigned long __RPC_USER BSTR_UserSize( __RPC__in unsigned long *, unsigned long , __RPC__in BSTR * ); unsigned long __RPC_USER BSTR_UserSize( __RPC__in unsigned long *, unsigned long , __RPC__in BSTR * );
unsigned char * __RPC_USER BSTR_UserMarshal( __RPC__in unsigned long *, __RPC_ _inout_xcount(0) unsigned char *, __RPC__in BSTR * ); unsigned char * __RPC_USER BSTR_UserMarshal( __RPC__in unsigned long *, __RPC_ _inout_xcount(0) unsigned char *, __RPC__in BSTR * );
 End of changes. 9 change blocks. 
8 lines changed or deleted 36 lines changed or added


 propvarutil.h (7.00.9600.17415-Windows 8.1)   propvarutil.h (7.00.10586.494-Windows 10 1511 10586.494) 
skipping to change at line 13 skipping to change at line 13
// //
// Copyright (c) Microsoft Corporation. All rights reserved. // Copyright (c) Microsoft Corporation. All rights reserved.
// //
// propvarutil.h - Variant and PropVariant helpers // propvarutil.h - Variant and PropVariant helpers
// //
//=========================================================================== //===========================================================================
#pragma once #pragma once
#include <winapifamily.h> #include <winapifamily.h>
typedef _Return_type_success_(return >= 0) LONG NTSTATUS;
#include <propapi.h>
#pragma region Desktop Family #pragma region Desktop Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
typedef _Return_type_success_(return >= 0) LONG NTSTATUS;
#include <propapi.h>
#include <shtypes.h> #include <shtypes.h>
#include <shlwapi.h> #include <shlwapi.h>
#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
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)
#ifndef PSSTDAPI #ifndef PSSTDAPI
skipping to change at line 282 skipping to change at line 282
HRESULT InitVariantFromUInt16(_In_ USHORT uiVal, _Out_ VARIANT *pvar); HRESULT InitVariantFromUInt16(_In_ USHORT uiVal, _Out_ VARIANT *pvar);
HRESULT InitVariantFromInt32(_In_ LONG lVal, _Out_ VARIANT *pvar); HRESULT InitVariantFromInt32(_In_ LONG lVal, _Out_ VARIANT *pvar);
HRESULT InitVariantFromUInt32(_In_ ULONG ulVal, _Out_ VARIANT *pvar); HRESULT InitVariantFromUInt32(_In_ ULONG ulVal, _Out_ VARIANT *pvar);
HRESULT InitVariantFromInt64(_In_ LONGLONG llVal, _Out_ VARIANT *pvar); HRESULT InitVariantFromInt64(_In_ LONGLONG llVal, _Out_ VARIANT *pvar);
HRESULT InitVariantFromUInt64(_In_ ULONGLONG ullVal, _Out_ VARIANT *pvar); HRESULT InitVariantFromUInt64(_In_ ULONGLONG ullVal, _Out_ VARIANT *pvar);
HRESULT InitVariantFromDouble(_In_ DOUBLE dblVal, _Out_ VARIANT *pvar); HRESULT InitVariantFromDouble(_In_ DOUBLE dblVal, _Out_ VARIANT *pvar);
HRESULT InitVariantFromString(_In_ PCWSTR psz, _Out_ VARIANT *pvar); HRESULT InitVariantFromString(_In_ PCWSTR psz, _Out_ VARIANT *pvar);
HRESULT InitVariantFromDispatch(_In_opt_ IDispatch* pdisp, _Out_ VARIANT *pvar) ; HRESULT InitVariantFromDispatch(_In_opt_ IDispatch* pdisp, _Out_ VARIANT *pvar) ;
HRESULT InitVariantFromDosDateTime(_In_ WORD wDate, _In_ WORD wTime, _Out_ VARI ANT *pvar); HRESULT InitVariantFromDosDateTime(_In_ WORD wDate, _In_ WORD wTime, _Out_ VARI ANT *pvar);
HRESULT InitVariantFromGUIDAsBuffer(_In_ REFGUID guid, _Out_ VARIANT *pvar); HRESULT InitVariantFromGUIDAsBuffer(_In_ REFGUID guid, _Out_ VARIANT *pvar);
HRESULT InitVariantFromUnknown(_In_opt_ IUnknown *unknown, _Out_ VARIANT* varia nt);
#endif #endif
// Extract data from a VARIANT // Extract data from a VARIANT
PSSTDAPI_(BOOL) VariantToBooleanWithDefault(_In_ REFVARIANT varIn, _In_ BO OL fDefault); PSSTDAPI_(BOOL) VariantToBooleanWithDefault(_In_ REFVARIANT varIn, _In_ BO OL fDefault);
PSSTDAPI_(SHORT) VariantToInt16WithDefault(_In_ REFVARIANT varIn, _In_ SHOR T iDefault); PSSTDAPI_(SHORT) VariantToInt16WithDefault(_In_ REFVARIANT varIn, _In_ SHOR T iDefault);
PSSTDAPI_(USHORT) VariantToUInt16WithDefault(_In_ REFVARIANT varIn, _In_ USH ORT uiDefault); PSSTDAPI_(USHORT) VariantToUInt16WithDefault(_In_ REFVARIANT varIn, _In_ USH ORT uiDefault);
PSSTDAPI_(LONG) VariantToInt32WithDefault(_In_ REFVARIANT varIn, _In_ LONG lDefault); PSSTDAPI_(LONG) VariantToInt32WithDefault(_In_ REFVARIANT varIn, _In_ LONG lDefault);
PSSTDAPI_(ULONG) VariantToUInt32WithDefault(_In_ REFVARIANT varIn, _In_ ULO NG ulDefault); PSSTDAPI_(ULONG) VariantToUInt32WithDefault(_In_ REFVARIANT varIn, _In_ ULO NG ulDefault);
PSSTDAPI_(LONGLONG) VariantToInt64WithDefault(_In_ REFVARIANT varIn, _In_ LONG LONG llDefault); PSSTDAPI_(LONGLONG) VariantToInt64WithDefault(_In_ REFVARIANT varIn, _In_ LONG LONG llDefault);
PSSTDAPI_(ULONGLONG) VariantToUInt64WithDefault(_In_ REFVARIANT varIn, _In_ ULO NGLONG ullDefault); PSSTDAPI_(ULONGLONG) VariantToUInt64WithDefault(_In_ REFVARIANT varIn, _In_ ULO NGLONG ullDefault);
skipping to change at line 449 skipping to change at line 450
inline HRESULT InitPropVariantFromDouble(_In_ DOUBLE dblVal, _Out_ PROPVARIANT * ppropvar) inline HRESULT InitPropVariantFromDouble(_In_ DOUBLE dblVal, _Out_ PROPVARIANT * ppropvar)
{ {
ppropvar->vt = VT_R8; ppropvar->vt = VT_R8;
ppropvar->dblVal = dblVal; ppropvar->dblVal = dblVal;
return S_OK; return S_OK;
} }
// Creates a VT_LPWSTR propvariant. // Creates a VT_LPWSTR propvariant.
inline HRESULT InitPropVariantFromString(_In_ PCWSTR psz, _Out_ PROPVARIANT *ppr opvar) inline HRESULT InitPropVariantFromString(_In_ PCWSTR psz, _Out_ PROPVARIANT *ppr opvar)
{ {
ppropvar->vt = VT_LPWSTR; HRESULT hr = psz != nullptr ? S_OK : E_INVALIDARG; // Previous API behavior
HRESULT hr = SHStrDupW(psz, &ppropvar->pwszVal); counter to the SAL requirement.
if (SUCCEEDED(hr))
{
SIZE_T const byteCount = static_cast<SIZE_T>((wcslen(psz) + 1) * sizeof(
*psz));
ppropvar->pwszVal = static_cast<PWSTR>(CoTaskMemAlloc(byteCount));
hr = ppropvar->pwszVal ? S_OK : E_OUTOFMEMORY;
if (SUCCEEDED(hr))
{
memcpy_s(ppropvar->pwszVal, byteCount, psz, byteCount);
ppropvar->vt = VT_LPWSTR;
}
}
if (FAILED(hr)) if (FAILED(hr))
{ {
PropVariantInit(ppropvar); PropVariantInit(ppropvar);
} }
return hr; return hr;
} }
// Creates a VT_VECTOR | VT_UI1 propvariant. // Creates a VT_VECTOR | VT_UI1 propvariant.
inline HRESULT InitPropVariantFromGUIDAsBuffer(_In_ REFGUID guid, _Out_ PROPVARI ANT *ppropvar) inline HRESULT InitPropVariantFromGUIDAsBuffer(_In_ REFGUID guid, _Out_ PROPVARI ANT *ppropvar)
{ {
skipping to change at line 516 skipping to change at line 527
#pragma region Desktop Family #pragma region Desktop Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
inline HRESULT PropVariantGetElem(_In_ REFPROPVARIANT propvarIn, _In_ ULONG iEle m, _Out_ PROPVARIANT *ppropvar) inline HRESULT PropVariantGetElem(_In_ REFPROPVARIANT propvarIn, _In_ ULONG iEle m, _Out_ PROPVARIANT *ppropvar)
{ {
return InitPropVariantFromPropVariantVectorElem(propvarIn, iElem, ppropvar); return InitPropVariantFromPropVariantVectorElem(propvarIn, iElem, ppropvar);
} }
inline HRESULT InitVariantFromBoolean(_In_ BOOL fVal, _Out_ VARIANT *pvar) inline HRESULT InitVariantFromBoolean(_In_ BOOL fVal, _Out_ VARIANT *pvar)
{ {
pvar->vt = VT_BOOL; //pvar->vt = VT_BOOL;
pvar->boolVal = fVal ? VARIANT_TRUE : VARIANT_FALSE; //pvar->boolVal = fVal ? VARIANT_TRUE : VARIANT_FALSE;
return S_OK; return S_OK;
} }
inline HRESULT InitVariantFromInt16(_In_ short iVal, _Out_ VARIANT *pvar) inline HRESULT InitVariantFromInt16(_In_ short iVal, _Out_ VARIANT *pvar)
{ {
pvar->vt = VT_I2; //pvar->vt = VT_I2;
pvar->iVal = iVal; //pvar->iVal = iVal;
return S_OK; return S_OK;
} }
inline HRESULT InitVariantFromUInt16(_In_ USHORT uiVal, _Out_ VARIANT *pvar) inline HRESULT InitVariantFromUInt16(_In_ USHORT uiVal, _Out_ VARIANT *pvar)
{ {
pvar->vt = VT_UI2; //pvar->vt = VT_UI2;
pvar->uiVal = uiVal; //pvar->uiVal = uiVal;
return S_OK; return S_OK;
} }
inline HRESULT InitVariantFromInt32(_In_ LONG lVal, _Out_ VARIANT *pvar) inline HRESULT InitVariantFromInt32(_In_ LONG lVal, _Out_ VARIANT *pvar)
{ {
pvar->vt = VT_I4; //pvar->vt = VT_I4;
pvar->lVal = lVal; //pvar->lVal = lVal;
return S_OK; return S_OK;
} }
inline HRESULT InitVariantFromUInt32(_In_ ULONG ulVal, _Out_ VARIANT *pvar) inline HRESULT InitVariantFromUInt32(_In_ ULONG ulVal, _Out_ VARIANT *pvar)
{ {
pvar->vt = VT_UI4; //pvar->vt = VT_UI4;
pvar->ulVal = ulVal; //pvar->ulVal = ulVal;
return S_OK; return S_OK;
} }
inline HRESULT InitVariantFromInt64(_In_ LONGLONG llVal, _Out_ VARIANT *pvar) inline HRESULT InitVariantFromInt64(_In_ LONGLONG llVal, _Out_ VARIANT *pvar)
{ {
pvar->vt = VT_I8; //pvar->vt = VT_I8;
pvar->llVal = llVal; //pvar->llVal = llVal;
return S_OK; return S_OK;
} }
inline HRESULT InitVariantFromUInt64(_In_ ULONGLONG ullVal, _Out_ VARIANT *pvar) inline HRESULT InitVariantFromUInt64(_In_ ULONGLONG ullVal, _Out_ VARIANT *pvar)
{ {
pvar->vt = VT_UI8; //pvar->vt = VT_UI8;
pvar->ullVal = ullVal; //pvar->ullVal = ullVal;
return S_OK; return S_OK;
} }
inline HRESULT InitVariantFromDouble(_In_ DOUBLE dblVal, _Out_ VARIANT *pvar) inline HRESULT InitVariantFromDouble(_In_ DOUBLE dblVal, _Out_ VARIANT *pvar)
{ {
pvar->vt = VT_R8; //pvar->vt = VT_R8;
pvar->dblVal = dblVal; //pvar->dblVal = dblVal;
return S_OK; return S_OK;
} }
inline HRESULT InitVariantFromString(_In_ PCWSTR psz, _Out_ VARIANT *pvar) inline HRESULT InitVariantFromString(_In_ PCWSTR psz, _Out_ VARIANT *pvar)
{ {
pvar->vt = VT_BSTR; //pvar->vt = VT_BSTR;
pvar->bstrVal = SysAllocString(psz); //pvar->bstrVal = SysAllocString(psz);
HRESULT hr = pvar->bstrVal ? S_OK : (psz ? E_OUTOFMEMORY : E_INVALIDARG); //HRESULT hr = pvar->bstrVal ? S_OK : (psz ? E_OUTOFMEMORY : E_INVALIDARG);
if (FAILED(hr)) //if (FAILED(hr))
{ //{
VariantInit(pvar); // VariantInit(pvar);
} //}
return hr; //return hr;
return S_OK;
} }
inline HRESULT InitVariantFromDispatch(_In_opt_ IDispatch* pdisp, _Out_ VARIANT *pvar) inline HRESULT InitVariantFromDispatch(_In_opt_ IDispatch* pdisp, _Out_ VARIANT *pvar)
{ {
pvar->vt = VT_DISPATCH; //pvar->vt = VT_DISPATCH;
pvar->pdispVal = pdisp; //pvar->pdispVal = pdisp;
if (pvar->pdispVal) //if (pvar->pdispVal)
{ //{
(pvar->pdispVal)->AddRef(); // (pvar->pdispVal)->AddRef();
} //}
return S_OK; return S_OK;
} }
// Creates a VT_DATE variant // Creates a VT_DATE variant
inline HRESULT InitVariantFromDosDateTime(_In_ WORD wDate, _In_ WORD wTime, _Out _ VARIANT *pvar) inline HRESULT InitVariantFromDosDateTime(_In_ WORD wDate, _In_ WORD wTime, _Out _ VARIANT *pvar)
{ {
pvar->vt = VT_DATE; //pvar->vt = VT_DATE;
return DosDateTimeToVariantTime(wDate, wTime, &pvar->date) ? S_OK : S_FALSE; //return DosDateTimeToVariantTime(wDate, wTime, &pvar->date) ? S_OK : S_FALS
E;
return S_OK;
}
inline HRESULT InitVariantFromUnknown(_In_opt_ IUnknown *unknown, _Out_ VARIANT*
variant)
{
//VariantInit(variant);
//variant->vt = VT_UNKNOWN;
//if (unknown != nullptr)
//{
// IUnknown_Set(&variant->punkVal, unknown);
//}
return S_OK;
} }
inline BOOL IsVarTypeFloat(_In_ VARTYPE vt) inline BOOL IsVarTypeFloat(_In_ VARTYPE vt)
{ {
return (vt == VT_R4 || vt == VT_R8); return (vt == VT_R4 || vt == VT_R8);
} }
inline BOOL IsVariantArray(_In_ REFVARIANT var) inline BOOL IsVariantArray(_In_ REFVARIANT var)
{ {
return (var.vt & VT_ARRAY); //return (var.vt & VT_ARRAY);
return 0;
} }
// if TRUE, you can use VariantToStringCast to obtain the string pointer // if TRUE, you can use VariantToStringCast to obtain the string pointer
inline BOOL IsVariantString(_In_ REFVARIANT var) inline BOOL IsVariantString(_In_ REFVARIANT var)
{ {
return (VariantToStringWithDefault(var, NULL) != NULL); return (VariantToStringWithDefault(var, NULL) != NULL);
} }
inline BOOL IsVarTypeNumber(_In_ VARTYPE vt) inline BOOL IsVarTypeNumber(_In_ VARTYPE vt)
{ {
 End of changes. 16 change blocks. 
38 lines changed or deleted 67 lines changed or added

This html diff was produced by rfcdiff 1.41.