winevt_c 0.3.0-x86-mingw32 → 0.3.1-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec281ab900bda5f04c90ce925feb586e29baa7765b92c523054f99dad40874d4
-  data.tar.gz: 74c01f7f85c5d3d26364883ceba104d1640a286736a654a079e9dbe7198a8186
+  metadata.gz: b582cc584307828fc5c24a683380dbe88f924b7a2a3b73193e38a60776a38874
+  data.tar.gz: d7391b6fa4177f0a4dffa481e4ed7d604cd51aced9e5a26086b5dd6c03a2752e
 SHA512:
-  metadata.gz: 8d92bdbd2c84912e045678c8bff2cf6dfa08dac8472147e68c57a3ac6f5d87d1020fdbeed5a279b999ae50282909569edb5777790bcb20fd62ae9df3111114bb
-  data.tar.gz: d5e37e9b7066db2b79e26ac89ebd43d92694640a0eeb7a8a9c0e18aa82b34d040bb217a74dca725710fd6ab6941381c1d98c2d4cfd3f2461f3e3ffcf052d1107
+  metadata.gz: c426b20aea9074e14b317fb5656c0ff5ea2e844d457d15ef17b951e20333663e4ee7fbddcb43f48b96492a6312791f7cc1b1ba22a8956baca2ae7965ff25be7c
+  data.tar.gz: 7afd306db4466ca77d98c6866ad8a8bab6e71cadfa956aa615a7dd46c3b60e41ac6083d10919ab77e14d9c073a4e7bf8bd093074478b885529328ba94b277928

data/ext/winevt/winevt_c.h

@@ -12,7 +12,7 @@
 #endif /* __GNUC__ */
 
 #ifdef _WIN32_WINNT
-#  undef WIN32_WINNT
+#  undef _WIN32_WINNT
 #endif /* WIN32_WINNT */
 #define _WIN32_WINNT MINIMUM_WINDOWS_VERSION
 

data/ext/winevt/winevt_subscribe.c

@@ -69,7 +69,7 @@ rb_winevt_subscribe_tail_p(VALUE self, VALUE rb_flag)
 }
 
 static VALUE
-rb_winevt_subscribe_subscribe(int argc, VALUE argv, VALUE self)
+rb_winevt_subscribe_subscribe(int argc, VALUE *argv, VALUE self)
 {
   VALUE rb_path, rb_query, rb_bookmark;
   EVT_HANDLE hSubscription = NULL, hBookmark = NULL;

data/ext/winevt/winevt_utils.c

@@ -57,10 +57,9 @@ char* render_event(EVT_HANDLE handle, DWORD flags)
         FORMAT_MESSAGE_IGNORE_INSERTS,
         NULL, status,
         MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-        &msgBuf, 0, NULL);
-    result = wstr_to_mbstr(CP_ACP, msgBuf, -1);
+        msgBuf, 0, NULL);
 
-    rb_raise(rb_eWinevtQueryError, "ErrorCode: %d\nError: %s\n", status, result);
+    rb_raise(rb_eWinevtQueryError, "ErrorCode: %d\nError: %s\n", status, msgBuf);
   }
 
   result = wstr_to_mbstr(CP_UTF8, buffer, -1);
@@ -121,10 +120,9 @@ VALUE get_values(EVT_HANDLE handle)
         FORMAT_MESSAGE_IGNORE_INSERTS,
         NULL, status,
         MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-        &msgBuf, 0, NULL);
-    result = wstr_to_mbstr(CP_ACP, msgBuf, -1);
+        msgBuf, 0, NULL);
 
-    rb_raise(rb_eWinevtQueryError, "ErrorCode: %d\nError: %s\n", status, result);
+    rb_raise(rb_eWinevtQueryError, "ErrorCode: %d\nError: %s\n", status, msgBuf);
   }
 
   PEVT_VARIANT pRenderedValues = (PEVT_VARIANT)buffer;
@@ -295,10 +293,9 @@ char* get_description(EVT_HANDLE handle)
         FORMAT_MESSAGE_IGNORE_INSERTS,
         NULL, status,
         MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-        &msgBuf, 0, NULL);
-    result = wstr_to_mbstr(CP_ACP, msgBuf, -1);
+        msgBuf, 0, NULL);
 
-    rb_raise(rb_eWinevtQueryError, "ErrorCode: %d\nError: %s\n", status, result);
+    rb_raise(rb_eWinevtQueryError, "ErrorCode: %d\nError: %s\n", status, msgBuf);
   }
 
   // Obtain buffer as EVT_VARIANT pointer. To avoid ErrorCide 87 in EvtRender.

data/lib/winevt/query.rb

@@ -1,6 +1,14 @@
 module Winevt
   class EventLog
     class Query
+      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)
+        end
+      end
     end
   end
 end

data/lib/winevt/subscribe.rb

@@ -0,0 +1,14 @@
+module Winevt
+  class EventLog
+    class Subscribe
+      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)
+        end
+      end
+    end
+  end
+end

data/lib/winevt/version.rb

@@ -1,3 +1,3 @@
 module Winevt
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/lib/winevt.rb

@@ -4,6 +4,7 @@ rescue LoadError
   require "winevt/winevt"
 end
 require "winevt/query"
+require "winevt/subscribe"
 require "winevt/version"
 
 module Winevt

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: winevt_c
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: x86-mingw32
 authors:
 - Hiroshi Hatake
@@ -117,6 +117,7 @@ files:
 - lib/winevt/2.5/winevt.so
 - lib/winevt/2.6/winevt.so
 - lib/winevt/query.rb
+- lib/winevt/subscribe.rb
 - lib/winevt/version.rb
 - winevt_c.gemspec
 homepage: https://github.com/cosmo0920/winevt_c