Amebis/WinStd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Writing events with parameters passed as va_arg fixed to work in 32-bit versions now

Browse Source
This commit is contained in:
Simon Rozman 2016-08-30 17:43:47 +02:00
parent 167e95f01a
commit b76203f95e
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/WinStd/ETW.h
View File

@ -41,12 +41,12 @@ namespace winstd
/// ///
/// EVENT_DATA_DESCRIPTOR wrapper /// EVENT_DATA_DESCRIPTOR wrapper
/// ///
class WINSTD_API event_data; class WINSTD_API __declspec(novtable) event_data;
/// ///
/// EVENT_RECORD wrapper /// EVENT_RECORD wrapper
/// ///
class WINSTD_API event_rec; class WINSTD_API __declspec(novtable) event_rec;
/// ///
/// ETW event provider /// ETW event provider
@ -116,7 +116,7 @@ template<class _Ty, class _Ax> inline ULONG TdhGetProperty(_In_ PEVENT_RECORD pE
namespace winstd namespace winstd
{ {
class WINSTD_API event_data : public EVENT_DATA_DESCRIPTOR class WINSTD_API __declspec(novtable) event_data : public EVENT_DATA_DESCRIPTOR
{ {
public: public:
/// ///
@ -228,7 +228,7 @@ namespace winstd
}; };
class WINSTD_API event_rec : public EVENT_RECORD class WINSTD_API __declspec(novtable) event_rec : public EVENT_RECORD
{ {
public: public:
/// ///
@ -278,7 +278,7 @@ namespace winstd
/// ///
/// Destroys event record data and frees the allocated memory. /// Destroys event record data and frees the allocated memory.
/// ///
virtual ~event_rec(); ~event_rec();
/// ///
@ -440,7 +440,7 @@ namespace winstd
/// ///
/// \sa [EventWrite function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363752.aspx) /// \sa [EventWrite function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363752.aspx)
/// ///
inline ULONG write(_In_ PCEVENT_DESCRIPTOR EventDescriptor, _In_ const EVENT_DATA_DESCRIPTOR &param1, ...) inline ULONG write(_In_ PCEVENT_DESCRIPTOR EventDescriptor, _In_ const EVENT_DATA_DESCRIPTOR param1, ...)
{ {
assert(m_h); assert(m_h);
UNREFERENCED_PARAMETER(param1); UNREFERENCED_PARAMETER(param1);
@ -475,7 +475,7 @@ namespace winstd
// Preallocate array. // Preallocate array.
for (param_count = 0;; param_count++) { for (param_count = 0;; param_count++) {
EVENT_DATA_DESCRIPTOR &p = va_arg(arg, EVENT_DATA_DESCRIPTOR); const EVENT_DATA_DESCRIPTOR &p = va_arg(arg, const EVENT_DATA_DESCRIPTOR);
if (!p.Ptr) break; if (!p.Ptr) break;
} }
params.reserve(param_count); params.reserve(param_count);
@ -483,7 +483,7 @@ namespace winstd
// Copy parameters to array. // Copy parameters to array.
arg = arg_start; arg = arg_start;
for (;;) { for (;;) {
EVENT_DATA_DESCRIPTOR &p = va_arg(arg, EVENT_DATA_DESCRIPTOR); const EVENT_DATA_DESCRIPTOR &p = va_arg(arg, const EVENT_DATA_DESCRIPTOR);
if (!p.Ptr) break; if (!p.Ptr) break;
params.push_back(p); params.push_back(p);
} }