winevt_c 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09884e034a7cae3228dd7531156419f3f3838249eed22babb630adef47e12907'
-  data.tar.gz: a0839583a5c6a8d14e493f8af87dc4ca31f658add382222f7104690e1f39dfc4
+  metadata.gz: ac595d99bc6422ccdbbd74c8df98fad0fea9a6679c3858cc891d898cd22c6062
+  data.tar.gz: 42c8309fadbbc077f4999aa14b91e7a5d15f28747ad24961609d6152370ac12d
 SHA512:
-  metadata.gz: 22e5cd794c57f957cdee9aca0b91a9975d7f8ccd50bd9975f3e0538176b417616f5da3aebcfeec8853f7398286cc0ede1507670d002c78fd5236d578b70ee672
-  data.tar.gz: fc7ea5311b493b56cdb2942fee4469eaa6efd2dd4655806a8ecdedaa64b030595d248c8fb285712dcfe30c6792921990d1cffe1264d6ea46ec0552c8a1584244
+  metadata.gz: ee9d551fb4c229631e70b1e2e779fcebb3f87fe99a7c795a8a3fa9278ee8e7a2f8cfcad156f8189b380613d63746625913cb00dd7505f232ed6ea2dbc74fcfbd
+  data.tar.gz: 98af1f800f0628d2ddd96d974f9fa5ade5e1dfa9a5026a45ef3ab805516b860019c219af49bc3335f065725e1800202a474aaa18dd2abbc6e8826048b1588899

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: ruby
 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