Minor code review

Author: walbourn

Kits/ATGTK/PerformanceTimersXbox.cpp

@@ -393,9 +393,12 @@ void GPUCommandListTimer<t_CommandList>::Frame::Stop(_In_ t_CommandList* command
 }
 
 // Force compilation of these template instantiations
-template class GPUCommandListTimer<ID3D12GraphicsCommandList>;
-template class GPUCommandListTimer<ID3D12XboxDmaCommandList>;
-template class GPUCommandListTimer<ID3D12GraphicsCommandList>;
+namespace DX
+{
+    template class GPUCommandListTimer<ID3D12GraphicsCommandList>;
+    template class GPUCommandListTimer<ID3D12XboxDmaCommandList>;
+    template class GPUCommandListTimer<ID3D12GraphicsCommandList>;
+}
 
 
 //======================================================================================
@@ -606,9 +609,12 @@ void GPUContextTimer<t_Context>::Frame::Stop(_In_ t_Context* context, uint32_t t
 }
 
 // Force compilation of these template instantiations
-template class GPUContextTimer<ID3D11DeviceContextX>;
-template class GPUContextTimer<ID3D11DmaEngineContextX>;
-template class GPUContextTimer<ID3D11ComputeContextX>;
+namespace DX
+{
+    template class GPUContextTimer<ID3D11DeviceContextX>;
+    template class GPUContextTimer<ID3D11DmaEngineContextX>;
+    template class GPUContextTimer<ID3D11ComputeContextX>;
+}
 
 #else
 #error Must include d3d11*.h or d3d12*.h in pch.h

Kits/ATGTK/d3dx12.h

@@ -555,6 +555,7 @@ struct CD3DX12_CLEAR_VALUE : public D3D12_CLEAR_VALUE
         UINT8 stencil )
     {
         Format = format;
+        memset( &Color, 0, sizeof( Color ) );
         /* Use memcpy to preserve NAN values */
         memcpy( &DepthStencil.Depth, &depth, sizeof( depth ) );
         DepthStencil.Stencil = stencil;
@@ -844,6 +845,7 @@ struct CD3DX12_TEXTURE_COPY_LOCATION : public D3D12_TEXTURE_COPY_LOCATION
     {
         pResource = pRes;
         Type = D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX;
+        PlacedFootprint = {};
         SubresourceIndex = Sub;
     }
 }; 

UWPSamples/Audio/SimpleWASAPICaptureUWP/Common.h

@@ -17,7 +17,7 @@
 static const GUID AUDIOSESSIONGUID =
 { 0xb3954ae8, 0xc3c3, 0x4094,{ 0x82, 0x1c, 0xc7, 0xbd, 0xf4, 0xab, 0x15, 0x8a } };
 
-// release and zero out a possible NULL pointer. note this will
+// release and zero out a possible nullptr pointer. note this will
 // do the release on a temp copy to avoid reentrancy issues that can result from
 // callbacks durring the release
 template <class T> void SafeRelease( __deref_inout_opt T **ppT )
@@ -70,7 +70,7 @@ public: \
             AddRef(); \
             return S_OK; \
         } \
-        *ppvObject = NULL; \
+        *ppvObject = nullptr; \
         return E_NOINTERFACE; \
     } \
     STDMETHOD( GetParameters )( \

UWPSamples/Audio/SimpleWASAPIPlaySoundUWP/ToneSampleGenerator.cpp

@@ -116,7 +116,7 @@ void ToneSampleGenerator::GenerateSineSamples(unsigned char *Buffer, size_t Buff
 {
     double sampleIncrement = (Frequency * (M_PI*2)) / (double)SamplesPerSecond;
     T *dataBuffer = reinterpret_cast<T *>(Buffer);
-    double theta = (InitialTheta != NULL ? *InitialTheta : 0);
+    double theta = (InitialTheta != nullptr ? *InitialTheta : 0);
 
     for (size_t i = 0 ; i < BufferLength / sizeof(T) ; i += ChannelCount)
     {
@@ -128,7 +128,7 @@ void ToneSampleGenerator::GenerateSineSamples(unsigned char *Buffer, size_t Buff
         theta += sampleIncrement;
     }
 
-    if (InitialTheta != NULL)
+    if (InitialTheta != nullptr)
     {
         *InitialTheta = theta;
     }

UWPSamples/Audio/SimpleWASAPIPlaySoundUWP/common.h

@@ -12,7 +12,7 @@
 #include <mmreg.h>
 #include <mfapi.h>
 
-// release and zero out a possible NULL pointer. note this will
+// release and zero out a possible nullptr pointer. note this will
 // do the release on a temp copy to avoid reentrancy issues that can result from
 // callbacks durring the release
 template <class T> void SafeRelease( __deref_inout_opt T **ppT )
@@ -61,7 +61,7 @@ public: \
             AddRef(); \
             return S_OK; \
         } \
-        *ppvObject = NULL; \
+        *ppvObject = nullptr; \
         return E_NOINTERFACE; \
     } \
     STDMETHOD( GetParameters )( \

UWPSamples/System/NLSAndLocalizationUWP/NLSAndLocalizationUWP.cpp

@@ -36,8 +36,8 @@ void Sample::Initialize(IUnknown* window, int width, int height, DXGI_MODE_ROTAT
     int retVal = GetUserDefaultLocaleName(m_localeName, ARRAYSIZE(m_localeName));
     if (retVal == 0)
         throw std::exception("Failed to get locale in CreateDeviceDependenciesResources");
-    swprintf_s(m_imagePrepend, _countof(m_imagePrepend), L"Assets\\Images\\%s\\", m_localeName);
-    swprintf_s(m_resFileName, _countof(m_resFileName), L"Assets\\Resources\\%s.resources", m_localeName);
+    swprintf_s(m_imagePrepend, _countof(m_imagePrepend), L"Assets\\Images\\%ls\\", m_localeName);
+    swprintf_s(m_resFileName, _countof(m_resFileName), L"Assets\\Resources\\%ls.resources", m_localeName);
 
     m_deviceResources->CreateDeviceResources();  	
     CreateDeviceDependentResources();
@@ -59,7 +59,7 @@ void Sample::InitializeLocalization()
     // Get Package Details using the Package Id
     Windows::ApplicationModel::Package^ package = Windows::ApplicationModel::Package::Current;
     Windows::ApplicationModel::PackageId^ packageId = package->Id;
-    m_textConsole->Format(L"The Package Full Name is: %s\n", packageId->FullName->Data());
+    m_textConsole->Format(L"The Package Full Name is: %ls\n", packageId->FullName->Data());
 
     // Get the locale name for the system using GetUserDefaultLocaleName(). This will return the locale selected through the 
     // Settings app only if that locale has been added to the Resources section of the application's package manifest.
@@ -69,7 +69,7 @@ void Sample::InitializeLocalization()
     int retVal = GetUserDefaultLocaleName(userLocaleName, ARRAYSIZE(userLocaleName));
     if (FunctionSucceeded(retVal, L"GetUserDefaultLocaleName"))
     {
-        swprintf_s(message, L"GetUserDefaultLocaleName succeeded: %s\n", userLocaleName);
+        swprintf_s(message, L"GetUserDefaultLocaleName succeeded: %ls\n", userLocaleName);
         OutputDebugString(message);
         m_textConsole->Write(message);
     }
@@ -93,14 +93,14 @@ void Sample::InitializeLocalization()
         throw std::exception("LocaleNameToLCID failed!");
     }
 
-    // The GetUserGeoID() API can be used to get the actual country the kit is in. 
-    // It gives you the country selected through the Settings app
+    // The GetUserGeoID() API can be used to get the actual country/region the kit is in. 
+    // It gives you the country/region selected through the Settings app
     long geoID = GetUserGeoID(GEOCLASS_NATION);
     wchar_t geoData[LOCALE_NAME_MAX_LENGTH];
     retVal = GetGeoInfoW(geoID, GEO_LATITUDE, geoData, ARRAYSIZE(geoData), primary);
     if (FunctionSucceeded(retVal, L"GetGeoInfoW"))
     {
-        swprintf_s(message, L"Lattitude query succeeded: %s\n", geoData);
+        swprintf_s(message, L"Lattitude query succeeded: %ls\n", geoData);
         OutputDebugString(message);
         m_textConsole->Write(message);
     }
@@ -112,7 +112,7 @@ void Sample::InitializeLocalization()
     retVal = GetGeoInfoW(geoID, GEO_LONGITUDE, geoData, ARRAYSIZE(geoData), primary);
     if (FunctionSucceeded(retVal, L"GetGeoInfoW"))
     {
-        swprintf_s(message, L"Longitude query succeeded: %s\n", geoData);
+        swprintf_s(message, L"Longitude query succeeded: %ls\n", geoData);
         OutputDebugString(message);
         m_textConsole->Write(message);
     }
@@ -124,7 +124,7 @@ void Sample::InitializeLocalization()
     retVal = GetGeoInfoW(geoID, GEO_NATION, geoData, ARRAYSIZE(geoData), primary);
     if (FunctionSucceeded(retVal, L"GetGeoInfoW"))
     {
-        swprintf_s(message, L"Nation query succeeded: %s\n", geoData);
+        swprintf_s(message, L"Nation query succeeded: %ls\n", geoData);
         OutputDebugString(message);
         m_textConsole->Write(message);
     }
@@ -137,7 +137,7 @@ void Sample::InitializeLocalization()
     retVal = GetGeoInfoW(geoID, GEO_ISO2, iso2, ARRAYSIZE(iso2), primary);
     if (FunctionSucceeded(retVal, L"GetGeoInfoW"))
     {
-        swprintf_s(message, L"Iso2 query succeeded: %s\n", iso2);
+        swprintf_s(message, L"Iso2 query succeeded: %ls\n", iso2);
         OutputDebugString(message);
         m_textConsole->Write(message);
     }
@@ -150,7 +150,7 @@ void Sample::InitializeLocalization()
     retVal = GetGeoInfoW(geoID, GEO_ISO3, iso3, ARRAYSIZE(iso3), primary);
     if (FunctionSucceeded(retVal, L"GetGeoInfoW"))
     {
-        swprintf_s(message, L"Iso3 query succeeded: %s\n", iso3);
+        swprintf_s(message, L"Iso3 query succeeded: %ls\n", iso3);
         OutputDebugString(message);
         m_textConsole->Write(message);
     }
@@ -159,25 +159,25 @@ void Sample::InitializeLocalization()
         throw std::exception("GetGeoInfoW failed on GEO_ISO3!");
     }
 
-    // The country values returned from GetUserDefaultLocaleName() and GetUserGeoID() can be compared
-    // to determine if the country selected by the user is supported by the app or not
+    // The country/region values returned from GetUserDefaultLocaleName() and GetUserGeoID() can be compared
+    // to determine if the country/region selected by the user is supported by the app or not
     std::wstring localeNameStr(userLocaleName);
     std::wstring::size_type pos = localeNameStr.find(L'-');
     localeNameStr = localeNameStr.substr(pos + 1);
     if (_wcsicmp(localeNameStr.c_str(), iso2) == 0 || _wcsicmp(localeNameStr.c_str(), iso3) == 0)
     {
-        m_textConsole->Format(L"Selected locale in manifest. Country: %s\n", iso2);
+        m_textConsole->Format(L"Selected locale in manifest. Country/region: %ls\n", iso2);
     }
     else
     {
-        m_textConsole->Format(L"The selected locale (Country: %s) is NOT present in the manifest, so the fallback locale (Country: %s) is selected for localization\n", iso2, localeNameStr.c_str());
+        m_textConsole->Format(L"The selected locale (Country/region: %s) is NOT present in the manifest, so the fallback locale (Country: %ls) is selected for localization\n", iso2, localeNameStr.c_str());
 }
 
     wchar_t lcpData[LOCALE_NAME_MAX_LENGTH];
     retVal = GetLocaleInfoEx(LOCALE_NAME_USER_DEFAULT, LOCALE_SISO639LANGNAME, lcpData, ARRAYSIZE(lcpData));
     if (FunctionSucceeded(retVal, L"GetLocaleInfoEx"))
     {
-        m_textConsole->Format(L"GetLocaleInfoEx() - LOCALE_SISO639LANGNAME: %s\n", lcpData);
+        m_textConsole->Format(L"GetLocaleInfoEx() - LOCALE_SISO639LANGNAME: %ls\n", lcpData);
     }
     else
     {
@@ -187,7 +187,7 @@ void Sample::InitializeLocalization()
     retVal = GetLocaleInfoEx(LOCALE_NAME_USER_DEFAULT, LOCALE_IDEFAULTLANGUAGE, lcpData, ARRAYSIZE(lcpData));
     if (FunctionSucceeded(retVal, L"GetLocaleInfoEx"))
     {
-        m_textConsole->Format(L"GetLocaleInfoEx() - LOCALE_IDEFAULTLANGUAGE: %s\n", lcpData);
+        m_textConsole->Format(L"GetLocaleInfoEx() - LOCALE_IDEFAULTLANGUAGE: %ls\n", lcpData);
     }
     else
     {
@@ -389,7 +389,7 @@ bool Sample::FunctionSucceeded(int returned, const wchar_t* function)
     {
         unsigned long error = GetLastError();
         wchar_t message[1024] = { L'\0' };
-        swprintf_s(message, L"%s failed with error: %u\n", function, error);
+        swprintf_s(message, L"%ls failed with error: %u\n", function, error);
         OutputDebugString(message);
         return false;
     }

XDKSamples/Audio/AdvancedSpatialSoundsXDK/AdvancedSpatialSoundsXDK.cpp

@@ -274,7 +274,6 @@ Sample::Sample() :
     m_usedObjects(0),
     m_frame(0),
     m_fileLoaded(false),
-    m_curFile(0),
     m_workThread(nullptr)
 {
     m_deviceResources = std::make_unique<DX::DeviceResources>();

XDKSamples/Audio/AdvancedSpatialSoundsXDK/AdvancedSpatialSoundsXDK.h

@@ -154,7 +154,6 @@ class Sample
 	std::unique_ptr<DirectX::GraphicsMemory>    m_graphicsMemory;
 
 	bool	m_fileLoaded;
-	int		m_curFile;
 
 	//worker thread for spatial system
 	PTP_WORK m_workThread;

XDKSamples/Audio/SimpleWASAPICaptureXDK/Common.h

@@ -17,7 +17,7 @@
 static const GUID AUDIOSESSIONGUID =
 { 0xb3954ae8, 0xc3c3, 0x4094,{ 0x82, 0x1c, 0xc7, 0xbd, 0xf4, 0xab, 0x15, 0x8a } };
 
-// release and zero out a possible NULL pointer. note this will
+// release and zero out a possible nullptr pointer. note this will
 // do the release on a temp copy to avoid reentrancy issues that can result from
 // callbacks durring the release
 template <class T> void SafeRelease( __deref_inout_opt T **ppT )
@@ -70,7 +70,7 @@ public: \
             AddRef(); \
             return S_OK; \
         } \
-        *ppvObject = NULL; \
+        *ppvObject = nullptr; \
         return E_NOINTERFACE; \
     } \
     STDMETHOD( GetParameters )( \

XDKSamples/Audio/SimpleWASAPICaptureXDK/DeviceManager.cpp

@@ -23,7 +23,7 @@ DeviceManager::DeviceManager() :
 {
     ComPtr<IMMDeviceCollection>   deviceCollectionInterface;
 
-    CoCreateInstance(__uuidof(MMDeviceEnumerator), NULL, CLSCTX_ALL, __uuidof(IMMDeviceEnumerator), (void**)&m_deviceEnum);
+    CoCreateInstance(__uuidof(MMDeviceEnumerator), nullptr, CLSCTX_ALL, __uuidof(IMMDeviceEnumerator), (void**)&m_deviceEnum);
 
     if (!InitializeCriticalSectionEx( &m_CritSec, 0, 0 ))
     {