winevt_c 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30a062502e07cec9555ad59177552ddfadcd9148a270637921d8e27f6ee5f9e6
-  data.tar.gz: 34aac8326a5a636c8ceee31770d569372d8975710cf46134f51f2848e512515e
+  metadata.gz: '0981a5360392cd5a0a16cda1d2f1bc88dd199ee2a3a1df9b5a58ad5aedacd9f0'
+  data.tar.gz: 93114a7d1062c2911ba1b59ae16b7d573c831eb56f14120f8faed963ec07ac25
 SHA512:
-  metadata.gz: 5bc59bf70f5d06867c686caeae7c4d59135f6bd6e121c19d8b7665a026ce914278768de5b614548f3c86a35e216f8dea72ca0267bfb194a1d17d80759bcad899
-  data.tar.gz: b65a802022726202958c5c009f68fd941e569d60f4b6d9b0e539a7280b42fe3c732927a264e44681a9e5efae20b0bbb2018f26544961c63052e64cd6f86440d5
+  metadata.gz: 03cdfea8f51c5aba392b12c710c7e6250a8eb860c4badaa5493d958768f2090a85da494c000a43cdd73c0ea1edd01d63fa539b93de4c87eb34305a5b1370a780
+  data.tar.gz: 99da720ae70548866887793bf225aa2ec09702924f92b7b3819afb81403079084c8bb1ac258b5fcf3a3303c9df9bf1d717a6fe306aa2b421d90dbed638b9dc2d

data/ext/winevt/extconf.rb

@@ -17,6 +17,7 @@ have_library("ole32")
 
 $LDFLAGS << " -lwevtapi -ladvapi32 -lole32"
 $CFLAGS << " -std=c99 -fPIC -fms-extensions "
+$CXXFLAGS << " -std=c++11 -fPIC -fms-extensions "
 # $CFLAGS << " -g -O0"
 
 create_makefile("winevt/winevt")

data/ext/winevt/winevt_bookmark.c

@@ -90,6 +90,8 @@ rb_winevt_bookmark_render(VALUE self)
 
   utf8str = rb_utf8_str_new_cstr(result);
   free_allocated_mbstr(result);
+  if (wResult != NULL)
+    free(wResult);
 
   return utf8str;
 }

data/ext/winevt/winevt_c.h

@@ -21,12 +21,20 @@
 #define EventBookMark(object) ((struct WinevtBookmark *)DATA_PTR(object))
 #define EventChannel(object) ((struct WinevtChannel *)DATA_PTR(object))
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 char* wstr_to_mbstr(UINT cp, const WCHAR *wstr, int clen);
 void free_allocated_mbstr(const char* str);
 WCHAR* render_event(EVT_HANDLE handle, DWORD flags);
 WCHAR* get_description(EVT_HANDLE handle);
 VALUE get_values(EVT_HANDLE handle);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 VALUE rb_cQuery;
 VALUE rb_cChannel;
 VALUE rb_cBookmark;

data/ext/winevt/winevt_query.c

@@ -203,7 +203,6 @@ rb_winevt_query_seek(VALUE self, VALUE bookmark_or_flag)
 {
   struct WinevtQuery *winevtQuery;
   struct WinevtBookmark *winevtBookmark = NULL;
-  DWORD status;
   DWORD flag;
 
   switch (TYPE(bookmark_or_flag)) {

data/ext/winevt/winevt_subscribe.c

@@ -78,7 +78,6 @@ rb_winevt_subscribe_subscribe(int argc, VALUE *argv, VALUE self)
   VALUE wpathBuf, wqueryBuf;
   PWSTR path, query;
   DWORD status = ERROR_SUCCESS;
-  struct WinevtBookmark *winevtBookmark;
   struct WinevtSubscribe *winevtSubscribe;
 
   hSignalEvent = CreateEvent(NULL, FALSE, FALSE, NULL);

data/ext/winevt/{winevt_utils.c → winevt_utils.cpp}

@@ -1,13 +1,14 @@
 #include <winevt_c.h>
 #include <sddl.h>
 #include <stdlib.h>
+#include <string>
 
 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 = xmalloc(len))) return 0;
+    if (!(ptr = static_cast<char *>(xmalloc(len)))) return 0;
     WideCharToMultiByte(cp, 0, wstr, clen, ptr, len, NULL, NULL);
 
     return ptr;
@@ -25,14 +26,14 @@ WCHAR* render_event(EVT_HANDLE handle, DWORD flags)
   ULONG      bufferSize = 0;
   ULONG      bufferSizeNeeded = 0;
   ULONG      status, count;
-  static WCHAR* result = L"";
+  static WCHAR* result;
   LPTSTR     msgBuf;
 
   do {
     if (bufferSizeNeeded > bufferSize) {
       free(buffer);
       bufferSize = bufferSizeNeeded;
-      buffer = xmalloc(bufferSize);
+      buffer = static_cast<WCHAR *>(xmalloc(bufferSize));
       if (buffer == NULL) {
         status = ERROR_OUTOFMEMORY;
         bufferSize = 0;
@@ -77,13 +78,23 @@ WCHAR* render_event(EVT_HANDLE handle, DWORD flags)
   return result;
 }
 
+static std::wstring guid_to_wstr(const GUID& guid) {
+  LPOLESTR p = NULL;
+  if (FAILED(StringFromCLSID(guid, &p))) {
+    return NULL;
+  }
+  std::wstring s(p);
+  CoTaskMemFree(p);
+  return s;
+}
+
 VALUE get_values(EVT_HANDLE handle)
 {
-  PWSTR buffer = NULL;
+  std::wstring buffer;
   ULONG bufferSize = 0;
   ULONG bufferSizeNeeded = 0;
   DWORD status, propCount = 0;
-  char *result = "";
+  char *result;
   LPTSTR msgBuf;
   WCHAR* tmpWChar = NULL;
   VALUE userValues = rb_ary_new();
@@ -96,10 +107,9 @@ VALUE get_values(EVT_HANDLE handle)
 
   do {
     if (bufferSizeNeeded > bufferSize) {
-      free(buffer);
       bufferSize = bufferSizeNeeded;
-      buffer = xmalloc(bufferSize);
-      if (buffer == NULL) {
+      buffer.resize(bufferSize);
+      if (buffer.c_str() == NULL) {
         status = ERROR_OUTOFMEMORY;
         bufferSize = 0;
         rb_raise(rb_eWinevtQueryError, "Out of memory");
@@ -110,8 +120,8 @@ VALUE get_values(EVT_HANDLE handle)
     if (EvtRender(renderContext,
                   handle,
                   EvtRenderEventValues,
-                  bufferSize,
-                  buffer,
+                  buffer.size(),
+                  &buffer[0],
                   &bufferSizeNeeded,
                   &propCount) != FALSE) {
       status = ERROR_SUCCESS;
@@ -135,7 +145,7 @@ VALUE get_values(EVT_HANDLE handle)
     rb_raise(rb_eWinevtQueryError, "ErrorCode: %d\nError: %s\n", status, RSTRING_PTR(errmsg));
   }
 
-  PEVT_VARIANT pRenderedValues = (PEVT_VARIANT)buffer;
+  PEVT_VARIANT pRenderedValues = (PEVT_VARIANT)buffer.c_str();
   LARGE_INTEGER timestamp;
   SYSTEMTIME st;
   FILETIME ft;
@@ -205,16 +215,16 @@ VALUE get_values(EVT_HANDLE handle)
       rb_ary_push(userValues, rb_utf8_str_new_cstr(result));
       break;
     case EvtVarTypeBoolean:
-      result = pRenderedValues[i].BooleanVal ? "true" : "false";
+      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) {
-        StringFromCLSID(pRenderedValues[i].GuidVal, &tmpWChar);
-        result = wstr_to_mbstr(CP_UTF8, tmpWChar, -1);
+        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);
-        CoTaskMemFree(tmpWChar);
       } else {
         rb_ary_push(userValues, rb_utf8_str_new_cstr("?"));
       }
@@ -284,28 +294,22 @@ VALUE get_values(EVT_HANDLE handle)
     }
   }
 
-  if (buffer)
-    xfree(buffer);
-
   if (renderContext)
     EvtClose(renderContext);
 
   return userValues;
 }
 
-static WCHAR* get_message(EVT_HANDLE hMetadata, EVT_HANDLE handle)
+static std::wstring get_message(EVT_HANDLE hMetadata, EVT_HANDLE handle)
 {
 #define BUFSIZE 4096
-  static WCHAR* result = L"";
+  std::wstring result;
   ULONG  status;
   ULONG bufferSizeNeeded = 0;
   LPVOID lpMsgBuf;
-  WCHAR*     prevBuffer;
-  WCHAR     *message;
-  WCHAR     *reallocatedMessage;
+  std::wstring message(BUFSIZE, '\0');
 
-  message = (WCHAR *)xmalloc(sizeof(WCHAR) * BUFSIZE);
-  if (!EvtFormatMessage(hMetadata, handle, 0xffffffff, 0, NULL, EvtFormatMessageEvent, BUFSIZE, message, &bufferSizeNeeded)) {
+  if (!EvtFormatMessage(hMetadata, handle, 0xffffffff, 0, NULL, EvtFormatMessageEvent, message.size(), &message[0], &bufferSizeNeeded)) {
     status = GetLastError();
 
     if (status != ERROR_EVT_UNRESOLVED_VALUE_INSERT) {
@@ -331,7 +335,7 @@ static WCHAR* get_message(EVT_HANDLE hMetadata, EVT_HANDLE handle)
                          MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US),
                          (WCHAR *) &lpMsgBuf, 0, NULL);
 
-        result = _wcsdup((WCHAR *)lpMsgBuf);
+        result = (WCHAR *)lpMsgBuf;
         LocalFree(lpMsgBuf);
 
         goto cleanup;
@@ -344,14 +348,9 @@ static WCHAR* get_message(EVT_HANDLE hMetadata, EVT_HANDLE handle)
     }
 
     if (status == ERROR_INSUFFICIENT_BUFFER) {
-      prevBuffer = message;
-      reallocatedMessage = (WCHAR *)realloc(prevBuffer, sizeof(WCHAR) * bufferSizeNeeded);
-      if (reallocatedMessage == NULL) {
-        rb_raise(rb_eWinevtQueryError, "Reallocation failed.");
-      }
-      message = reallocatedMessage;
+      message.resize(bufferSizeNeeded);
 
-      if(!EvtFormatMessage(hMetadata, handle, 0xffffffff, 0, NULL, EvtFormatMessageEvent, bufferSizeNeeded, message, &bufferSizeNeeded)) {
+      if(!EvtFormatMessage(hMetadata, handle, 0xffffffff, 0, NULL, EvtFormatMessageEvent, message.size(), &message[0], &bufferSizeNeeded)) {
         status = GetLastError();
 
         if (status != ERROR_EVT_UNRESOLVED_VALUE_INSERT) {
@@ -377,7 +376,7 @@ static WCHAR* get_message(EVT_HANDLE hMetadata, EVT_HANDLE handle)
                              MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US),
                              (WCHAR *) &lpMsgBuf, 0, NULL);
 
-            result = _wcsdup((WCHAR *)lpMsgBuf);
+            result = (WCHAR *)lpMsgBuf;
             LocalFree(lpMsgBuf);
 
             goto cleanup;
@@ -389,14 +388,11 @@ static WCHAR* get_message(EVT_HANDLE hMetadata, EVT_HANDLE handle)
     }
   }
 
-  result = _wcsdup(message);
+  result = message;
 
 cleanup:
 
-  if (message)
-    xfree(message);
-
-  return result;
+  return std::wstring(result);
 
 #undef BUFSIZE
 }
@@ -404,14 +400,13 @@ cleanup:
 WCHAR* get_description(EVT_HANDLE handle)
 {
 #define BUFSIZE 4096
-  WCHAR      buffer[BUFSIZE];
+  std::wstring buffer(BUFSIZE, '\0');
   ULONG      bufferSize = 0;
   ULONG      bufferSizeNeeded = 0;
   ULONG      status, count;
-  static WCHAR *result = L"";
-  LPTSTR     msgBuf = "";
+  std::wstring result;
+  LPTSTR     msgBuf;
   EVT_HANDLE hMetadata = NULL;
-  PEVT_VARIANT values = NULL;
 
   static PCWSTR eventProperties[] = {L"Event/System/Provider/@Name"};
   EVT_HANDLE renderContext = EvtCreateRenderContext(1, eventProperties, EvtRenderContextValues);
@@ -422,8 +417,8 @@ WCHAR* get_description(EVT_HANDLE handle)
   if (EvtRender(renderContext,
                 handle,
                 EvtRenderEventValues,
-                _countof(buffer),
-                buffer,
+                buffer.size(),
+                &buffer[0],
                 &bufferSizeNeeded,
                 &count) != FALSE) {
     status = ERROR_SUCCESS;
@@ -447,7 +442,7 @@ WCHAR* get_description(EVT_HANDLE handle)
   }
 
   // Obtain buffer as EVT_VARIANT pointer. To avoid ErrorCide 87 in EvtRender.
-  values = (PEVT_VARIANT)buffer;
+  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);
@@ -457,7 +452,7 @@ WCHAR* get_description(EVT_HANDLE handle)
     goto cleanup;
   }
 
-  result = _wcsdup(get_message(hMetadata, handle));
+  result = get_message(hMetadata, handle);
 
 #undef BUFSIZE
 
@@ -469,5 +464,5 @@ cleanup:
   if (hMetadata)
     EvtClose(hMetadata);
 
-  return result;
+  return const_cast<WCHAR *>(result.c_str());
 }

data/lib/winevt/version.rb

@@ -1,3 +1,3 @@
 module Winevt
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: winevt_c
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Hiroshi Hatake
@@ -112,7 +112,7 @@ files:
 - ext/winevt/winevt_channel.c
 - ext/winevt/winevt_query.c
 - ext/winevt/winevt_subscribe.c
-- ext/winevt/winevt_utils.c
+- ext/winevt/winevt_utils.cpp
 - lib/winevt.rb
 - lib/winevt/query.rb
 - lib/winevt/subscribe.rb