AuroraMiddleware/DirectXTex
1
0
Fork 0
mirror of https://github.com/microsoft/DirectXTex synced 2025-01-10 01:40:06 +00:00
Code Issues Releases Wiki Activity

DirectXTex: Use alternative to CreateStreamOnHGlobal for Windows Store apps

Browse Source
This commit is contained in:
walbourn_cp 2013-07-02 13:07:56 -07:00
parent a1628e8fd4
commit 1b92159d63
2 changed files with 53 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
DirectXTex/DirectXTex.h
View File

@ -45,6 +45,7 @@
#define _Inout_updates_all_(exp) #define _Inout_updates_all_(exp)
#define _Inout_updates_all_opt_(exp) #define _Inout_updates_all_opt_(exp)
#define _Outptr_ #define _Outptr_
#define _COM_Outptr_
#define _When_(a,b) #define _When_(a,b)
#endif #endif

54
DirectXTex/DirectXTexWIC.cpp
View File

@ -15,6 +15,56 @@
#include "directxtexp.h" #include "directxtexp.h"
//-------------------------------------------------------------------------------------
// IStream support for WIC Memory routines
//-------------------------------------------------------------------------------------
#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP) && (WINAPI_FAMILY != WINAPI_FAMILY_PHONE_APP)
#include <shcore.h>
#pragma comment(lib,"shcore.lib")
#ifdef __cplusplus_winrt
static inline HRESULT CreateMemoryStream( _COM_Outptr_ IStream** stream )
{
auto randomAccessStream = ref new ::Windows::Storage::Streams::InMemoryRandomAccessStream();
return CreateStreamOverRandomAccessStream( randomAccessStream, __uuidof(IStream), reinterpret_cast<void **>( &stream ) );
}
#else
#include <wrl\client.h>
#include <wrl\wrappers\corewrappers.h>
#include <windows.storage.streams.h>
static inline HRESULT CreateMemoryStream( _COM_Outptr_ IStream** stream )
{
*stream = nullptr;
Microsoft::WRL::ComPtr<ABI::Windows::Storage::Streams::IRandomAccessStream> abiStream;
HRESULT hr = Windows::Foundation::ActivateInstance(
Microsoft::WRL::Wrappers::HStringReference( RuntimeClass_Windows_Storage_Streams_InMemoryRandomAccessStream ).Get(),
&abiStream);
if (SUCCEEDED(hr))
{
hr = CreateStreamOverRandomAccessStream( abiStream.Get(), __uuidof(IStream), reinterpret_cast<void **>( &stream ) );
}
return hr;
}
#endif // __cplusplus_winrt
#else
static inline HRESULT CreateMemoryStream( _COM_Outptr_ IStream** stream )
{
return CreateStreamOnHGlobal( 0, TRUE, stream );
}
#endif
//------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------
// WIC Pixel Format nearest conversion table // WIC Pixel Format nearest conversion table
//------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------
@ -918,7 +968,7 @@ HRESULT SaveToWICMemory( const Image& image, DWORD flags, REFGUID containerForma
blob.Release(); blob.Release();
ScopedObject<IStream> stream; ScopedObject<IStream> stream;
HRESULT hr = CreateStreamOnHGlobal( 0, TRUE, &stream ); HRESULT hr = CreateMemoryStream( &stream );
if ( FAILED(hr) ) if ( FAILED(hr) )
return hr; return hr;
@ -965,7 +1015,7 @@ HRESULT SaveToWICMemory( const Image* images, size_t nimages, DWORD flags, REFGU
blob.Release(); blob.Release();
ScopedObject<IStream> stream; ScopedObject<IStream> stream;
HRESULT hr = CreateStreamOnHGlobal( 0, TRUE, &stream ); HRESULT hr = CreateMemoryStream( &stream );
if ( FAILED(hr) ) if ( FAILED(hr) )
return hr; return hr;