winevt_c 0.3.7-x64-mingw32 → 0.3.8-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c7791720b42de0b83936093a72a624d6e2299e9f1f6016f314c0a92a33c16c4
-  data.tar.gz: 1f03167cb8b8b964390a62fc77ac6f0e154e64c0ffd5d8844e78d6b5212689d6
+  metadata.gz: b27f73e02d0f7008b45a13f4c387b7c56bd35e2a09ce651567ff207f9ebfc20f
+  data.tar.gz: 603032df87a9905a851b762c17a71b41d11d63ea5fbf81d2771c29cb4677c6dc
 SHA512:
-  metadata.gz: 0173d0f95fe50b624d2e19c31c61e716e19335167e98a014948fc3b88598a4518242371f6654fbc5556de12777b6652f9f83f89b76b42eb734f811c81b860840
-  data.tar.gz: ded694ff608926eb2637eb8725075553ed3470c054ac1ad58cef7bdfc9525646ce9858461c12ae0da98bfebd2952d85c95821ad7f9024e793bbfd0e6bf6dc8b5
+  metadata.gz: 15916af51fe7d755b9faffcddb800b79b731af1ab6d4ab2d4163e9f6174fb70124f17d4fa51d0ce6365d639d24964a6e88237f7e70efbdd949a05d0943aff7c3
+  data.tar.gz: 1e061b1a1cd8a52978ae75ad928646fc833257c45fa0a95af29183b5ccddd98c02f6c097c91a7ba4ac5eb52360a0f561b42d735c9691705617e6d14dd20df4c0

data/ext/winevt/winevt_utils.c

@@ -18,9 +18,7 @@ char* render_event(EVT_HANDLE handle, DWORD flags)
   PWSTR      buffer = NULL;
   ULONG      bufferSize = 0;
   ULONG      bufferSizeNeeded = 0;
-  EVT_HANDLE event;
   ULONG      status, count;
-  char*      errBuf;
   char*      result;
   LPTSTR     msgBuf;
 
@@ -286,13 +284,12 @@ char* get_description(EVT_HANDLE handle)
   WCHAR      descriptionBuffer[MAX_BUFFER];
   ULONG      bufferSize = 0;
   ULONG      bufferSizeNeeded = 0;
-  EVT_HANDLE event;
   ULONG      status, count;
   char*      result = "";
   LPTSTR     msgBuf = "";
   EVT_HANDLE hMetadata = NULL;
   PEVT_VARIANT values = NULL;
-  PWSTR pwBuffer = NULL;
+  LPVOID lpMsgBuf;
 
   static PCWSTR eventProperties[] = {L"Event/System/Provider/@Name"};
   EVT_HANDLE renderContext = EvtCreateRenderContext(1, eventProperties, EvtRenderContextValues);
@@ -348,8 +345,27 @@ char* get_description(EVT_HANDLE handle)
       case ERROR_EVT_MESSAGE_LOCALE_NOT_FOUND:
       case ERROR_RESOURCE_LANG_NOT_FOUND:
       case ERROR_MUI_FILE_NOT_FOUND:
-      case ERROR_EVT_UNRESOLVED_PARAMETER_INSERT:
-        return "";
+      case ERROR_EVT_UNRESOLVED_PARAMETER_INSERT: {
+        if (FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER |
+                           FORMAT_MESSAGE_FROM_SYSTEM |
+                           FORMAT_MESSAGE_IGNORE_INSERTS,
+                           NULL,
+                           status,
+                           MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+                           (WCHAR *) &lpMsgBuf, 0, NULL) == 0)
+          FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER |
+                         FORMAT_MESSAGE_FROM_SYSTEM |
+                         FORMAT_MESSAGE_IGNORE_INSERTS,
+                         NULL,
+                         status,
+                         MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US),
+                         (WCHAR *) &lpMsgBuf, 0, NULL);
+
+        result = wstr_to_mbstr(CP_UTF8, (WCHAR *)lpMsgBuf, -1);
+
+        goto cleanup;
+      }
+
       }
 
       if (status != ERROR_INSUFFICIENT_BUFFER)
@@ -370,7 +386,24 @@ char* get_description(EVT_HANDLE handle)
           case ERROR_RESOURCE_LANG_NOT_FOUND:
           case ERROR_MUI_FILE_NOT_FOUND:
           case ERROR_EVT_UNRESOLVED_PARAMETER_INSERT:
-            return "";
+            if (FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER |
+                               FORMAT_MESSAGE_FROM_SYSTEM |
+                               FORMAT_MESSAGE_IGNORE_INSERTS,
+                               NULL,
+                               status,
+                               MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+                               (WCHAR *) &lpMsgBuf, 0, NULL) == 0)
+              FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER |
+                             FORMAT_MESSAGE_FROM_SYSTEM |
+                             FORMAT_MESSAGE_IGNORE_INSERTS,
+                             NULL,
+                             status,
+                             MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US),
+                             (WCHAR *) &lpMsgBuf, 0, NULL);
+
+            result = wstr_to_mbstr(CP_UTF8, (WCHAR *)lpMsgBuf, -1);
+
+            goto cleanup;
           }
 
           rb_raise(rb_eWinevtQueryError, "ErrorCode: %d", status);

data/lib/winevt/version.rb

@@ -1,3 +1,3 @@
 module Winevt
-  VERSION = "0.3.7"
+  VERSION = "0.3.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: winevt_c
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: x64-mingw32
 authors:
 - Hiroshi Hatake
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-26 00:00:00.000000000 Z
+date: 2019-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler