winevt_c 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c929000e148699d499af776c99e1159f098b398ee4ed27c63271d085d19f0b7e
-  data.tar.gz: e3336a062a05acfaa9c1d4ca4ccf98cb225bace55a066f72f5cbc3813575033a
+  metadata.gz: 3232bf062fb10d6e5e383bfe921d151bed37485d9d84395b7ead76f99e95f988
+  data.tar.gz: 55f909f1c520aabe3eabe5ee43aebf8ec4aa7630035ea81e0accccec658c84a5
 SHA512:
-  metadata.gz: cfa0f23486d91eb8d46a381abc214c49fe8faf6805d3d11352d5d5f272b7fd0244edae3ed9a94771c8922866a02a14b56f70b6ae733192d82d0ae204df83b186
-  data.tar.gz: bf4dbc697452be08df0f8f0221c5edcd498e8f0d085a28ae801448af034bbfdffb8978749d817d24d6a75166d1fc780301d03e5594c71bbd4b4f26ba1653cef5
+  metadata.gz: 9e6908fd3207d4906a322ce29263c03b92ee53155f96a95c0327fd31d671f518164d270808aa09bc10bb5f64fb18b48e397033f340628c5b64aea567c03a307a
+  data.tar.gz: d45d945e85af3bfdac26e57c3d16bea8c033c950ac3eef2af830be67ad45cbe4bf5d98719dbec8f76961b20b210c175f511f0f5f364c93a00dc49c084b401f5f

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: ruby
 authors:
 - Hiroshi Hatake
@@ -115,6 +115,7 @@ files:
 - ext/winevt/winevt_utils.c
 - lib/winevt.rb
 - lib/winevt/query.rb
+- lib/winevt/subscribe.rb
 - lib/winevt/version.rb
 - winevt_c.gemspec
 homepage: https://github.com/cosmo0920/winevt_c