Commit 2a9a0dbb authored by Chuck Walbourn's avatar Chuck Walbourn
Browse files

Updated Kits for April 24, 2017 release

parent 2ee19c1c

Kits/ATGTK/TextConsole.cpp

+2 −2
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ void TextConsole::Clear() 




_Use_decl_annotations_

void TextConsole::Write(_In_z_ const wchar_t *str)

void TextConsole::Write(const wchar_t *str)

{

    std::lock_guard<std::mutex> lock(m_mutex);
@@ -132,7 +132,7 @@ void TextConsole::Format(const wchar_t* strFormat, ...) 
    if (m_tempBuffer.size() < len)

        m_tempBuffer.resize(len);



    memset(m_tempBuffer.data(), 0, len);

    memset(m_tempBuffer.data(), 0, sizeof(wchar_t) * len);



    vswprintf_s(m_tempBuffer.data(), m_tempBuffer.size(), strFormat, argList);

Kits/ATGTK/d3dx12.h

0 → 100644
+2552 −0

File added.

Preview size limit exceeded, changes collapsed.

Kits/DirectXTK/Audio/AudioEngine.cpp

+22 −19
Original line number Diff line number Diff line
@@ -1631,35 +1631,38 @@ std::vector<AudioEngine::RendererDetail> AudioEngine::GetRendererDetails() 
    using namespace ABI::Windows::Foundation::Collections;

    using namespace ABI::Windows::Devices::Enumeration;



#if !defined(WINAPI_FAMILY) || (WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP)

    RoInitializeWrapper initialize(RO_INIT_MULTITHREADED);

    HRESULT hr = initialize;

    ThrowIfFailed( hr );

    ThrowIfFailed(initialize);

#endif



    ComPtr<IDeviceInformationStatics> diFactory;

    hr = GetActivationFactory( HStringReference(RuntimeClass_Windows_Devices_Enumeration_DeviceInformation).Get(), &diFactory );

    HRESULT hr = GetActivationFactory( HStringReference(RuntimeClass_Windows_Devices_Enumeration_DeviceInformation).Get(), &diFactory );

    ThrowIfFailed( hr );



    Event findCompleted( CreateEventEx( nullptr, nullptr, CREATE_EVENT_MANUAL_RESET, WRITE_OWNER | EVENT_ALL_ACCESS ) );

    if ( !findCompleted.IsValid() )

        throw std::exception( "CreateEventEx" );



    auto callback = Callback<IAsyncOperationCompletedHandler<DeviceInformationCollection*>>(

        [&findCompleted,list]( IAsyncOperation<DeviceInformationCollection*>* aDevices, AsyncStatus status ) -> HRESULT

    {

        UNREFERENCED_PARAMETER(aDevices);

        UNREFERENCED_PARAMETER(status);

        SetEvent( findCompleted.Get() );

        return S_OK;

    });



    ComPtr<IAsyncOperation<DeviceInformationCollection*>> operation;

    hr = diFactory->FindAllAsyncDeviceClass( DeviceClass_AudioRender, operation.GetAddressOf() );

    ThrowIfFailed( hr );



    hr = operation->put_Completed( callback.Get() );

    ComPtr<IAsyncInfo> asyncinfo;

    hr = operation.As(&asyncinfo);

    ThrowIfFailed( hr );



    AsyncStatus status;

    hr = asyncinfo->get_Status(&status);

    ThrowIfFailed( hr );



    (void)WaitForSingleObjectEx( findCompleted.Get(), INFINITE, FALSE );

    while (status == ABI::Windows::Foundation::AsyncStatus::Started)

    {

        Sleep(100);

        hr = asyncinfo->get_Status(&status);

        ThrowIfFailed( hr );

    }



    if (status != ABI::Windows::Foundation::AsyncStatus::Completed)

    {

        throw std::exception("FindAllAsyncDeviceClass");

    }



    ComPtr<IVectorView<DeviceInformation*>> devices;

    hr = operation->GetResults( devices.GetAddressOf() );

Kits/DirectXTK/Readme.txt

+8 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ DirectXTK - the DirectX Tool Kit for DirectX 11 


Copyright (c) Microsoft Corporation. All rights reserved.



April 7, 2017

April 24, 2017



This package contains the "DirectX Tool Kit", a collection of helper classes for 

writing Direct3D 11 C++ code for Universal Windows Platform (UWP) apps for Windows 10,
@@ -79,6 +79,13 @@ https://opensource.microsoft.com/codeofconduct/ 
RELEASE HISTORY

---------------



April 24, 2017

    VS 2017 project updates

    Regenerated shaders using Windows 10 Creators Update SDK (15063)

    Fixed NormalMapEffect shader selection for specular texture usage

    Fixed AudioEngine enumeration when using Single Threaded Apartment (STA)

    Fixed bug with GamePad (Windows.Gaming.Input) when no user bound 



April 7, 2017

    VS 2017 updated for Windows Creators Update SDK (15063)

    XboxDDSTextureLoader updates

Kits/DirectXTK/Src/GamePad.cpp

+4 −1
Original line number Diff line number Diff line
@@ -82,7 +82,10 @@ namespace 
// Windows::Gaming::Input (Windows 10)

//======================================================================================



#pragma warning(push)

#pragma warning(disable : 4471)

#include <Windows.Gaming.Input.h>

#pragma warning(pop)



class GamePad::Impl

{
@@ -250,7 +253,7 @@ public: 
                {

                    ComPtr<IUser> user;

                    hr = ctrl->get_User(user.GetAddressOf());

                    if (SUCCEEDED(hr))

                    if (SUCCEEDED(hr) && user != nullptr)

                    {

                        Wrappers::HString str;

                        hr = user->get_NonRoamableId(str.GetAddressOf());