winevt_c 0.1.0-x64-mingw32 → 0.1.1-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac299bdab5f61eb7108f022f7e930aba63aeb4b5a0aabe048a53f9d7868c7b6f
-  data.tar.gz: 1fe7f4beddd3550b12554ed94e17a3ec5428d5ed08933baecb1f44954fef1af5
+  metadata.gz: bfa938cac989d5c12314ad59291a24b89a80312f8c514d2f99f77d35d2272370
+  data.tar.gz: 00c375feaa5bc65c1d23dba9ceddaa215ab6a16f82170c1178661aba02c092d4
 SHA512:
-  metadata.gz: c01f8be8e34a1cef3ff02f7a8dccb05e4321682a97b89cfbcc93cef31741c6725eb9d41e3924af7eef5a1704fda886735fd4671d9ba5923662944f4d638a5fa7
-  data.tar.gz: 1ff1ecf9a1bff6a6d4948e4c5d16e314d5c8b06aa412a6de2bb108026ec56e312d87f18a20aad2a23b3790db992a30bf6e11d17b20013c67936b692331b49980
+  metadata.gz: 41a89c35d39ea59a78f59cb09afd273865952954ecd8c6bc22e02cd9be16944e8b218f1492abecc0772ab25a0f6336476e4a888d6d1ef4817e2b1bdbf8f1ace6
+  data.tar.gz: c2700a0f9ab3141fd2d00649a6df35b70a8bec2a045b8227e2a48b2aa3e148f3f2551459fa2e6212f8ee5e0793c69bad922cfab870adda83e050cf2aa7a95417

data/README.md

@@ -1,5 +1,7 @@
 # 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:

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