winevt_c 0.3.2-x86-mingw32 → 0.3.3-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d810f976d0bd182ffdf7bf16c5ae321e80098f975a4e5c25538f120d84e75106
-  data.tar.gz: 06c5cab117100dfa64050a9153736c82ed9a85d571b5c1d4b818cb505209b1cd
+  metadata.gz: '08a0f43cef62aad6e5d4b0af93dbb900d4f0db4c1c6988aa6c47180a65868544'
+  data.tar.gz: '02907f6522776b4a7dc20d624806d74adc803fc7dcef64484cbc71ed26e5265d'
 SHA512:
-  metadata.gz: 536343216d88429c3be1aff745e6ebbc41194f38dfd2bd34ece1e0b75df77e62f562dabad06bb16b4ddc6031ede1d898854817dc5694c12f37135eadac3b8a1f
-  data.tar.gz: c6b5242c05ad3988df136a7d9a143d3e31ca1d45137c2ff5e5d4e0df660d32fe3eafb6fbead2ca85a5040b5f408c669d9a1674acaa14d64dfafe57d680876699
+  metadata.gz: ea2b090beec056b28ce941fe25cc0fd77dce98924ccb57aca4a2922a7c9b2a1555eff1090d975ba8c9d725d21d2aac0dd040b95435abe7767db0953ac4b84f66
+  data.tar.gz: 3993f346442e8c94edf1e331112b4002fa06529267db527b04ab4352292f63f38aad193e8d5f73934359800abb79766e2912b80c9d40f8ee43da167f25e433b9

data/ext/winevt/winevt_utils.c

@@ -134,6 +134,9 @@ VALUE get_values(EVT_HANDLE handle)
 
   for (int i = 0; i < propCount; i++) {
     switch (pRenderedValues[i].Type) {
+    case EvtVarTypeNull:
+      rb_ary_push(userValues, Qnil);
+      break;
     case EvtVarTypeString:
       if (pRenderedValues[i].StringVal == NULL) {
         rb_ary_push(userValues, rb_utf8_str_new_cstr("(NULL)"));
@@ -193,16 +196,6 @@ VALUE get_values(EVT_HANDLE handle)
       result = pRenderedValues[i].BooleanVal ? "true" : "false";
       rb_ary_push(userValues, rb_utf8_str_new_cstr(result));
       break;
-    case EvtVarTypeHexInt32:
-      rbObj = ULONG2NUM(pRenderedValues[i].UInt32Val);
-      rbObj = rb_sprintf("%#x", rbObj);
-      rb_ary_push(userValues, rbObj);
-      break;
-    case EvtVarTypeHexInt64:
-      rbObj = ULONG2NUM(pRenderedValues[i].UInt64Val);
-      rbObj = rb_sprintf("%#x", rbObj);
-      rb_ary_push(userValues, rbObj);
-      break;
     case EvtVarTypeGuid:
       if (pRenderedValues[i].GuidVal != NULL) {
         StringFromCLSID(pRenderedValues[i].GuidVal, &tmpWChar);
@@ -212,13 +205,9 @@ VALUE get_values(EVT_HANDLE handle)
         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));
-      } else {
-        rb_ary_push(userValues, rb_utf8_str_new_cstr("?"));
-      }
+    case EvtVarTypeSizeT:
+      rbObj = SIZET2NUM(pRenderedValues[i].SizeTVal);
+      rb_ary_push(userValues, rbObj);
       break;
     case EvtVarTypeFileTime:
       timestamp.QuadPart = pRenderedValues[i].FileTimeVal;
@@ -234,6 +223,44 @@ VALUE get_values(EVT_HANDLE handle)
         rb_ary_push(userValues, rb_utf8_str_new_cstr("?"));
       }
       break;
+    case EvtVarTypeSysTime:
+      if (pRenderedValues[i].SysTimeVal != NULL) {
+        st = *pRenderedValues[i].SysTimeVal;
+        sprintf(strTime, "%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));
+      } 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));
+      } else {
+        rb_ary_push(userValues, rb_utf8_str_new_cstr("?"));
+      }
+      break;
+    case EvtVarTypeHexInt32:
+      rbObj = ULONG2NUM(pRenderedValues[i].UInt32Val);
+      rbObj = rb_sprintf("%#x", rbObj);
+      rb_ary_push(userValues, rbObj);
+      break;
+    case EvtVarTypeHexInt64:
+      rbObj = ULONG2NUM(pRenderedValues[i].UInt64Val);
+      rbObj = rb_sprintf("%#x", rbObj);
+      rb_ary_push(userValues, rbObj);
+      break;
+    case EvtVarTypeEvtXml:
+      if (pRenderedValues[i].XmlVal == NULL) {
+        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));
+      }
+      break;
     default:
       rb_ary_push(userValues, rb_utf8_str_new_cstr("?"));
       break;

data/lib/winevt/query.rb

@@ -4,9 +4,9 @@ module Winevt
       alias_method :each_raw, :each
       def each
         each_raw do |xml, message, string_inserts|
-          message = message.gsub(/(%\d+)/, '\1$s')
-          message = sprintf(message, *string_inserts) rescue message.gsub(/(%\d+)/, "?")
-          yield(xml, message, string_inserts)
+          placeholdered_message = message.gsub(/(%\d+)/, '\1$s')
+          replaced_message = sprintf(placeholdered_message, *string_inserts) rescue message.gsub(/(%\d+)/, "?")
+          yield(xml, replaced_message, string_inserts)
         end
       end
     end

data/lib/winevt/subscribe.rb

@@ -4,9 +4,9 @@ module Winevt
       alias_method :each_raw, :each
       def each
         each_raw do |xml, message, string_inserts|
-          message = message.gsub(/(%\d+)/, '\1$s')
-          message = sprintf(message, *string_inserts) rescue message.gsub(/(%\d+)/, "?")
-          yield(xml, message, string_inserts)
+          placeholdered_message = message.gsub(/(%\d+)/, '\1$s')
+          replaced_message = sprintf(placeholdered_message, *string_inserts) rescue message.gsub(/(%\d+)/, "?")
+          yield(xml, replaced_message, string_inserts)
         end
       end
     end

data/lib/winevt/version.rb

@@ -1,3 +1,3 @@
 module Winevt
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: winevt_c
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: x86-mingw32
 authors:
 - Hiroshi Hatake