diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2015-08-03 12:18:31 -0700 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2015-08-03 12:18:31 -0700 |
| commit | 43965d23655f9511b1389a4fb380fd2bf68863b4 (patch) | |
| tree | b671e708e89613e2f2856f7f24c5b6ba967c29b3 | |
| parent | af0b3115d7be94edbd1ee3fe2adcabdd8eaa87dd (diff) | |
| parent | 878d74539efe361956ca4c1487f95250e832156a (diff) | |
| download | coreclr-43965d23655f9511b1389a4fb380fd2bf68863b4.tar.gz coreclr-43965d23655f9511b1389a4fb380fd2bf68863b4.tar.bz2 coreclr-43965d23655f9511b1389a4fb380fd2bf68863b4.zip | |
Merge pull request #1334 from dotnet-bot/from-tfs
Merge changes from TFS
| -rw-r--r-- | src/pal/prebuilt/inc/mscoree.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/pal/prebuilt/inc/mscoree.h b/src/pal/prebuilt/inc/mscoree.h index a725eda75e..aa2f4d6bb3 100644 --- a/src/pal/prebuilt/inc/mscoree.h +++ b/src/pal/prebuilt/inc/mscoree.h @@ -235,7 +235,7 @@ struct IActivationFactory; #define CLR_MINOR_VERSION ( 0 ) -#define CLR_BUILD_VERSION ( 22828 ) +#define CLR_BUILD_VERSION ( 23203 ) #define CLR_ASSEMBLY_MAJOR_VERSION ( 4 ) @@ -264,7 +264,7 @@ DEPRECATED_CLR_STDAPI GetCORVersion(_Out_writes_to_(cchBuffer, *dwLength) LPWSTR DEPRECATED_CLR_STDAPI GetFileVersion(LPCWSTR szFilename, _Out_writes_to_opt_(cchBuffer, *dwLength) LPWSTR szBuffer, DWORD cchBuffer, DWORD* dwLength); DEPRECATED_CLR_STDAPI GetCORRequiredVersion(_Out_writes_to_(cchBuffer, *dwLength) LPWSTR pbuffer, DWORD cchBuffer, DWORD* dwLength); DEPRECATED_CLR_STDAPI GetRequestedRuntimeInfo(LPCWSTR pExe, LPCWSTR pwszVersion, LPCWSTR pConfigurationFile, DWORD startupFlags, DWORD runtimeInfoFlags, _Out_writes_opt_(dwDirectory) LPWSTR pDirectory, DWORD dwDirectory, _Out_opt_ DWORD *dwDirectoryLength, _Out_writes_opt_(cchBuffer) LPWSTR pVersion, DWORD cchBuffer, _Out_opt_ DWORD* dwlength); -DEPRECATED_CLR_STDAPI GetRequestedRuntimeVersion(_In_ LPWSTR pExe, _Out_writes_to_(cchBuffer, *pdwLength) LPWSTR pVersion, DWORD cchBuffer, _Out_ DWORD* dwLength); +DEPRECATED_CLR_STDAPI GetRequestedRuntimeVersion(_In_ LPWSTR pExe, _Out_writes_to_(cchBuffer, *dwLength) LPWSTR pVersion, DWORD cchBuffer, _Out_ DWORD* dwLength); DEPRECATED_CLR_STDAPI CorBindToRuntimeHost(LPCWSTR pwszVersion, LPCWSTR pwszBuildFlavor, LPCWSTR pwszHostConfigFile, VOID* pReserved, DWORD startupFlags, REFCLSID rclsid, REFIID riid, LPVOID FAR *ppv); DEPRECATED_CLR_STDAPI CorBindToRuntimeEx(LPCWSTR pwszVersion, LPCWSTR pwszBuildFlavor, DWORD startupFlags, REFCLSID rclsid, REFIID riid, LPVOID FAR *ppv); DEPRECATED_CLR_STDAPI CorBindToRuntimeByCfg(IStream* pCfgStream, DWORD reserved, DWORD startupFlags, REFCLSID rclsid,REFIID riid, LPVOID FAR* ppv); @@ -2676,7 +2676,7 @@ EXTERN_C const IID IID_IManagedObject; virtual HRESULT STDMETHODCALLTYPE GetObjectIdentity( /* [out] */ BSTR *pBSTRGUID, /* [out] */ int *AppDomainID, - /* [out] */ __int64 *pCCW) = 0; + /* [out] */ int *pCCW) = 0; }; @@ -2707,7 +2707,7 @@ EXTERN_C const IID IID_IManagedObject; IManagedObject * This, /* [out] */ BSTR *pBSTRGUID, /* [out] */ int *AppDomainID, - /* [out] */ __int64 *pCCW); + /* [out] */ int *pCCW); END_INTERFACE } IManagedObjectVtbl; |