winevt_c 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1bac257f6ecb7f2f3cd697e067165f74ce990173f01746eb1899473cb859975f
-  data.tar.gz: 83e7a12cb474e68fb03667b0be0a4b2ea02c950904d4e2aff6e4ec33e48b549d
+  metadata.gz: 643bcdf4d5b8c420f73bbb333ff5f43d3aaa49fa5e5c5387f9b56b226a17a95b
+  data.tar.gz: 3e1ac4f307bc238cc6fd3b6a1899d40d5906f73760fdab659a2b13155d4aeab0
 SHA512:
-  metadata.gz: cb0746e7488a3af43daae3ac699900cd67bbcfd363f2806fe5ef12a40fa8bfa08da261ab825b7f65519462baea439b89341e81cbddb2a825e9d48917e6a4b970
-  data.tar.gz: d7e69ecbc6e3e3c5b78e4f763f5c1c4509759bcc4b38db3637f8cec3600737a1b0aaceaf5f16b7d1244102ab9f46a29a9642f035e2ab78ca5dd1246160fbc6d1
+  metadata.gz: 14c3237a1fd9e278a1413a75736b75c4715daf9c4f58799bf1136784d3e9139a61a0eca41ba124ce5e740507cfc7a6bcb3c991cd31fd0b453ddcd263486aedf0
+  data.tar.gz: 45562eefcdac2d2214233ee8633b01f0f2eedd258690fc37dbdfef0aaec7b6ca863f66665f499f1039bff25c8b07d327eaf2d444baad09cb85c8ccea5be9246d

data/README.md

@@ -2,6 +2,12 @@
 
 [![Build status](https://ci.appveyor.com/api/projects/status/hr3phv8ihvgc68oj/branch/master?svg=true)](https://ci.appveyor.com/project/cosmo0920/winevt-c/branch/master)
 
+## Prerequisites
+
+* Windows Vista/Windows Server 2008 or later.
+* gcc and g++ from MSYS2 for building C/C++ extension.
+* Ruby 2.4 or later with MSYS2.
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -12,11 +18,11 @@ gem 'winevt_c'
 
 And then execute:
 
-    $ bundle
+    $ ridk exec bundle
 
 Or install it yourself as:
 
-    $ gem install winevt_c
+    $ ridk exec gem install winevt_c
 
 ## Usage
 

data/ext/winevt/winevt_bookmark.c

@@ -80,16 +80,13 @@ static VALUE
 rb_winevt_bookmark_render(VALUE self)
 {
   WCHAR* wResult;
-  char* result;
   struct WinevtBookmark *winevtBookmark;
   VALUE utf8str;
 
   TypedData_Get_Struct(self, struct WinevtBookmark, &rb_winevt_bookmark_type, winevtBookmark);
   wResult = render_event(winevtBookmark->bookmark, EvtRenderBookmark);
-  result = wstr_to_mbstr(CP_UTF8, wResult, -1);
+  utf8str = wstr_to_rb_str(CP_UTF8, wResult, -1);
 
-  utf8str = rb_utf8_str_new_cstr(result);
-  free_allocated_mbstr(result);
   if (wResult != NULL)
     free(wResult);
 

data/ext/winevt/winevt_c.h

@@ -27,6 +27,7 @@ extern "C" {
 
 char* wstr_to_mbstr(UINT cp, const WCHAR *wstr, int clen);
 void free_allocated_mbstr(const char* str);
+VALUE wstr_to_rb_str(UINT cp, const WCHAR *wstr, int clen);
 WCHAR* render_event(EVT_HANDLE handle, DWORD flags);
 WCHAR* get_description(EVT_HANDLE handle);
 VALUE get_values(EVT_HANDLE handle);

data/ext/winevt/winevt_channel.c

@@ -43,7 +43,6 @@ rb_winevt_channel_each(VALUE self)
   EVT_HANDLE hChannels;
   struct WinevtChannel *winevtChannel;
   char *errBuf = NULL;
-  char * result;
   LPWSTR buffer = NULL;
   LPWSTR temp = NULL;
   DWORD bufferSize = 0;
@@ -87,10 +86,7 @@ rb_winevt_channel_each(VALUE self)
       }
     }
 
-    result = wstr_to_mbstr(CP_UTF8, buffer, -1);
-
-    utf8str = rb_utf8_str_new_cstr(result);
-    free_allocated_mbstr(result);
+    utf8str = wstr_to_rb_str(CP_UTF8, buffer, -1);
 
     rb_yield(utf8str);
   }

data/ext/winevt/winevt_query.c

@@ -138,16 +138,13 @@ static VALUE
 rb_winevt_query_render(VALUE self)
 {
   WCHAR* wResult;
-  char* result;
   struct WinevtQuery *winevtQuery;
   VALUE utf8str;
 
   TypedData_Get_Struct(self, struct WinevtQuery, &rb_winevt_query_type, winevtQuery);
   wResult = render_event(winevtQuery->event, EvtRenderEventXml);
-  result = wstr_to_mbstr(CP_UTF8, wResult, -1);
+  utf8str = wstr_to_rb_str(CP_UTF8, wResult, -1);
 
-  utf8str = rb_utf8_str_new_cstr(result);
-  free_allocated_mbstr(result);
   if (wResult != NULL)
     free(wResult);
 
@@ -158,16 +155,12 @@ static VALUE
 rb_winevt_query_message(VALUE self)
 {
   WCHAR* wResult;
-  char* result;
   struct WinevtQuery *winevtQuery;
   VALUE utf8str;
 
   TypedData_Get_Struct(self, struct WinevtQuery, &rb_winevt_query_type, winevtQuery);
   wResult = get_description(winevtQuery->event);
-  result = wstr_to_mbstr(CP_UTF8, wResult, -1);
-
-  utf8str = rb_utf8_str_new_cstr(result);
-  free_allocated_mbstr(result);
+  utf8str = wstr_to_rb_str(CP_UTF8, wResult, -1);
 
   return utf8str;
 }

data/ext/winevt/winevt_subscribe.c

@@ -153,16 +153,13 @@ static VALUE
 rb_winevt_subscribe_render(VALUE self)
 {
   WCHAR* wResult;
-  char* result;
   struct WinevtSubscribe *winevtSubscribe;
   VALUE utf8str;
 
   TypedData_Get_Struct(self, struct WinevtSubscribe, &rb_winevt_subscribe_type, winevtSubscribe);
   wResult = render_event(winevtSubscribe->event, EvtRenderEventXml);
-  result = wstr_to_mbstr(CP_UTF8, wResult, -1);
+  utf8str = wstr_to_rb_str(CP_UTF8, wResult, -1);
 
-  utf8str = rb_utf8_str_new_cstr(result);
-  free_allocated_mbstr(result);
   if (wResult != NULL)
     free(wResult);
 
@@ -173,16 +170,12 @@ static VALUE
 rb_winevt_subscribe_message(VALUE self)
 {
   WCHAR* wResult;
-  char* result;
   struct WinevtSubscribe *winevtSubscribe;
   VALUE utf8str;
 
   TypedData_Get_Struct(self, struct WinevtSubscribe, &rb_winevt_subscribe_type, winevtSubscribe);
   wResult = get_description(winevtSubscribe->event);
-  result = wstr_to_mbstr(CP_UTF8, wResult, -1);
-
-  utf8str = rb_utf8_str_new_cstr(result);
-  free_allocated_mbstr(result);
+  utf8str = wstr_to_rb_str(CP_UTF8, wResult, -1);
 
   return utf8str;
 }
@@ -219,17 +212,13 @@ static VALUE
 rb_winevt_subscribe_get_bookmark(VALUE self)
 {
   WCHAR* wResult;
-  char* result;
   struct WinevtSubscribe *winevtSubscribe;
   VALUE utf8str;
 
   TypedData_Get_Struct(self, struct WinevtSubscribe, &rb_winevt_subscribe_type, winevtSubscribe);
 
   wResult = render_event(winevtSubscribe->bookmark, EvtRenderBookmark);
-  result = wstr_to_mbstr(CP_UTF8, wResult, -1);
-
-  utf8str = rb_utf8_str_new_cstr(result);
-  free_allocated_mbstr(result);
+  utf8str = wstr_to_rb_str(CP_UTF8, wResult, -1);
 
   return utf8str;
 }

data/ext/winevt/winevt_utils.cpp

@@ -7,9 +7,9 @@ char*
 wstr_to_mbstr(UINT cp, const WCHAR *wstr, int clen)
 {
     char *ptr;
-    int len = WideCharToMultiByte(cp, 0, wstr, clen, NULL, 0, NULL, NULL);
-    if (!(ptr = static_cast<char *>(xmalloc(len)))) return 0;
-    WideCharToMultiByte(cp, 0, wstr, clen, ptr, len, NULL, NULL);
+    int len = WideCharToMultiByte(cp, 0, wstr, clen, nullptr, 0, nullptr, nullptr);
+    if (!(ptr = static_cast<char *>(xmalloc(len)))) return nullptr;
+    WideCharToMultiByte(cp, 0, wstr, clen, ptr, len, nullptr, nullptr);
 
     return ptr;
 }
@@ -20,9 +20,19 @@ void free_allocated_mbstr(const char* str)
     xfree((char *)str);
 }
 
+VALUE
+wstr_to_rb_str(UINT cp, const WCHAR *wstr, int clen)
+{
+    int len = WideCharToMultiByte(cp, 0, wstr, clen, nullptr, 0, nullptr, nullptr);
+    VALUE str = rb_utf8_str_new(0, len);
+    WideCharToMultiByte(cp, 0, wstr, clen, RSTRING_PTR(str), len, nullptr, nullptr);
+
+    return str;
+}
+
 WCHAR* render_event(EVT_HANDLE handle, DWORD flags)
 {
-  PWSTR      buffer = NULL;
+  PWSTR      buffer = nullptr;
   ULONG      bufferSize = 0;
   ULONG      bufferSizeNeeded = 0;
   ULONG      status, count;
@@ -34,7 +44,7 @@ WCHAR* render_event(EVT_HANDLE handle, DWORD flags)
       free(buffer);
       bufferSize = bufferSizeNeeded;
       buffer = static_cast<WCHAR *>(xmalloc(bufferSize));
-      if (buffer == NULL) {
+      if (buffer == nullptr) {
         status = ERROR_OUTOFMEMORY;
         bufferSize = 0;
         rb_raise(rb_eWinevtQueryError, "Out of memory");
@@ -42,7 +52,7 @@ WCHAR* render_event(EVT_HANDLE handle, DWORD flags)
       }
     }
 
-    if (EvtRender(NULL,
+    if (EvtRender(nullptr,
                   handle,
                   flags,
                   bufferSize,
@@ -60,9 +70,9 @@ WCHAR* render_event(EVT_HANDLE handle, DWORD flags)
         FORMAT_MESSAGE_ALLOCATE_BUFFER |
         FORMAT_MESSAGE_FROM_SYSTEM |
         FORMAT_MESSAGE_IGNORE_INSERTS,
-        NULL, status,
+        nullptr, status,
         MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-        msgBuf, 0, NULL);
+        msgBuf, 0, nullptr);
 
     VALUE errmsg = rb_str_new2(msgBuf);
     LocalFree(msgBuf);
@@ -79,9 +89,9 @@ WCHAR* render_event(EVT_HANDLE handle, DWORD flags)
 }
 
 static std::wstring guid_to_wstr(const GUID& guid) {
-  LPOLESTR p = NULL;
+  LPOLESTR p = nullptr;
   if (FAILED(StringFromCLSID(guid, &p))) {
-    return NULL;
+    return nullptr;
   }
   std::wstring s(p);
   CoTaskMemFree(p);
@@ -96,12 +106,12 @@ VALUE get_values(EVT_HANDLE handle)
   DWORD status, propCount = 0;
   char *result;
   LPTSTR msgBuf;
-  WCHAR* tmpWChar = NULL;
+  WCHAR* tmpWChar = nullptr;
   VALUE userValues = rb_ary_new();
 
   static PCWSTR eventProperties[] = { L"Event/EventData/Data[1]" };
-  EVT_HANDLE renderContext = EvtCreateRenderContext(0, NULL, EvtRenderContextUser);
-  if (renderContext == NULL) {
+  EVT_HANDLE renderContext = EvtCreateRenderContext(0, nullptr, EvtRenderContextUser);
+  if (renderContext == nullptr) {
     rb_raise(rb_eWinevtQueryError, "Failed to create renderContext");
   }
 
@@ -136,9 +146,9 @@ VALUE get_values(EVT_HANDLE handle)
         FORMAT_MESSAGE_ALLOCATE_BUFFER |
         FORMAT_MESSAGE_FROM_SYSTEM |
         FORMAT_MESSAGE_IGNORE_INSERTS,
-        NULL, status,
+        nullptr, status,
         MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-        msgBuf, 0, NULL);
+        msgBuf, 0, nullptr);
 
     VALUE errmsg = rb_str_new2(msgBuf);
     LocalFree(msgBuf);
@@ -146,11 +156,12 @@ VALUE get_values(EVT_HANDLE handle)
     rb_raise(rb_eWinevtQueryError, "ErrorCode: %lu\nError: %s\n", status, RSTRING_PTR(errmsg));
   }
 
-  PEVT_VARIANT pRenderedValues = (PEVT_VARIANT)buffer.c_str();
+  PEVT_VARIANT pRenderedValues = reinterpret_cast<PEVT_VARIANT>(const_cast<WCHAR *>(buffer.c_str()));
   LARGE_INTEGER timestamp;
   SYSTEMTIME st;
   FILETIME ft;
-  CHAR strTime[128];
+  std::string strTime;
+  std::string sResult;
   VALUE rbObj;
 
   for (int i = 0; i < propCount; i++) {
@@ -159,35 +170,34 @@ VALUE get_values(EVT_HANDLE handle)
       rb_ary_push(userValues, Qnil);
       break;
     case EvtVarTypeString:
-      if (pRenderedValues[i].StringVal == NULL) {
+      if (pRenderedValues[i].StringVal == nullptr) {
         rb_ary_push(userValues, rb_utf8_str_new_cstr("(NULL)"));
       } else {
-        result = wstr_to_mbstr(CP_UTF8, pRenderedValues[i].StringVal, -1);
-        rb_ary_push(userValues, rb_utf8_str_new_cstr(result));
-        free_allocated_mbstr(result);
+        rbObj = wstr_to_rb_str(CP_UTF8, pRenderedValues[i].StringVal, -1);
+        rb_ary_push(userValues, rbObj);
       }
       break;
     case EvtVarTypeAnsiString:
-      if (pRenderedValues[i].AnsiStringVal == NULL) {
+      if (pRenderedValues[i].AnsiStringVal == nullptr) {
         rb_ary_push(userValues, rb_utf8_str_new_cstr("(NULL)"));
       } else {
-        rb_ary_push(userValues, rb_utf8_str_new_cstr((char *)pRenderedValues[i].AnsiStringVal));
+        rb_ary_push(userValues, rb_utf8_str_new_cstr(const_cast<char *>(pRenderedValues[i].AnsiStringVal)));
       }
       break;
     case EvtVarTypeSByte:
-      rbObj = INT2NUM((INT32)pRenderedValues[i].SByteVal);
+      rbObj = INT2NUM(static_cast<UINT32>(pRenderedValues[i].SByteVal));
       rb_ary_push(userValues, rbObj);
       break;
     case EvtVarTypeByte:
-      rbObj = INT2NUM((UINT32)pRenderedValues[i].ByteVal);
+      rbObj = INT2NUM(static_cast<UINT32>(pRenderedValues[i].ByteVal));
       rb_ary_push(userValues, rbObj);
       break;
     case EvtVarTypeInt16:
-      rbObj = INT2NUM((INT32)pRenderedValues[i].Int16Val);
+      rbObj = INT2NUM(static_cast<INT32>(pRenderedValues[i].Int16Val));
       rb_ary_push(userValues, rbObj);
       break;
     case EvtVarTypeUInt16:
-      rbObj = UINT2NUM((UINT32)pRenderedValues[i].UInt16Val);
+      rbObj = UINT2NUM(static_cast<UINT32>(pRenderedValues[i].UInt16Val));
       rb_ary_push(userValues, rbObj);
       break;
     case EvtVarTypeInt32:
@@ -207,25 +217,23 @@ VALUE get_values(EVT_HANDLE handle)
       rb_ary_push(userValues, rbObj);
       break;
     case EvtVarTypeSingle:
-      sprintf(result, "%f", pRenderedValues[i].SingleVal);
-      rb_ary_push(userValues, rb_utf8_str_new_cstr(result));
-      free_allocated_mbstr(result);
+      sprintf(&sResult[0], "%f", pRenderedValues[i].SingleVal);
+      rb_ary_push(userValues, rb_utf8_str_new_cstr(sResult.c_str()));
       break;
     case EvtVarTypeDouble:
-      sprintf(result, "%lf", pRenderedValues[i].DoubleVal);
-      rb_ary_push(userValues, rb_utf8_str_new_cstr(result));
+      sprintf(&sResult[0], "%lf", pRenderedValues[i].DoubleVal);
+      rb_ary_push(userValues, rb_utf8_str_new_cstr(sResult.c_str()));
       break;
     case EvtVarTypeBoolean:
       result = const_cast<char *>(pRenderedValues[i].BooleanVal ? "true" : "false");
       rb_ary_push(userValues, rb_utf8_str_new_cstr(result));
       break;
     case EvtVarTypeGuid:
-      if (pRenderedValues[i].GuidVal != NULL) {
+      if (pRenderedValues[i].GuidVal != nullptr) {
         const GUID guid = *pRenderedValues[i].GuidVal;
         std::wstring wstr = guid_to_wstr(guid);
-        result = wstr_to_mbstr(CP_UTF8, wstr.c_str(), -1);
-        rb_ary_push(userValues, rb_utf8_str_new_cstr(result));
-        free_allocated_mbstr(result);
+        rbObj = wstr_to_rb_str(CP_UTF8, wstr.c_str(), -1);
+        rb_ary_push(userValues, rbObj);
       } else {
         rb_ary_push(userValues, rb_utf8_str_new_cstr("?"));
       }
@@ -239,32 +247,31 @@ VALUE get_values(EVT_HANDLE handle)
       ft.dwHighDateTime = timestamp.HighPart;
       ft.dwLowDateTime  = timestamp.LowPart;
       if (FileTimeToSystemTime( &ft, &st )) {
-        sprintf(strTime, "%04d-%02d-%02d %02d:%02d:%02d.%dZ",
+        sprintf(&strTime[0], "%04d-%02d-%02d %02d:%02d:%02d.%dZ",
                 st.wYear , st.wMonth , st.wDay ,
                 st.wHour , st.wMinute , st.wSecond,
                 st.wMilliseconds);
-        rb_ary_push(userValues, rb_utf8_str_new_cstr(strTime));
+        rb_ary_push(userValues, rb_utf8_str_new_cstr(strTime.c_str()));
       } else {
         rb_ary_push(userValues, rb_utf8_str_new_cstr("?"));
       }
       break;
     case EvtVarTypeSysTime:
-      if (pRenderedValues[i].SysTimeVal != NULL) {
+      if (pRenderedValues[i].SysTimeVal != nullptr) {
         st = *pRenderedValues[i].SysTimeVal;
-        sprintf(strTime, "%04d-%02d-%02d %02d:%02d:%02d.%dZ",
+        sprintf(&strTime[0], "%04d-%02d-%02d %02d:%02d:%02d.%dZ",
                 st.wYear , st.wMonth , st.wDay ,
                 st.wHour , st.wMinute , st.wSecond,
                 st.wMilliseconds);
-        rb_ary_push(userValues, rb_utf8_str_new_cstr(strTime));
+        rb_ary_push(userValues, rb_utf8_str_new_cstr(strTime.c_str()));
       } else {
         rb_ary_push(userValues, rb_utf8_str_new_cstr("?"));
       }
       break;
     case EvtVarTypeSid:
       if (ConvertSidToStringSidW(pRenderedValues[i].SidVal, &tmpWChar)) {
-        result = wstr_to_mbstr(CP_UTF8, tmpWChar, -1);
-        rb_ary_push(userValues, rb_utf8_str_new_cstr(result));
-        free_allocated_mbstr(result);
+        rbObj = wstr_to_rb_str(CP_UTF8, tmpWChar, -1);
+        rb_ary_push(userValues, rbObj);
         LocalFree(tmpWChar);
       } else {
         rb_ary_push(userValues, rb_utf8_str_new_cstr("?"));
@@ -281,12 +288,11 @@ VALUE get_values(EVT_HANDLE handle)
       rb_ary_push(userValues, rbObj);
       break;
     case EvtVarTypeEvtXml:
-      if (pRenderedValues[i].XmlVal == NULL) {
+      if (pRenderedValues[i].XmlVal == nullptr) {
         rb_ary_push(userValues, rb_utf8_str_new_cstr("(NULL)"));
       } else {
-        result = wstr_to_mbstr(CP_UTF8, pRenderedValues[i].XmlVal, -1);
-        rb_ary_push(userValues, rb_utf8_str_new_cstr(result));
-        free_allocated_mbstr(result);
+        rbObj = wstr_to_rb_str(CP_UTF8, pRenderedValues[i].XmlVal, -1);
+        rb_ary_push(userValues, rbObj);
       }
       break;
     default:
@@ -310,7 +316,7 @@ static std::wstring get_message(EVT_HANDLE hMetadata, EVT_HANDLE handle)
   LPVOID lpMsgBuf;
   std::wstring message(BUFSIZE, '\0');
 
-  if (!EvtFormatMessage(hMetadata, handle, 0xffffffff, 0, NULL, EvtFormatMessageEvent, message.size(), &message[0], &bufferSizeNeeded)) {
+  if (!EvtFormatMessage(hMetadata, handle, 0xffffffff, 0, nullptr, EvtFormatMessageEvent, message.size(), &message[0], &bufferSizeNeeded)) {
     status = GetLastError();
 
     if (status != ERROR_EVT_UNRESOLVED_VALUE_INSERT) {
@@ -324,19 +330,19 @@ static std::wstring get_message(EVT_HANDLE hMetadata, EVT_HANDLE handle)
         if (FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER |
                            FORMAT_MESSAGE_FROM_SYSTEM |
                            FORMAT_MESSAGE_IGNORE_INSERTS,
-                           NULL,
+                           nullptr,
                            status,
                            MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-                           (WCHAR *) &lpMsgBuf, 0, NULL) == 0)
+                           reinterpret_cast<WCHAR *>(&lpMsgBuf), 0, nullptr) == 0)
           FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER |
                          FORMAT_MESSAGE_FROM_SYSTEM |
                          FORMAT_MESSAGE_IGNORE_INSERTS,
-                         NULL,
+                         nullptr,
                          status,
                          MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US),
-                         (WCHAR *) &lpMsgBuf, 0, NULL);
+                         reinterpret_cast<WCHAR *>(&lpMsgBuf), 0, nullptr);
 
-        result = (WCHAR *)lpMsgBuf;
+        result = reinterpret_cast<WCHAR *>(lpMsgBuf);
         LocalFree(lpMsgBuf);
 
         goto cleanup;
@@ -351,7 +357,7 @@ static std::wstring get_message(EVT_HANDLE hMetadata, EVT_HANDLE handle)
     if (status == ERROR_INSUFFICIENT_BUFFER) {
       message.resize(bufferSizeNeeded);
 
-      if(!EvtFormatMessage(hMetadata, handle, 0xffffffff, 0, NULL, EvtFormatMessageEvent, message.size(), &message[0], &bufferSizeNeeded)) {
+      if(!EvtFormatMessage(hMetadata, handle, 0xffffffff, 0, nullptr, EvtFormatMessageEvent, message.size(), &message[0], &bufferSizeNeeded)) {
         status = GetLastError();
 
         if (status != ERROR_EVT_UNRESOLVED_VALUE_INSERT) {
@@ -365,19 +371,19 @@ static std::wstring get_message(EVT_HANDLE hMetadata, EVT_HANDLE handle)
             if (FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER |
                                FORMAT_MESSAGE_FROM_SYSTEM |
                                FORMAT_MESSAGE_IGNORE_INSERTS,
-                               NULL,
+                               nullptr,
                                status,
                                MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-                               (WCHAR *) &lpMsgBuf, 0, NULL) == 0)
+                               reinterpret_cast<WCHAR *>(&lpMsgBuf), 0, nullptr) == 0)
               FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER |
                              FORMAT_MESSAGE_FROM_SYSTEM |
                              FORMAT_MESSAGE_IGNORE_INSERTS,
-                             NULL,
+                             nullptr,
                              status,
                              MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US),
-                             (WCHAR *) &lpMsgBuf, 0, NULL);
+                             reinterpret_cast<WCHAR *>(&lpMsgBuf), 0, nullptr);
 
-            result = (WCHAR *)lpMsgBuf;
+            result = reinterpret_cast<WCHAR *>(lpMsgBuf);
             LocalFree(lpMsgBuf);
 
             goto cleanup;
@@ -407,11 +413,11 @@ WCHAR* get_description(EVT_HANDLE handle)
   ULONG      status, count;
   std::wstring result;
   LPTSTR     msgBuf;
-  EVT_HANDLE hMetadata = NULL;
+  EVT_HANDLE hMetadata = nullptr;
 
   static PCWSTR eventProperties[] = {L"Event/System/Provider/@Name"};
   EVT_HANDLE renderContext = EvtCreateRenderContext(1, eventProperties, EvtRenderContextValues);
-  if (renderContext == NULL) {
+  if (renderContext == nullptr) {
     rb_raise(rb_eWinevtQueryError, "Failed to create renderContext");
   }
 
@@ -432,9 +438,9 @@ WCHAR* get_description(EVT_HANDLE handle)
         FORMAT_MESSAGE_ALLOCATE_BUFFER |
         FORMAT_MESSAGE_FROM_SYSTEM |
         FORMAT_MESSAGE_IGNORE_INSERTS,
-        NULL, status,
+        nullptr, status,
         MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-        msgBuf, 0, NULL);
+        msgBuf, 0, nullptr);
 
     VALUE errmsg = rb_str_new2(msgBuf);
     LocalFree(msgBuf);
@@ -446,8 +452,8 @@ WCHAR* get_description(EVT_HANDLE handle)
   const PEVT_VARIANT values = reinterpret_cast<PEVT_VARIANT>(const_cast<WCHAR *>(buffer.c_str()));
 
   // Open publisher metadata
-  hMetadata = EvtOpenPublisherMetadata(NULL, values[0].StringVal, NULL, MAKELCID(MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), SORT_DEFAULT), 0);
-  if (hMetadata == NULL) {
+  hMetadata = EvtOpenPublisherMetadata(nullptr, values[0].StringVal, nullptr, MAKELCID(MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), SORT_DEFAULT), 0);
+  if (hMetadata == nullptr) {
     // When winevt_c cannot open metadata, then give up to obtain
     // message file and clean up immediately.
     goto cleanup;

data/lib/winevt/version.rb

@@ -1,3 +1,3 @@
 module Winevt
-  VERSION = "0.4.4"
+  VERSION = "0.4.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: winevt_c
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Hiroshi Hatake
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-02 00:00:00.000000000 Z
+date: 2019-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler