winevt_c 0.3.7-x86-mingw32 → 0.3.8-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8939d729801ab1a729c79d8f235701ed4a0c3dfdc9d7f2a1c051229e02427e6d
-  data.tar.gz: 258be227456979bf0c7a571242224fa4b9f09c453cc1b8057861300432e9bd9c
+  metadata.gz: 1d1fff06b7a5fa0dfc30df81e3fad4e3a7ade856422579b1ac2ae63872598031
+  data.tar.gz: c9f526dcd65016aacf6983a556c11bc0c87832e55f15c87be8c9f1df5d14c047
 SHA512:
-  metadata.gz: '02779f97d3417bd3f290cb3fe9bafc03ec81d8a14f5594f540c644819e9e000edb2dfd6367d404cbe6a08024b8806d95a396a55642f1a223107dd0f29d321324'
-  data.tar.gz: 98c1b97da39a08b358e92444da64ceba18b2ce3019e387ff37dd873ca46ec36077b895dcfcd297bb52a3f6aa38b744c9c3b95530786d4fda5feae4d9a4faa3e1
+  metadata.gz: ce8e76d3bd5904bf0bebfc3023e92f68cb590351d43a7b890446422bc528a20c477e510dbf001afed6801efaa8cf624213c30f9d6d43845e14d0c1628322ef8c
+  data.tar.gz: 80edef433c9fa088c308393debded4cf18a494bcf655be508bc4650b75e1ac960dc6fbfd0aba2870c8405e6515ac03a12c1244e297dea9a4ad22d6fae2844829

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