winevt_c 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d57a1e5432029466922d8c4f3805be355d3e8cb9cca1aaa32a7ae5bb597ec6f
-  data.tar.gz: 27a0b12c234cc124e0b9a172d70fdb24aa6c78a44dae07e6ca708d0ae4f8c3d6
+  metadata.gz: d2e44e576e569f125c6961bdf8f55e68c31deea1700fe19c5b6885060eabfd3e
+  data.tar.gz: 794d697c6ab3b8747e7bd0e8b37a001c1889a8e4a87021cb50d5828ee53c7add
 SHA512:
-  metadata.gz: d536676a7bf61dc45272e7e39803259c553548018fb72228bcb72114827ba385adfebb3a3c1b28b11c1dafe336e145e9922599c3b246b28f9aad9b4627e5e50e
-  data.tar.gz: 687a2123c881ce0e5140d2afd5f2e5c8c775698e450dc9672d0a48f1d91a3400e48e19de7c8dd6a77e7761d624429a02f2c90f589d715f5a7bbdc416c20cc08a
+  metadata.gz: 699187c2446d3f60b5853abb2174299127a4c96ba60fc0fee273023eec922111640d8ba3b54d2b3ca38a21e7f0daad92f56a533e8ab20279b58e004b32f2ca09
+  data.tar.gz: a3b330defbc50aad97adb11f7f7ecce1123ff3e06e1415dc0019f0b4fec4135ab19e01895937356ca544dc631a192959abdd777f6318ffa24c4df3af718fbcb5

data/README.md

@@ -1,32 +1,32 @@
-# winevt_c
-
-[![Build status](https://ci.appveyor.com/api/projects/status/hr3phv8ihvgc68oj/branch/master?svg=true)](https://ci.appveyor.com/project/cosmo0920/winevt-c/branch/master)
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'winevt_c'
-```
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install winevt_c
-
-## Usage
-
-Usage examples are found in [example directory](example).
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-
-## Contributing
-
-Bug reports and pull requests are welcome on GitHub at https://github.com/cosmo0920/winevt_c.
+# winevt_c
+
+[![Build status](https://ci.appveyor.com/api/projects/status/hr3phv8ihvgc68oj/branch/master?svg=true)](https://ci.appveyor.com/project/cosmo0920/winevt-c/branch/master)
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'winevt_c'
+```
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install winevt_c
+
+## Usage
+
+Usage examples are found in [example directory](example).
+## Development
+
+After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+
+## Contributing
+
+Bug reports and pull requests are welcome on GitHub at https://github.com/cosmo0920/winevt_c.

data/ext/winevt/winevt.c

@@ -32,7 +32,7 @@ static void subscribe_free(void *ptr);
 static void query_free(void *ptr);
 static void bookmark_free(void *ptr);
 static char* render_event(EVT_HANDLE handle, DWORD flags);
-static DWORD WINAPI SubscriptionCallback(EVT_SUBSCRIBE_NOTIFY_ACTION action, PVOID pContext, EVT_HANDLE hEvent);
+static char* wstr_to_mbstr(UINT cp, const WCHAR *wstr, int clen);
 
 static const rb_data_type_t rb_winevt_channel_type = {
   "winevt/channel", {
@@ -128,7 +128,6 @@ rb_winevt_channel_each(VALUE self)
   DWORD bufferSize = 0;
   DWORD bufferUsed = 0;
   DWORD status = ERROR_SUCCESS;
-  ULONG len;
 
   RETURN_ENUMERATOR(self, 0, 0);
 
@@ -166,9 +165,7 @@ rb_winevt_channel_each(VALUE self)
       }
     }
 
-    len = WideCharToMultiByte(CP_UTF8, 0, buffer, -1, NULL, 0, NULL, NULL);
-    if (!(result = malloc(len))) return "";
-    WideCharToMultiByte(CP_UTF8, 0, buffer, -1, result, len, NULL, NULL);
+    result = wstr_to_mbstr(CP_UTF8, buffer, -1);
 
     rb_yield(rb_str_new2(result));
   }
@@ -176,6 +173,18 @@ rb_winevt_channel_each(VALUE self)
   return Qnil;
 }
 
+static char *
+wstr_to_mbstr(UINT cp, const WCHAR *wstr, int clen)
+{
+    char *ptr;
+    int len = WideCharToMultiByte(cp, 0, wstr, clen, NULL, 0, NULL, NULL);
+    if (!(ptr = malloc(len))) return 0;
+    WideCharToMultiByte(cp, 0, wstr, clen, ptr, len, NULL, NULL);
+
+    return ptr;
+}
+
+
 static void
 subscribe_free(void *ptr)
 {
@@ -568,7 +577,7 @@ static char* render_event(EVT_HANDLE handle, DWORD flags)
   ULONG      bufferSize = 0;
   ULONG      bufferSizeNeeded = 0;
   EVT_HANDLE event;
-  ULONG      len, status, count;
+  ULONG      status, count;
   char*      errBuf;
   char*      result;
   LPTSTR     msgBuf;
@@ -607,16 +616,15 @@ static char* render_event(EVT_HANDLE handle, DWORD flags)
         NULL, status,
         MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
         &msgBuf, 0, NULL);
-    len = WideCharToMultiByte(CP_UTF8, 0, msgBuf, -1, NULL, 0, NULL, NULL);
-    if (!(result = malloc(len))) return "";
-    WideCharToMultiByte(CP_UTF8, 0, msgBuf, -1, result, len, NULL, NULL);
+    result = wstr_to_mbstr(CP_ACP, msgBuf, -1);
 
     rb_raise(rb_eWinevtQueryError, "ErrorCode: %d\nError: %s\n", status, result);
   }
 
-  len = WideCharToMultiByte(CP_UTF8, 0, buffer, -1, NULL, 0, NULL, NULL);
-  if (!(result = malloc(len))) return "";
-  WideCharToMultiByte(CP_UTF8, 0, buffer, -1, result, len, NULL, NULL);
+  result = wstr_to_mbstr(CP_UTF8, buffer, -1);
+
+  if (buffer)
+    free(buffer);
 
   return result;
 }

data/lib/winevt/version.rb

@@ -1,3 +1,3 @@
 module Winevt
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: winevt_c
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Hiroshi Hatake
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-11 00:00:00.000000000 Z
+date: 2019-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler