winevt_c 0.3.0-x64-mingw32 → 0.3.1-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 143e6fcaac67c8c04040b029480d9bbfbc71c572f212e13a63a360b814140296
-  data.tar.gz: 4224e2cbe5078ef310c625c52e8590aeaec33ba50d773ed2f449a2460cce899f
+  metadata.gz: ae7b5925121a5db5f4ab4d875ffe914c5cf55a042812b92f144662bdbfb06d71
+  data.tar.gz: 1771d4a956c5865adb8268314748138055f4e28e4c80b3a7cb1d7e0d4aaee741
 SHA512:
-  metadata.gz: 8ef6caaaf8c2f5f949226699f9029a21db7e04ba0784bb200ecd605b007c25387ceb578274c2880496b7e11ab83a09b3ffc09f2e220557cee158e862459563e9
-  data.tar.gz: 074657a3a9846105e5ca3ed4639bbc230aca3afea4609ac5097a44435c4e7ba6c0538987b89e3e43816b4dd8c4de26a04c216575c1ef6f1aafe4e5ddd78dcee9
+  metadata.gz: 1fba2b5c8806e5aac8dc0cc3fd2810cce5922f451331ccfa39d38850375c5392eb39f382681d938fbaede35d0a895cbc8dfa1f61982ff75abe6a671823442dad
+  data.tar.gz: af7c0f3bbb32df42d02b447561fdf73202d96351a16a845ef755e8c5178e8aa3f6dc02e09cc213fd9b81f17697f373dcececa520110059c57d10430aff74e0f4

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