mirror of
				https://github.com/chibicitiberiu/rainmeter-studio.git
				synced 2024-02-24 04:33:31 +00:00 
			
		
		
		
	Changed DebugLog and LuaLog more reliably. (Fixed an issue that Rainmeter crashes if format parameter includes '%'.)
This commit is contained in:
		@@ -600,12 +600,29 @@ BOOL LSLog(int nLevel, LPCTSTR pszModule, LPCTSTR pszMessage)
 | 
			
		||||
	return TRUE;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void RmNullCRTInvalidParameterHandler(const wchar_t* expression, const wchar_t* function,  const wchar_t* file, unsigned int line, uintptr_t pReserved)
 | 
			
		||||
{
 | 
			
		||||
	// Do nothing.
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void DebugLog(const WCHAR* format, ... )
 | 
			
		||||
{
 | 
			
		||||
	WCHAR buffer[4096];
 | 
			
		||||
    va_list args;
 | 
			
		||||
	va_list args;
 | 
			
		||||
    va_start( args, format );
 | 
			
		||||
    _vsnwprintf_s( buffer, 4096, _TRUNCATE, format, args );
 | 
			
		||||
 | 
			
		||||
	_invalid_parameter_handler oldHandler = _set_invalid_parameter_handler(RmNullCRTInvalidParameterHandler);
 | 
			
		||||
	_CrtSetReportMode(_CRT_ASSERT, 0);
 | 
			
		||||
 | 
			
		||||
	errno = 0;
 | 
			
		||||
	_vsnwprintf_s( buffer, 4096, _TRUNCATE, format, args );
 | 
			
		||||
	if (errno != 0)
 | 
			
		||||
	{
 | 
			
		||||
		_snwprintf_s(buffer, 4096, _TRUNCATE, L"DebugLog internal error: %s", format);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	_set_invalid_parameter_handler(oldHandler);
 | 
			
		||||
 | 
			
		||||
	LSLog(LOG_DEBUG, L"Rainmeter", buffer);
 | 
			
		||||
	va_end(args);
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user