minor tweaks, a few hacks that'll go away soon

ariccio · Mar 1, 2015 · ad00653 · ad00653
1 parent 30a31f0
commit ad00653
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 1 deletion.
diff --git a/WinDirStat/windirstat/COM_helpers.h b/WinDirStat/windirstat/COM_helpers.h
@@ -1,3 +1,7 @@
+
+#ifndef WDS_COM_HELPERS_H_INCLUDED
+#define WDS_COM_HELPERS_H_INCLUDED
+
 #include "stdafx.h"
 #include "ScopeGuard.h"
 
@@ -262,3 +266,6 @@ std::wstring OnOpenAFolder( HWND /*hWnd*/ ) {
 
 
 
+#else
+
+#endif
diff --git a/WinDirStat/windirstat/globalhelpers.cpp b/WinDirStat/windirstat/globalhelpers.cpp
@@ -1120,6 +1120,7 @@ _Success_( SUCCEEDED( return ) ) HRESULT CStyle_GetLastErrorAsFormattedMessage(
 		}
 	const auto error_err = GetLastError( );
 	TRACE( _T( "FormatMessageW failed with error code: `%lu`!!\r\n" ), error_err );
+	( void ) error_err;
 	if ( strSize > 41 ) {
 		wds_fmt::write_bad_fmt_msg( psz_formatted_error, chars_written );
 		return E_FAIL;

diff --git a/WinDirStat/windirstat/item.cpp b/WinDirStat/windirstat/item.cpp
@@ -601,8 +601,10 @@ void CItemBranch::stdRecurseCollectExtensionData_FILE( _Inout_ std::unordered_ma
 
 	PCWSTR const resultPtrStr = CStyle_GetExtensionStrPtr( );
 	static_assert( std::is_same< std::decay<decltype(*m_name)>::type, wchar_t>::value, "Bad division below!" );
+#ifdef DEBUG
 	const auto alt_length = ( ( std::ptrdiff_t( m_name + m_name_length ) - std::ptrdiff_t( resultPtrStr ) ) / sizeof( wchar_t ) );
 	ASSERT( wcslen( resultPtrStr ) == alt_length );
+#endif
 	//TRACE( _T( "Calculated length: %lld, actual length: %llu\r\n" ), LONGLONG( alt_length ), ULONGLONG( wcslen( resultPtrStr ) ) );
 	auto& value = extensionMap[ resultPtrStr ];
 	++( value.files );

diff --git a/WinDirStat/windirstat/options.cpp b/WinDirStat/windirstat/options.cpp
@@ -350,6 +350,7 @@ void CPersistence::GetSplitterPos( _In_z_  const PCTSTR name, _Inout_ bool& vali
 	}
 
 void CPersistence::GetDialogRectangle( _In_z_ const PCTSTR name, _Out_ RECT& rc ) {
+	//TODO: BUGBUG: check return value!
 	GetRect( MakeDialogRectangleEntry( name ), rc );
 	RECT temp = rc;
 	SanifyRect( temp );

diff --git a/WinDirStat/windirstat/xyslider.cpp b/WinDirStat/windirstat/xyslider.cpp
@@ -138,7 +138,7 @@ void CDC::FillSolidRect(LPCRECT lpRect, COLORREF clr)
 
 	//TODO: check this!
 	ASSERT( color_res_1 != CLR_INVALID );
-
+	(void)color_res_1;
 
 	//If the string is drawn, the return value [of ExtTextOutW] is nonzero. However, if the ANSI version of ExtTextOut is called with ETO_GLYPH_INDEX, the function returns TRUE even though the function does nothing.
 	VERIFY( ::ExtTextOutW( pdc.m_hDC, 0, 0, ETO_OPAQUE, &m_rcAll, NULL, 0u, NULL ) );
@@ -169,11 +169,14 @@ _AFXWIN_INLINE BOOL CDC::DrawEdge(LPRECT lpRect, UINT nEdge, UINT nFlags)
 
 	//TODO: check this!
 	ASSERT( color_res_2 != CLR_INVALID );
+	(void)color_res_2;
+
 	//If the string is drawn, the return value [of ExtTextOutW] is nonzero. However, if the ANSI version of ExtTextOut is called with ETO_GLYPH_INDEX, the function returns TRUE even though the function does nothing.
 	const BOOL text_out_res_2 = ::ExtTextOutW( pdc.m_hDC, 0, 0, ETO_OPAQUE, &rc, NULL, 0u, NULL );
 
 	//TODO: check this!
 	ASSERT( text_out_res_2 != 0 );
+	( void ) text_out_res_2;
 
 	//--------------------------------
 
@@ -359,6 +362,7 @@ void CDC::FillSolidRect(LPCRECT lpRect, COLORREF clr)
 	//If [SetBkColor] fails, the return value is CLR_INVALID.
 	const COLORREF bk_color_res_1 = ::SetBkColor( pdc.m_hDC, color );
 	ASSERT( bk_color_res_1 != CLR_INVALID );
+	( void ) bk_color_res_1;
 
 	//If the string is drawn, the return value [of ExtTextOutW] is nonzero. However, if the ANSI version of ExtTextOut is called with ETO_GLYPH_INDEX, the function returns TRUE even though the function does nothing.
 	VERIFY( ::ExtTextOutW( pdc.m_hDC, 0, 0, ETO_OPAQUE, &rc, NULL, 0, NULL ) );